gnucash maint: Multiple changes pushed
Robert Fewell
bobit at code.gnucash.org
Thu Oct 22 09:38:24 EDT 2020
Updated via https://github.com/Gnucash/gnucash/commit/3c5066fe (commit)
via https://github.com/Gnucash/gnucash/commit/e5886955 (commit)
via https://github.com/Gnucash/gnucash/commit/f93f850f (commit)
via https://github.com/Gnucash/gnucash/commit/c11f4db9 (commit)
from https://github.com/Gnucash/gnucash/commit/8e5e3480 (commit)
commit 3c5066feb4a6a58c263c3ae83a16739fedf28266
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Thu Oct 22 14:30:46 2020 +0100
Change source files option-util.* for spaces and tabs
diff --git a/libgnucash/app-utils/option-util.c b/libgnucash/app-utils/option-util.c
index 42c3b5a19..c36656ac0 100644
--- a/libgnucash/app-utils/option-util.c
+++ b/libgnucash/app-utils/option-util.c
@@ -194,14 +194,13 @@ gnc_option_set_selectable (GNCOption *option, gboolean selectable)
* Returns: nothing *
\********************************************************************/
static void
-gnc_option_db_init(GNCOptionDB *odb)
+gnc_option_db_init (GNCOptionDB *odb)
{
- SCM func = scm_c_eval_string("gnc:send-options");
+ SCM func = scm_c_eval_string ("gnc:send-options");
- scm_call_2(func, scm_from_int (odb->handle), odb->guile_options);
+ scm_call_2 (func, scm_from_int (odb->handle), odb->guile_options);
}
-
/********************************************************************\
* gnc_option_db_new *
* allocate a new option database and initialize its values *
@@ -210,32 +209,32 @@ gnc_option_db_init(GNCOptionDB *odb)
* Returns: a new option database *
\********************************************************************/
GNCOptionDB *
-gnc_option_db_new(SCM guile_options)
+gnc_option_db_new (SCM guile_options)
{
GNCOptionDB *odb;
GNCOptionDB *lookup;
- odb = g_new0(GNCOptionDB, 1);
+ odb = g_new0 (GNCOptionDB, 1);
odb->guile_options = guile_options;
- scm_gc_protect_object(guile_options);
+ scm_gc_protect_object (guile_options);
odb->option_sections = NULL;
odb->options_dirty = FALSE;
if (option_dbs == NULL)
- option_dbs = g_hash_table_new(g_int_hash, g_int_equal);
+ option_dbs = g_hash_table_new (g_int_hash, g_int_equal);
do
{
odb->handle = last_db_handle++;
- lookup = g_hash_table_lookup(option_dbs, &odb->handle);
+ lookup = g_hash_table_lookup (option_dbs, &odb->handle);
}
while (lookup != NULL);
- g_hash_table_insert(option_dbs, &odb->handle, odb);
+ g_hash_table_insert (option_dbs, &odb->handle, odb);
- gnc_option_db_init(odb);
+ gnc_option_db_init (odb);
return odb;
}
@@ -249,43 +248,43 @@ static void
init_table(void)
{
if (!kvp_registry)
- kvp_registry = g_hash_table_new(g_str_hash, g_str_equal);
+ kvp_registry = g_hash_table_new (g_str_hash, g_str_equal);
}
/* create a new options object for the requested type */
static SCM
-gnc_make_kvp_options(QofIdType id_type)
+gnc_make_kvp_options (QofIdType id_type)
{
GList *list, *p;
SCM gnc_new_options = SCM_UNDEFINED;
SCM options = SCM_UNDEFINED;
init_table();
- list = g_hash_table_lookup(kvp_registry, id_type);
- gnc_new_options = scm_c_eval_string("gnc:new-options");
- options = scm_call_0(gnc_new_options);
+ list = g_hash_table_lookup (kvp_registry, id_type);
+ gnc_new_options = scm_c_eval_string ("gnc:new-options");
+ options = scm_call_0 (gnc_new_options);
for (p = list; p; p = p->next)
{
SCM generator = p->data;
- scm_call_1(generator, options);
+ scm_call_1 (generator, options);
}
return options;
}
GNCOptionDB *
-gnc_option_db_new_for_type(QofIdType id_type)
+gnc_option_db_new_for_type (QofIdType id_type)
{
SCM options;
if (!id_type) return NULL;
- options = gnc_make_kvp_options(id_type);
+ options = gnc_make_kvp_options (id_type);
return gnc_option_db_new (options);
}
void
-gnc_option_db_load(GNCOptionDB* odb, QofBook *book)
+gnc_option_db_load (GNCOptionDB* odb, QofBook *book)
{
static SCM kvp_to_scm = SCM_UNDEFINED;
SCM scm_book;
@@ -294,7 +293,7 @@ gnc_option_db_load(GNCOptionDB* odb, QofBook *book)
if (kvp_to_scm == SCM_UNDEFINED)
{
- kvp_to_scm = scm_c_eval_string("gnc:options-kvp->scm");
+ kvp_to_scm = scm_c_eval_string ("gnc:options-kvp->scm");
if (!scm_is_procedure (kvp_to_scm))
{
PERR ("not a procedure\n");
@@ -303,13 +302,13 @@ gnc_option_db_load(GNCOptionDB* odb, QofBook *book)
}
}
- scm_book = SWIG_NewPointerObj(book, SWIG_TypeQuery("_p_QofBook"), 0);
+ scm_book = SWIG_NewPointerObj (book, SWIG_TypeQuery ("_p_QofBook"), 0);
scm_call_2 (kvp_to_scm, odb->guile_options, scm_book);
}
void
-gnc_option_db_save(GNCOptionDB* odb, QofBook *book, gboolean clear_all)
+gnc_option_db_save (GNCOptionDB* odb, QofBook *book, gboolean clear_all)
{
static SCM scm_to_kvp = SCM_UNDEFINED;
SCM scm_book;
@@ -319,7 +318,7 @@ gnc_option_db_save(GNCOptionDB* odb, QofBook *book, gboolean clear_all)
if (scm_to_kvp == SCM_UNDEFINED)
{
- scm_to_kvp = scm_c_eval_string("gnc:options-scm->kvp");
+ scm_to_kvp = scm_c_eval_string ("gnc:options-scm->kvp");
if (!scm_is_procedure (scm_to_kvp))
{
PERR ("not a procedure\n");
@@ -328,11 +327,12 @@ gnc_option_db_save(GNCOptionDB* odb, QofBook *book, gboolean clear_all)
}
}
- scm_book = SWIG_NewPointerObj(book, SWIG_TypeQuery("_p_QofBook"), 0);
+ scm_book = SWIG_NewPointerObj (book, SWIG_TypeQuery ("_p_QofBook"), 0);
scm_clear_all = scm_from_bool (clear_all);
scm_call_3 (scm_to_kvp, odb->guile_options, scm_book, scm_clear_all);
}
+
/********************************************************************\
* gnc_option_db_destroy *
* unregister the scheme options and free all the memory *
@@ -343,7 +343,7 @@ gnc_option_db_save(GNCOptionDB* odb, QofBook *book, gboolean clear_all)
* Returns: nothing *
\********************************************************************/
void
-gnc_option_db_destroy(GNCOptionDB *odb)
+gnc_option_db_destroy (GNCOptionDB *odb)
{
GSList *snode;
@@ -359,35 +359,35 @@ gnc_option_db_destroy(GNCOptionDB *odb)
{
GNCOption *option = onode->data;
- scm_gc_unprotect_object(option->guile_option);
+ scm_gc_unprotect_object (option->guile_option);
g_free (option);
}
/* Free the option list */
- g_slist_free(section->options);
+ g_slist_free (section->options);
section->options = NULL;
if (section->section_name != NULL)
- free(section->section_name);
+ free (section->section_name);
section->section_name = NULL;
g_free (section);
}
- g_slist_free(odb->option_sections);
+ g_slist_free (odb->option_sections);
odb->option_sections = NULL;
odb->options_dirty = FALSE;
- g_hash_table_remove(option_dbs, &odb->handle);
+ g_hash_table_remove (option_dbs, &odb->handle);
- if (g_hash_table_size(option_dbs) == 0)
+ if (g_hash_table_size (option_dbs) == 0)
{
- g_hash_table_destroy(option_dbs);
+ g_hash_table_destroy (option_dbs);
option_dbs = NULL;
}
- scm_gc_unprotect_object(odb->guile_options);
+ scm_gc_unprotect_object (odb->guile_options);
odb->guile_options = SCM_UNDEFINED;
g_free(odb);
@@ -421,11 +421,11 @@ gnc_option_db_set_ui_callbacks (GNCOptionDB *odb,
* Returns: SCM handle for unregistering *
\********************************************************************/
SCM
-gnc_option_db_register_change_callback(GNCOptionDB *odb,
- GNCOptionChangeCallback callback,
- gpointer data,
- const char *section,
- const char *name)
+gnc_option_db_register_change_callback (GNCOptionDB *odb,
+ GNCOptionChangeCallback callback,
+ gpointer data,
+ const char *section,
+ const char *name)
{
SCM register_proc;
SCM arg;
@@ -435,8 +435,8 @@ gnc_option_db_register_change_callback(GNCOptionDB *odb,
return SCM_UNDEFINED;
/* Get the register procedure */
- register_proc = scm_c_eval_string("gnc:options-register-c-callback");
- if (!scm_is_procedure(register_proc))
+ register_proc = scm_c_eval_string ("gnc:options-register-c-callback");
+ if (!scm_is_procedure (register_proc))
{
PERR("not a procedure\n");
return SCM_UNDEFINED;
@@ -446,16 +446,16 @@ gnc_option_db_register_change_callback(GNCOptionDB *odb,
args = SCM_EOL;
/* first the guile options database */
- args = scm_cons(odb->guile_options, args);
+ args = scm_cons (odb->guile_options, args);
/* next the data */
- arg = SWIG_NewPointerObj(data, SWIG_TypeQuery("_p_void"), 0);
- args = scm_cons(arg, args);
+ arg = SWIG_NewPointerObj (data, SWIG_TypeQuery ("_p_void"), 0);
+ args = scm_cons (arg, args);
/* next the callback */
- arg = SWIG_NewPointerObj(
- callback, SWIG_TypeQuery("GNCOptionChangeCallback"), 0);
- args = scm_cons(arg, args);
+ arg = SWIG_NewPointerObj (
+ callback, SWIG_TypeQuery ("GNCOptionChangeCallback"), 0);
+ args = scm_cons (arg, args);
/* next the name */
if (name == NULL)
@@ -464,9 +464,9 @@ gnc_option_db_register_change_callback(GNCOptionDB *odb,
}
else
{
- arg = scm_from_utf8_string(name);
+ arg = scm_from_utf8_string (name);
}
- args = scm_cons(arg, args);
+ args = scm_cons (arg, args);
/* next the section */
if (section == NULL)
@@ -475,15 +475,14 @@ gnc_option_db_register_change_callback(GNCOptionDB *odb,
}
else
{
- arg = scm_from_utf8_string(section);
+ arg = scm_from_utf8_string (section);
}
- args = scm_cons(arg, args);
+ args = scm_cons (arg, args);
/* now apply the procedure */
- return scm_apply(register_proc, args, SCM_EOL);
+ return scm_apply (register_proc, args, SCM_EOL);
}
-
/********************************************************************\
* gnc_option_db_unregister_change_callback_id *
* unregister the change callback associated with the given id *
@@ -493,21 +492,21 @@ gnc_option_db_register_change_callback(GNCOptionDB *odb,
* Returns: nothing *
\********************************************************************/
void
-gnc_option_db_unregister_change_callback_id(GNCOptionDB *odb, SCM callback_id)
+gnc_option_db_unregister_change_callback_id (GNCOptionDB *odb, SCM callback_id)
{
SCM proc;
if (callback_id == SCM_UNDEFINED)
return;
- proc = scm_c_eval_string("gnc:options-unregister-callback-id");
- if (!scm_is_procedure(proc))
+ proc = scm_c_eval_string ("gnc:options-unregister-callback-id");
+ if (!scm_is_procedure (proc))
{
PERR("not a procedure\n");
return;
}
- scm_call_2(proc, callback_id, odb->guile_options);
+ scm_call_2 (proc, callback_id, odb->guile_options);
}
void
@@ -517,21 +516,20 @@ gncp_option_invoke_callback (GNCOptionChangeCallback callback, void *data)
}
static void
-gnc_call_option_change_callbacks(GNCOptionDB *odb)
+gnc_call_option_change_callbacks (GNCOptionDB *odb)
{
SCM proc;
- proc = scm_c_eval_string("gnc:options-run-callbacks");
- if (!scm_is_procedure(proc))
+ proc = scm_c_eval_string ("gnc:options-run-callbacks");
+ if (!scm_is_procedure (proc))
{
PERR("not a procedure\n");
return;
}
- scm_call_1(proc, odb->guile_options);
+ scm_call_1 (proc, odb->guile_options);
}
-
static void
initialize_getters(void)
{
@@ -540,59 +538,58 @@ initialize_getters(void)
if (getters_initialized)
return;
- getters.section = scm_c_eval_string("gnc:option-section");
- getters.name = scm_c_eval_string("gnc:option-name");
- getters.type = scm_c_eval_string("gnc:option-type");
- getters.sort_tag = scm_c_eval_string("gnc:option-sort-tag");
+ getters.section = scm_c_eval_string ("gnc:option-section");
+ getters.name = scm_c_eval_string ("gnc:option-name");
+ getters.type = scm_c_eval_string ("gnc:option-type");
+ getters.sort_tag = scm_c_eval_string ("gnc:option-sort-tag");
getters.documentation =
- scm_c_eval_string("gnc:option-documentation");
- getters.getter = scm_c_eval_string("gnc:option-getter");
- getters.setter = scm_c_eval_string("gnc:option-setter");
+ scm_c_eval_string ("gnc:option-documentation");
+ getters.getter = scm_c_eval_string ("gnc:option-getter");
+ getters.setter = scm_c_eval_string ("gnc:option-setter");
getters.default_getter =
- scm_c_eval_string("gnc:option-default-getter");
+ scm_c_eval_string ("gnc:option-default-getter");
getters.value_validator =
- scm_c_eval_string("gnc:option-value-validator");
- getters.option_data = scm_c_eval_string("gnc:option-data");
- getters.index_to_name = scm_c_eval_string("gnc:option-index-get-name");
+ scm_c_eval_string ("gnc:option-value-validator");
+ getters.option_data = scm_c_eval_string ("gnc:option-data");
+ getters.index_to_name = scm_c_eval_string ("gnc:option-index-get-name");
getters.index_to_description =
- scm_c_eval_string("gnc:option-index-get-description");
- getters.number_of_indices = scm_c_eval_string("gnc:option-number-of-indices");
- getters.index_to_value = scm_c_eval_string("gnc:option-index-get-value");
- getters.value_to_index = scm_c_eval_string("gnc:option-value-get-index");
+ scm_c_eval_string ("gnc:option-index-get-description");
+ getters.number_of_indices = scm_c_eval_string ("gnc:option-number-of-indices");
+ getters.index_to_value = scm_c_eval_string ("gnc:option-index-get-value");
+ getters.value_to_index = scm_c_eval_string ("gnc:option-value-get-index");
getters.option_widget_changed_cb =
- scm_c_eval_string("gnc:option-widget-changed-proc");
- getters.date_option_subtype = scm_c_eval_string("gnc:date-option-get-subtype");
- getters.date_option_show_time = scm_c_eval_string("gnc:date-option-show-time?");
+ scm_c_eval_string ("gnc:option-widget-changed-proc");
+ getters.date_option_subtype = scm_c_eval_string ("gnc:date-option-get-subtype");
+ getters.date_option_show_time = scm_c_eval_string ("gnc:date-option-show-time?");
getters.date_option_value_type = scm_c_eval_string ("gnc:date-option-value-type");
getters.date_option_value_absolute =
- scm_c_eval_string("gnc:date-option-absolute-time");
+ scm_c_eval_string ("gnc:date-option-absolute-time");
getters.date_option_value_relative =
- scm_c_eval_string("gnc:date-option-relative-time");
+ scm_c_eval_string ("gnc:date-option-relative-time");
getters.plot_size_option_value_type = scm_c_eval_string ("gnc:plot-size-option-value-type");
- getters.plot_size_option_value = scm_c_eval_string("gnc:plot-size-option-value");
+ getters.plot_size_option_value = scm_c_eval_string ("gnc:plot-size-option-value");
getters.currency_accounting_option_currency_doc_string =
- scm_c_eval_string("gnc:currency-accounting-option-get-curr-doc-string");
+ scm_c_eval_string ("gnc:currency-accounting-option-get-curr-doc-string");
getters.currency_accounting_option_default_currency =
- scm_c_eval_string("gnc:currency-accounting-option-get-default-curr");
+ scm_c_eval_string ("gnc:currency-accounting-option-get-default-curr");
getters.currency_accounting_option_policy_doc_string =
- scm_c_eval_string("gnc:currency-accounting-option-get-policy-doc-string");
+ scm_c_eval_string ("gnc:currency-accounting-option-get-policy-doc-string");
getters.currency_accounting_option_default_policy =
- scm_c_eval_string("gnc:currency-accounting-option-get-default-policy");
+ scm_c_eval_string ("gnc:currency-accounting-option-get-default-policy");
getters.currency_accounting_option_gain_loss_account_doc_string =
- scm_c_eval_string("gnc:currency-accounting-option-get-gain-loss-account-doc-string");
+ scm_c_eval_string ("gnc:currency-accounting-option-get-gain-loss-account-doc-string");
getters.currency_accounting_option_method =
- scm_c_eval_string("gnc:currency-accounting-option-selected-method");
+ scm_c_eval_string ("gnc:currency-accounting-option-selected-method");
getters.currency_accounting_option_book_currency =
- scm_c_eval_string("gnc:currency-accounting-option-selected-currency");
+ scm_c_eval_string ("gnc:currency-accounting-option-selected-currency");
getters.currency_accounting_option_selected_default_policy =
- scm_c_eval_string("gnc:currency-accounting-option-selected-policy");
+ scm_c_eval_string ("gnc:currency-accounting-option-selected-policy");
getters.currency_accounting_option_selected_default_gain_loss_account =
- scm_c_eval_string("gnc:currency-accounting-option-selected-gain-loss-account");
+ scm_c_eval_string ("gnc:currency-accounting-option-selected-gain-loss-account");
getters_initialized = TRUE;
}
-
/********************************************************************\
* gnc_option_section *
* returns the malloc'ed section name of the option, or NULL *
@@ -602,14 +599,13 @@ initialize_getters(void)
* Returns: malloc'ed char * or NULL *
\********************************************************************/
char *
-gnc_option_section(GNCOption *option)
+gnc_option_section (GNCOption *option)
{
- initialize_getters();
+ initialize_getters ();
- return gnc_scm_call_1_to_string(getters.section, option->guile_option);
+ return gnc_scm_call_1_to_string (getters.section, option->guile_option);
}
-
/********************************************************************\
* gnc_option_name *
* returns the malloc'ed name of the option, or NULL *
@@ -619,14 +615,13 @@ gnc_option_section(GNCOption *option)
* Returns: malloc'ed char * or NULL *
\********************************************************************/
char *
-gnc_option_name(GNCOption *option)
+gnc_option_name (GNCOption *option)
{
- initialize_getters();
+ initialize_getters ();
- return gnc_scm_call_1_to_string(getters.name, option->guile_option);
+ return gnc_scm_call_1_to_string (getters.name, option->guile_option);
}
-
/********************************************************************\
* gnc_option_type *
* returns the malloc'ed type of the option, or NULL *
@@ -636,15 +631,14 @@ gnc_option_name(GNCOption *option)
* Returns: malloc'ed char * or NULL *
\********************************************************************/
char *
-gnc_option_type(GNCOption *option)
+gnc_option_type (GNCOption *option)
{
- initialize_getters();
+ initialize_getters ();
- return gnc_scm_call_1_symbol_to_string(getters.type,
+ return gnc_scm_call_1_symbol_to_string (getters.type,
option->guile_option);
}
-
/********************************************************************\
* gnc_option_sort_tag *
* returns the malloc'ed sort tag of the option, or NULL *
@@ -654,14 +648,13 @@ gnc_option_type(GNCOption *option)
* Returns: malloc'ed char * or NULL *
\********************************************************************/
char *
-gnc_option_sort_tag(GNCOption *option)
+gnc_option_sort_tag (GNCOption *option)
{
- initialize_getters();
+ initialize_getters ();
- return gnc_scm_call_1_to_string(getters.sort_tag, option->guile_option);
+ return gnc_scm_call_1_to_string (getters.sort_tag, option->guile_option);
}
-
/********************************************************************\
* gnc_option_documentation *
* returns the malloc'ed documentation string of the option, or *
@@ -671,15 +664,14 @@ gnc_option_sort_tag(GNCOption *option)
* Returns: malloc'ed char * or NULL *
\********************************************************************/
char *
-gnc_option_documentation(GNCOption *option)
+gnc_option_documentation (GNCOption *option)
{
- initialize_getters();
+ initialize_getters ();
- return gnc_scm_call_1_to_string(getters.documentation,
+ return gnc_scm_call_1_to_string (getters.documentation,
option->guile_option);
}
-
/********************************************************************\
* gnc_option_getter *
* returns the SCM handle for the option getter function. *
@@ -689,15 +681,14 @@ gnc_option_documentation(GNCOption *option)
* Returns: SCM handle to function *
\********************************************************************/
SCM
-gnc_option_getter(GNCOption *option)
+gnc_option_getter (GNCOption *option)
{
- initialize_getters();
+ initialize_getters ();
- return gnc_scm_call_1_to_procedure(getters.getter,
+ return gnc_scm_call_1_to_procedure (getters.getter,
option->guile_option);
}
-
/********************************************************************\
* gnc_option_setter *
* returns the SCM handle for the option setter function. *
@@ -707,15 +698,14 @@ gnc_option_getter(GNCOption *option)
* Returns: SCM handle to function *
\********************************************************************/
SCM
-gnc_option_setter(GNCOption *option)
+gnc_option_setter (GNCOption *option)
{
- initialize_getters();
+ initialize_getters ();
- return gnc_scm_call_1_to_procedure(getters.setter,
+ return gnc_scm_call_1_to_procedure (getters.setter,
option->guile_option);
}
-
/********************************************************************\
* gnc_option_default_getter *
* returns the SCM handle for the option default_getter function. *
@@ -725,15 +715,14 @@ gnc_option_setter(GNCOption *option)
* Returns: SCM handle to function *
\********************************************************************/
SCM
-gnc_option_default_getter(GNCOption *option)
+gnc_option_default_getter (GNCOption *option)
{
- initialize_getters();
+ initialize_getters ();
- return gnc_scm_call_1_to_procedure(getters.default_getter,
+ return gnc_scm_call_1_to_procedure (getters.default_getter,
option->guile_option);
}
-
/********************************************************************\
* gnc_option_value_validator *
* returns the SCM handle for the option value validator function.*
@@ -743,15 +732,14 @@ gnc_option_default_getter(GNCOption *option)
* Returns: SCM handle to function *
\********************************************************************/
SCM
-gnc_option_value_validator(GNCOption *option)
+gnc_option_value_validator (GNCOption *option)
{
- initialize_getters();
+ initialize_getters ();
- return gnc_scm_call_1_to_procedure(getters.value_validator,
+ return gnc_scm_call_1_to_procedure (getters.value_validator,
option->guile_option);
}
-
/********************************************************************\
* gnc_option_widget_changed_proc_getter *
* returns the SCM handle for the function to be called if the *
@@ -764,20 +752,20 @@ gnc_option_value_validator(GNCOption *option)
* If no such function exists, returns SCM_UNDEFINED. *
\********************************************************************/
SCM
-gnc_option_widget_changed_proc_getter(GNCOption *option)
+gnc_option_widget_changed_proc_getter (GNCOption *option)
{
SCM cb;
- initialize_getters();
+ initialize_getters ();
- if ( scm_is_procedure( getters.option_widget_changed_cb ) )
+ if (scm_is_procedure (getters.option_widget_changed_cb))
{
/* call the callback function getter to get the actual callback function */
- cb = scm_call_1(getters.option_widget_changed_cb, option->guile_option);
+ cb = scm_call_1 (getters.option_widget_changed_cb, option->guile_option);
- if ( scm_is_procedure( cb ) ) /* a callback exists */
+ if (scm_is_procedure (cb)) /* a callback exists */
{
- return( cb );
+ return (cb);
}
/* else no callback exists - this is a legal situation */
}
@@ -789,7 +777,6 @@ gnc_option_widget_changed_proc_getter(GNCOption *option)
return( SCM_UNDEFINED );
}
-
/**********************************************************************\
* gnc_option_call_option_widget_changed_proc *
* If there is an option_widget_changed_cb for this option, call *
@@ -806,22 +793,21 @@ gnc_option_call_option_widget_changed_proc (GNCOption *option,
{
SCM cb, value;
- cb = gnc_option_widget_changed_proc_getter(option);
+ cb = gnc_option_widget_changed_proc_getter (option);
- if ( cb != SCM_UNDEFINED )
+ if (cb != SCM_UNDEFINED)
{
- value = gnc_option_get_ui_value(option);
+ value = gnc_option_get_ui_value (option);
- if ( value != SCM_UNDEFINED )
+ if (value != SCM_UNDEFINED)
{
- scm_call_1(cb, value);
+ scm_call_1 (cb, value);
}
}
if (reset_changed)
option->changed = FALSE;
}
-
/********************************************************************\
* gnc_option_num_permissible_values *
* returns the number of permissible values in the option, or *
@@ -831,17 +817,17 @@ gnc_option_call_option_widget_changed_proc (GNCOption *option,
* Returns: number of permissible options or -1 *
\********************************************************************/
int
-gnc_option_num_permissible_values(GNCOption *option)
+gnc_option_num_permissible_values (GNCOption *option)
{
SCM value;
- initialize_getters();
+ initialize_getters ();
- value = scm_call_1(getters.number_of_indices, option->guile_option);
+ value = scm_call_1 (getters.number_of_indices, option->guile_option);
- if (scm_is_exact(value))
+ if (scm_is_exact (value))
{
- return scm_to_int(value);
+ return scm_to_int (value);
}
else
{
@@ -849,7 +835,6 @@ gnc_option_num_permissible_values(GNCOption *option)
}
}
-
/********************************************************************\
* gnc_option_permissible_value_index *
* returns the index of the permissible value matching the *
@@ -860,21 +845,20 @@ gnc_option_num_permissible_values(GNCOption *option)
* Returns: index of permissible value, or -1 *
\********************************************************************/
int
-gnc_option_permissible_value_index(GNCOption *option, SCM search_value)
+gnc_option_permissible_value_index (GNCOption *option, SCM search_value)
{
SCM value;
- value = scm_call_2(getters.value_to_index, option->guile_option, search_value);
+ value = scm_call_2 (getters.value_to_index, option->guile_option, search_value);
if (value == SCM_BOOL_F)
{
return -1;
}
else
{
- return scm_to_int(value);
+ return scm_to_int (value);
}
}
-
/********************************************************************\
* gnc_option_permissible_value *
* returns the SCM handle to the indexth permissible value in the *
@@ -886,22 +870,21 @@ gnc_option_permissible_value_index(GNCOption *option, SCM search_value)
* Returns: SCM handle to option value or SCM_UNDEFINED *
\********************************************************************/
SCM
-gnc_option_permissible_value(GNCOption *option, int index)
+gnc_option_permissible_value (GNCOption *option, int index)
{
SCM value;
if (index < 0)
return SCM_UNDEFINED;
- initialize_getters();
+ initialize_getters ();
- value = scm_call_2(getters.index_to_value, option->guile_option,
- scm_from_int (index));
+ value = scm_call_2 (getters.index_to_value, option->guile_option,
+ scm_from_int (index));
return value;
}
-
/********************************************************************\
* gnc_option_permissible_value_name *
* returns the malloc'd name of the indexth permissible value in *
@@ -913,26 +896,25 @@ gnc_option_permissible_value(GNCOption *option, int index)
* Returns: malloc'd name of permissible value or NULL *
\********************************************************************/
char *
-gnc_option_permissible_value_name(GNCOption *option, int index)
+gnc_option_permissible_value_name (GNCOption *option, int index)
{
SCM name;
if (index < 0)
return NULL;
- initialize_getters();
+ initialize_getters ();
- name = scm_call_2(getters.index_to_name, option->guile_option,
- scm_from_int (index));
+ name = scm_call_2 (getters.index_to_name, option->guile_option,
+ scm_from_int (index));
if (name == SCM_UNDEFINED)
return NULL;
- if (!scm_is_string(name))
+ if (!scm_is_string (name))
return NULL;
return gnc_scm_to_utf8_string (name);
}
-
/********************************************************************\
* gnc_option_permissible_value_description *
* returns the malloc'd description of the indexth permissible *
@@ -944,26 +926,25 @@ gnc_option_permissible_value_name(GNCOption *option, int index)
* Returns: malloc'd description of permissible value or NULL *
\********************************************************************/
char *
-gnc_option_permissible_value_description(GNCOption *option, int index)
+gnc_option_permissible_value_description (GNCOption *option, int index)
{
SCM help;
if (index < 0)
return NULL;
- initialize_getters();
+ initialize_getters ();
- help = scm_call_2(getters.index_to_description, option->guile_option,
- scm_from_int (index));
+ help = scm_call_2 (getters.index_to_description, option->guile_option,
+ scm_from_int (index));
if (help == SCM_UNDEFINED)
return NULL;
- if (!scm_is_string(help))
+ if (!scm_is_string (help))
return NULL;
return gnc_scm_to_utf8_string (help);
}
-
/********************************************************************\
* gnc_option_show_time *
* returns true if the gui should display the time as well as *
@@ -973,15 +954,15 @@ gnc_option_permissible_value_description(GNCOption *option, int index)
* Returns: true if time should be shown *
\********************************************************************/
gboolean
-gnc_option_show_time(GNCOption *option)
+gnc_option_show_time (GNCOption *option)
{
SCM value;
- initialize_getters();
+ initialize_getters ();
- value = scm_call_1(getters.date_option_show_time, option->guile_option);
+ value = scm_call_1 (getters.date_option_show_time, option->guile_option);
- return scm_is_true(value);
+ return scm_is_true (value);
}
/********************************************************************\
@@ -992,14 +973,13 @@ gnc_option_show_time(GNCOption *option)
* Returns: the option data *
\********************************************************************/
SCM
-gnc_option_get_option_data(GNCOption *option)
+gnc_option_get_option_data (GNCOption *option)
{
- initialize_getters();
+ initialize_getters ();
- return scm_call_1(getters.option_data, option->guile_option);
+ return scm_call_1 (getters.option_data, option->guile_option);
}
-
/********************************************************************\
* gnc_option_multiple_selection *
* returns true if the gui should allow multiple selection of *
@@ -1009,15 +989,15 @@ gnc_option_get_option_data(GNCOption *option)
* Returns: true if multiple selection allowed *
\********************************************************************/
gboolean
-gnc_option_multiple_selection(GNCOption *option)
+gnc_option_multiple_selection (GNCOption *option)
{
SCM pair;
- initialize_getters();
+ initialize_getters ();
- pair = scm_call_1(getters.option_data, option->guile_option);
+ pair = scm_call_1 (getters.option_data, option->guile_option);
- return !scm_is_true(scm_not(SCM_CAR(pair)));
+ return !scm_is_true (scm_not (SCM_CAR(pair)));
}
/********************************************************************\
@@ -1030,15 +1010,15 @@ gnc_option_multiple_selection(GNCOption *option)
* Returns: GList of account types (must be freed by caller) *
\********************************************************************/
GList *
-gnc_option_get_account_type_list(GNCOption *option)
+gnc_option_get_account_type_list (GNCOption *option)
{
SCM pair;
SCM lst;
GList *type_list = NULL;
- initialize_getters();
+ initialize_getters ();
- pair = scm_call_1(getters.option_data, option->guile_option);
+ pair = scm_call_1 (getters.option_data, option->guile_option);
lst = SCM_CDR(pair);
while (!scm_is_null (lst))
@@ -1047,12 +1027,12 @@ gnc_option_get_account_type_list(GNCOption *option)
SCM item;
/* Compute this item and the rest of the list */
- item = SCM_CAR (lst);
- lst = SCM_CDR (lst);
+ item = SCM_CAR(lst);
+ lst = SCM_CDR(lst);
if (scm_is_false (scm_integer_p (item)))
{
- PERR ("Invalid type");
+ PERR("Invalid type");
}
else
{
@@ -1064,7 +1044,6 @@ gnc_option_get_account_type_list(GNCOption *option)
return g_list_reverse (type_list);
}
-
/********************************************************************\
* gnc_option_get_range_info *
* returns the range info for a number range option in the pointer*
@@ -1074,53 +1053,53 @@ gnc_option_get_account_type_list(GNCOption *option)
* Args: option - the GNCOption *
* Returns: true if everything went ok :) *
\********************************************************************/
-gboolean gnc_option_get_range_info(GNCOption *option,
- double *lower_bound,
- double *upper_bound,
- int *num_decimals,
- double *step_size)
+gboolean gnc_option_get_range_info (GNCOption *option,
+ double *lower_bound,
+ double *upper_bound,
+ int *num_decimals,
+ double *step_size)
{
SCM list;
SCM value;
- initialize_getters();
+ initialize_getters ();
- list = scm_call_1(getters.option_data, option->guile_option);
+ list = scm_call_1 (getters.option_data, option->guile_option);
- if (!scm_is_list(list) || scm_is_null(list))
+ if (!scm_is_list (list) || scm_is_null (list))
return FALSE;
/* lower bound */
value = SCM_CAR(list);
list = SCM_CDR(list);
- if (!scm_is_number(value))
+ if (!scm_is_number (value))
return FALSE;
if (lower_bound != NULL)
- *lower_bound = scm_to_double(value);
+ *lower_bound = scm_to_double (value);
- if (!scm_is_list(list) || scm_is_null(list))
+ if (!scm_is_list (list) || scm_is_null (list))
return FALSE;
/* upper bound */
value = SCM_CAR(list);
list = SCM_CDR(list);
- if (!scm_is_number(value))
+ if (!scm_is_number (value))
return FALSE;
if (upper_bound != NULL)
- *upper_bound = scm_to_double(value);
+ *upper_bound = scm_to_double (value);
- if (!scm_is_list(list) || scm_is_null(list))
+ if (!scm_is_list (list) || scm_is_null (list))
return FALSE;
/* number of decimals */
value = SCM_CAR(list);
list = SCM_CDR(list);
- if (!scm_is_number(value))
+ if (!scm_is_number (value))
return FALSE;
/* Guile-1.6 returns this as a double, so let's use that in all cases.
@@ -1128,26 +1107,25 @@ gboolean gnc_option_get_range_info(GNCOption *option,
*/
if (num_decimals != NULL)
{
- double decimals = scm_to_double(value);
+ double decimals = scm_to_double (value);
*num_decimals = (int)decimals;
}
- if (!scm_is_list(list) || scm_is_null(list))
+ if (!scm_is_list (list) || scm_is_null (list))
return FALSE;
/* step size */
value = SCM_CAR(list);
- if (!scm_is_number(value))
+ if (!scm_is_number (value))
return FALSE;
if (step_size != NULL)
- *step_size = scm_to_double(value);
+ *step_size = scm_to_double (value);
return TRUE;
}
-
/********************************************************************\
* gnc_option_color_range *
* returns the color range for rgba values. *
@@ -1157,25 +1135,24 @@ gboolean gnc_option_get_range_info(GNCOption *option,
* Returns: color range for the option *
\********************************************************************/
gdouble
-gnc_option_color_range(GNCOption *option)
+gnc_option_color_range (GNCOption *option)
{
SCM list;
SCM value;
- initialize_getters();
+ initialize_getters ();
- list = scm_call_1(getters.option_data, option->guile_option);
- if (!scm_is_list(list) || scm_is_null(list))
+ list = scm_call_1 (getters.option_data, option->guile_option);
+ if (!scm_is_list (list) || scm_is_null (list))
return 0.0;
value = SCM_CAR(list);
- if (!scm_is_number(value))
+ if (!scm_is_number (value))
return 0.0;
- return scm_to_double(value);
+ return scm_to_double (value);
}
-
/********************************************************************\
* gnc_option_use_alpha *
* returns true if the color option should use alpha transparency *
@@ -1185,29 +1162,28 @@ gnc_option_color_range(GNCOption *option)
* Returns: true if alpha transparency should be used *
\********************************************************************/
gdouble
-gnc_option_use_alpha(GNCOption *option)
+gnc_option_use_alpha (GNCOption *option)
{
SCM list;
SCM value;
- initialize_getters();
+ initialize_getters ();
- list = scm_call_1(getters.option_data, option->guile_option);
- if (!scm_is_list(list) || scm_is_null(list))
+ list = scm_call_1 (getters.option_data, option->guile_option);
+ if (!scm_is_list (list) || scm_is_null (list))
return FALSE;
list = SCM_CDR(list);
- if (!scm_is_list(list) || scm_is_null(list))
+ if (!scm_is_list (list) || scm_is_null (list))
return FALSE;
value = SCM_CAR(list);
- if (!scm_is_bool(value))
+ if (!scm_is_bool (value))
return FALSE;
- return scm_is_true(value);
+ return scm_is_true (value);
}
-
/********************************************************************\
* gnc_option_get_color_argb *
* returns the argb value of a color option *
@@ -1216,12 +1192,12 @@ gnc_option_use_alpha(GNCOption *option)
* Returns: argb value of option *
\********************************************************************/
guint32
-gnc_option_get_color_argb(GNCOption *option)
+gnc_option_get_color_argb (GNCOption *option)
{
gdouble red, green, blue, alpha;
guint32 color = 0;
- if (!gnc_option_get_color_info(option, FALSE, &red, &green, &blue, &alpha))
+ if (!gnc_option_get_color_info (option, FALSE, &red, &green, &blue, &alpha))
return 0;
color |= (guint32) (alpha * 255.0);
@@ -1238,7 +1214,6 @@ gnc_option_get_color_argb(GNCOption *option)
return color;
}
-
/********************************************************************\
* gnc_option_get_color_info *
* gets the color information from a color option. rgba values *
@@ -1253,12 +1228,12 @@ gnc_option_get_color_argb(GNCOption *option)
* Return: true if everything went ok *
\********************************************************************/
gboolean
-gnc_option_get_color_info(GNCOption *option,
- gboolean use_default,
- gdouble *red,
- gdouble *green,
- gdouble *blue,
- gdouble *alpha)
+gnc_option_get_color_info (GNCOption *option,
+ gboolean use_default,
+ gdouble *red,
+ gdouble *green,
+ gdouble *blue,
+ gdouble *alpha)
{
gdouble scale;
gdouble rgba;
@@ -1269,54 +1244,53 @@ gnc_option_get_color_info(GNCOption *option,
return FALSE;
if (use_default)
- getter = gnc_option_default_getter(option);
+ getter = gnc_option_default_getter (option);
else
- getter = gnc_option_getter(option);
+ getter = gnc_option_getter (option);
if (getter == SCM_UNDEFINED)
return FALSE;
- value = scm_call_0(getter);
- if (!scm_is_list(value) || scm_is_null(value) || !scm_is_number(SCM_CAR(value)))
+ value = scm_call_0 (getter);
+ if (!scm_is_list (value) || scm_is_null (value) || !scm_is_number (SCM_CAR(value)))
return FALSE;
- scale = gnc_option_color_range(option);
+ scale = gnc_option_color_range (option);
if (scale <= 0.0)
return FALSE;
scale = 1.0 / scale;
- rgba = scm_to_double(SCM_CAR(value));
+ rgba = scm_to_double (SCM_CAR(value));
if (red != NULL)
*red = MIN(1.0, rgba * scale);
value = SCM_CDR(value);
- if (!scm_is_list(value) || scm_is_null(value) || !scm_is_number(SCM_CAR(value)))
+ if (!scm_is_list (value) || scm_is_null (value) || !scm_is_number (SCM_CAR(value)))
return FALSE;
- rgba = scm_to_double(SCM_CAR(value));
+ rgba = scm_to_double (SCM_CAR(value));
if (green != NULL)
*green = MIN(1.0, rgba * scale);
value = SCM_CDR(value);
- if (!scm_is_list(value) || scm_is_null(value) || !scm_is_number(SCM_CAR(value)))
+ if (!scm_is_list (value) || scm_is_null (value) || !scm_is_number (SCM_CAR(value)))
return FALSE;
- rgba = scm_to_double(SCM_CAR(value));
+ rgba = scm_to_double (SCM_CAR(value));
if (blue != NULL)
*blue = MIN(1.0, rgba * scale);
value = SCM_CDR(value);
- if (!scm_is_list(value) || scm_is_null(value) || !scm_is_number(SCM_CAR(value)))
+ if (!scm_is_list (value) || scm_is_null (value) || !scm_is_number (SCM_CAR(value)))
return FALSE;
- rgba = scm_to_double(SCM_CAR(value));
+ rgba = scm_to_double (SCM_CAR(value));
if (alpha != NULL)
*alpha = MIN(1.0, rgba * scale);
return TRUE;
}
-
/********************************************************************\
* gnc_option_set_default *
* set the option to its default value *
@@ -1325,7 +1299,7 @@ gnc_option_get_color_info(GNCOption *option,
* Returns: nothing *
\********************************************************************/
void
-gnc_option_set_default(GNCOption *option)
+gnc_option_set_default (GNCOption *option)
{
SCM default_getter;
SCM setter;
@@ -1334,45 +1308,44 @@ gnc_option_set_default(GNCOption *option)
if (option == NULL)
return;
- default_getter = gnc_option_default_getter(option);
+ default_getter = gnc_option_default_getter (option);
if (default_getter == SCM_UNDEFINED)
return;
- value = scm_call_0(default_getter);
+ value = scm_call_0 (default_getter);
- setter = gnc_option_setter(option);
+ setter = gnc_option_setter (option);
if (setter == SCM_UNDEFINED)
return;
- scm_call_1(setter, value);
+ scm_call_1 (setter, value);
}
-
static gint
-compare_sections(gconstpointer a, gconstpointer b)
+compare_sections (gconstpointer a, gconstpointer b)
{
const GNCOptionSection *sa = a;
const GNCOptionSection *sb = b;
- return g_strcmp0(sa->section_name, sb->section_name);
+ return g_strcmp0 (sa->section_name, sb->section_name);
}
static gint
-compare_option_tags(gconstpointer a, gconstpointer b)
+compare_option_tags (gconstpointer a, gconstpointer b)
{
GNCOption *oa = (GNCOption *) a;
GNCOption *ob = (GNCOption *) b;
- char *tag_a = gnc_option_sort_tag(oa);
- char *tag_b = gnc_option_sort_tag(ob);
+ char *tag_a = gnc_option_sort_tag (oa);
+ char *tag_b = gnc_option_sort_tag (ob);
gint result;
- result = g_strcmp0(tag_a, tag_b);
+ result = g_strcmp0 (tag_a, tag_b);
if (tag_a != NULL)
- free(tag_a);
+ free (tag_a);
if (tag_b != NULL)
- free(tag_b);
+ free (tag_b);
return result;
}
@@ -1385,28 +1358,26 @@ compare_option_tags(gconstpointer a, gconstpointer b)
* Returns: dirty flag *
\********************************************************************/
gboolean
-gnc_option_db_dirty(GNCOptionDB *odb)
+gnc_option_db_dirty (GNCOptionDB *odb)
{
g_return_val_if_fail (odb, FALSE);
return odb->options_dirty;
}
-
/********************************************************************\
* gnc_option_db_clean *
* resets the dirty flag of the option database *
* *
\********************************************************************/
void
-gnc_option_db_clean(GNCOptionDB *odb)
+gnc_option_db_clean (GNCOptionDB *odb)
{
g_return_if_fail (odb);
odb->options_dirty = FALSE;
}
-
/********************************************************************\
* _gnc_option_db_register_option *
* registers an option with an option database. Intended to be *
@@ -1417,56 +1388,56 @@ gnc_option_db_clean(GNCOptionDB *odb)
* Returns: nothing *
\********************************************************************/
void
-gnc_option_db_register_option(GNCOptionDBHandle handle, SCM guile_option)
+gnc_option_db_register_option (GNCOptionDBHandle handle, SCM guile_option)
{
GNCOptionDB *odb;
GNCOption *option;
GNCOptionSection *section;
- odb = g_hash_table_lookup(option_dbs, &handle);
+ odb = g_hash_table_lookup (option_dbs, &handle);
g_return_if_fail (odb != NULL);
odb->options_dirty = TRUE;
/* Make the option structure */
- option = g_new0(GNCOption, 1);
+ option = g_new0 (GNCOption, 1);
option->guile_option = guile_option;
option->changed = FALSE;
option->widget = NULL;
option->odb = odb;
/* Prevent guile from garbage collecting the option */
- scm_gc_protect_object(guile_option);
+ scm_gc_protect_object (guile_option);
/* Make the section structure */
- section = g_new0(GNCOptionSection, 1);
- section->section_name = gnc_option_section(option);
+ section = g_new0 (GNCOptionSection, 1);
+ section->section_name = gnc_option_section (option);
section->options = NULL;
/* See if the section is already there */
{
GSList *old;
- old = g_slist_find_custom(odb->option_sections, section, compare_sections);
+ old = g_slist_find_custom (odb->option_sections, section, compare_sections);
if (old != NULL)
{
if (section->section_name != NULL)
- free(section->section_name);
- g_free(section);
+ free (section->section_name);
+ g_free (section);
section = old->data;
}
else
- odb->option_sections = g_slist_insert_sorted(odb->option_sections,
- section, compare_sections);
+ odb->option_sections = g_slist_insert_sorted (odb->option_sections,
+ section,
+ compare_sections);
}
- section->options = g_slist_insert_sorted(section->options, option,
- compare_option_tags);
+ section->options = g_slist_insert_sorted (section->options, option,
+ compare_option_tags);
}
-
/********************************************************************\
* gnc_option_db_num_sections *
* returns the number of option sections registered so far in the *
@@ -1476,12 +1447,11 @@ gnc_option_db_register_option(GNCOptionDBHandle handle, SCM guile_option)
* Returns: number of option sections *
\********************************************************************/
guint
-gnc_option_db_num_sections(GNCOptionDB *odb)
+gnc_option_db_num_sections (GNCOptionDB *odb)
{
- return g_slist_length(odb->option_sections);
+ return g_slist_length (odb->option_sections);
}
-
/********************************************************************\
* gnc_option_db_get_section *
* returns the ith option section in the database, or NULL *
@@ -1491,12 +1461,11 @@ gnc_option_db_num_sections(GNCOptionDB *odb)
* Returns: ith option sectioin *
\********************************************************************/
GNCOptionSection *
-gnc_option_db_get_section(GNCOptionDB *odb, gint i)
+gnc_option_db_get_section (GNCOptionDB *odb, gint i)
{
- return g_slist_nth_data(odb->option_sections, i);
+ return g_slist_nth_data (odb->option_sections, i);
}
-
/********************************************************************\
* gnc_option_section_name *
* returns the name of the options section *
@@ -1505,12 +1474,11 @@ gnc_option_db_get_section(GNCOptionDB *odb, gint i)
* Returns: name of option section *
\********************************************************************/
const char *
-gnc_option_section_name(GNCOptionSection *section)
+gnc_option_section_name (GNCOptionSection *section)
{
return section->section_name;
}
-
/********************************************************************\
* gnc_option_section_num_options *
* returns the number of options in a given section *
@@ -1519,12 +1487,11 @@ gnc_option_section_name(GNCOptionSection *section)
* Returns: number of options in section *
\********************************************************************/
guint
-gnc_option_section_num_options(GNCOptionSection *section)
+gnc_option_section_num_options (GNCOptionSection *section)
{
- return g_slist_length(section->options);
+ return g_slist_length (section->options);
}
-
/********************************************************************\
* gnc_get_option_section_option *
* returns the ith option in a given section *
@@ -1534,12 +1501,11 @@ gnc_option_section_num_options(GNCOptionSection *section)
* Returns: ith option in section *
\********************************************************************/
GNCOption *
-gnc_get_option_section_option(GNCOptionSection *section, int i)
+gnc_get_option_section_option (GNCOptionSection *section, int i)
{
- return g_slist_nth_data(section->options, i);
+ return g_slist_nth_data (section->options, i);
}
-
/********************************************************************\
* gnc_option_db_get_option_by_name *
* returns an option given section name and name *
@@ -1550,8 +1516,9 @@ gnc_get_option_section_option(GNCOptionSection *section, int i)
* Returns: given option, or NULL if none *
\********************************************************************/
GNCOption *
-gnc_option_db_get_option_by_name(GNCOptionDB *odb, const char *section_name,
- const char *name)
+gnc_option_db_get_option_by_name (GNCOptionDB *odb,
+ const char *section_name,
+ const char *name)
{
GSList *section_node;
GSList *option_node;
@@ -1566,8 +1533,8 @@ gnc_option_db_get_option_by_name(GNCOptionDB *odb, const char *section_name,
section_key.section_name = (char *) section_name;
- section_node = g_slist_find_custom(odb->option_sections, §ion_key,
- compare_sections);
+ section_node = g_slist_find_custom (odb->option_sections, §ion_key,
+ compare_sections);
if (section_node == NULL)
return NULL;
@@ -1579,20 +1546,18 @@ gnc_option_db_get_option_by_name(GNCOptionDB *odb, const char *section_name,
{
option = option_node->data;
- node_name = gnc_option_name(option);
- result = g_strcmp0(name, node_name);
- free(node_name);
+ node_name = gnc_option_name (option);
+ result = g_strcmp0 (name, node_name);
+ free (node_name);
if (result == 0)
return option;
option_node = option_node->next;
}
-
return NULL;
}
-
/********************************************************************\
* gnc_option_db_get_option_by_SCM *
* returns an option given SCM handle. Uses section and name. *
@@ -1602,7 +1567,7 @@ gnc_option_db_get_option_by_name(GNCOptionDB *odb, const char *section_name,
* Returns: given option, or NULL if none *
\********************************************************************/
GNCOption *
-gnc_option_db_get_option_by_SCM(GNCOptionDB *odb, SCM guile_option)
+gnc_option_db_get_option_by_SCM (GNCOptionDB *odb, SCM guile_option)
{
GNCOption option_key;
GNCOption *option;
@@ -1611,64 +1576,62 @@ gnc_option_db_get_option_by_SCM(GNCOptionDB *odb, SCM guile_option)
option_key.guile_option = guile_option;
- section_name = gnc_option_section(&option_key);
- name = gnc_option_name(&option_key);
+ section_name = gnc_option_section (&option_key);
+ name = gnc_option_name (&option_key);
- option = gnc_option_db_get_option_by_name(odb, section_name, name);
+ option = gnc_option_db_get_option_by_name (odb, section_name, name);
if (section_name != NULL)
- free(section_name);
+ free (section_name);
if (name != NULL)
- free(name);
+ free (name);
return option;
}
-
static SCM
-gnc_option_valid_value(GNCOption *option, SCM value)
+gnc_option_valid_value (GNCOption *option, SCM value)
{
SCM validator;
SCM result, ok;
- validator = gnc_option_value_validator(option);
+ validator = gnc_option_value_validator (option);
- result = scm_call_1(validator, value);
- if (!scm_is_list(result) || scm_is_null(result))
+ result = scm_call_1 (validator, value);
+ if (!scm_is_list (result) || scm_is_null (result))
return SCM_UNDEFINED;
ok = SCM_CAR(result);
- if (!scm_is_bool(ok))
+ if (!scm_is_bool (ok))
return SCM_UNDEFINED;
- if (!scm_is_true(ok))
+ if (!scm_is_true (ok))
return SCM_UNDEFINED;
result = SCM_CDR(result);
- if (!scm_is_list(result) || scm_is_null(result))
+ if (!scm_is_list (result) || scm_is_null (result))
return SCM_UNDEFINED;
return SCM_CAR(result);
}
-
static char*
-gnc_commit_option(GNCOption *option)
+gnc_commit_option (GNCOption *option)
{
SCM validator, setter, value;
SCM result, ok;
char* retval = NULL;
/* Validate the ui's value */
- value = gnc_option_get_ui_value(option);
+ value = gnc_option_get_ui_value (option);
if (value == SCM_UNDEFINED)
return NULL;
- validator = gnc_option_value_validator(option);
+ validator = gnc_option_value_validator (option);
result = scm_call_1(validator, value);
- if (!scm_is_list(result) || scm_is_null(result))
+ if (!scm_is_list (result) || scm_is_null (result))
{
PERR("bad validation result\n");
return NULL;
@@ -1676,19 +1639,19 @@ gnc_commit_option(GNCOption *option)
/* First element determines validity */
ok = SCM_CAR(result);
- if (!scm_is_bool(ok))
+ if (!scm_is_bool (ok))
{
PERR("bad validation result\n");
return NULL;
}
- if (scm_is_true(ok))
+ if (scm_is_true (ok))
{
/* Second element is value to use */
value = SCM_CADR(result);
- setter = gnc_option_setter(option);
+ setter = gnc_option_setter (option);
- scm_call_1(setter, value);
+ scm_call_1 (setter, value);
gnc_option_set_ui_value (option, FALSE);
}
@@ -1700,38 +1663,36 @@ gnc_commit_option(GNCOption *option)
const char *format = _("There is a problem with option %s:%s.\n%s");
const char *bad_value = _("Invalid option value");
- name = gnc_option_name(option);
- section = gnc_option_section(option);
+ name = gnc_option_name (option);
+ section = gnc_option_section (option);
/* Second element is error message */
oops = SCM_CADR(result);
- if (!scm_is_string(oops))
+ if (!scm_is_string (oops))
{
PERR("bad validation result\n");
- retval = g_strdup_printf(format,
- section ? section : "(null)",
- name ? name : "(null)",
- bad_value);
+ retval = g_strdup_printf (format,
+ section ? section : "(null)",
+ name ? name : "(null)",
+ bad_value);
}
else
{
message = gnc_scm_to_utf8_string (oops);
- retval = g_strdup_printf(format,
- section ? section : "(null)",
- name ? name : "(null)",
- message ? message : "(null)");
+ retval = g_strdup_printf (format,
+ section ? section : "(null)",
+ name ? name : "(null)",
+ message ? message : "(null)");
}
if (name != NULL)
- free(name);
+ free (name);
if (section != NULL)
- free(section);
+ free (section);
g_free ((gpointer *) message);
}
-
return retval;
}
-
/********************************************************************\
* gnc_option_db_get_changed *
* returns a boolean value, TRUE if any option has changed, *
@@ -1741,7 +1702,7 @@ gnc_commit_option(GNCOption *option)
* Return: boolean *
\********************************************************************/
gboolean
-gnc_option_db_get_changed(GNCOptionDB *odb)
+gnc_option_db_get_changed (GNCOptionDB *odb)
{
GSList *section_node;
GSList *option_node;
@@ -1753,13 +1714,11 @@ gnc_option_db_get_changed(GNCOptionDB *odb)
for (section_node = odb->option_sections; section_node;
section_node = section_node->next)
{
-
section = section_node->data;
for (option_node = section->options; option_node;
option_node = option_node->next)
{
-
option = option_node->data;
if (option->changed)
@@ -1769,7 +1728,6 @@ gnc_option_db_get_changed(GNCOptionDB *odb)
return FALSE;
}
-
/********************************************************************\
* gnc_option_db_commit *
* commits the options which have changed, and which are valid *
@@ -1779,7 +1737,7 @@ gnc_option_db_get_changed(GNCOptionDB *odb)
* Return: nothing *
\********************************************************************/
GList*
-gnc_option_db_commit(GNCOptionDB *odb)
+gnc_option_db_commit (GNCOptionDB *odb)
{
GSList *section_node;
GSList *option_node;
@@ -1803,26 +1761,22 @@ gnc_option_db_commit(GNCOptionDB *odb)
if (option->changed)
{
char *result = NULL;
- result = gnc_commit_option(option_node->data);
+ result = gnc_commit_option (option_node->data);
if (result)
commit_errors = g_list_append (commit_errors, result);
changed_something = TRUE;
option->changed = FALSE;
}
-
option_node = option_node->next;
}
-
section_node = section_node->next;
}
-
if (changed_something)
- gnc_call_option_change_callbacks(odb);
+ gnc_call_option_change_callbacks (odb);
return commit_errors;
}
-
/********************************************************************\
* gnc_option_db_section_reset_widgets *
* reset all option widgets in one section to their default. *
@@ -1855,7 +1809,6 @@ gnc_option_db_section_reset_widgets (GNCOptionSection *section)
}
}
-
/********************************************************************\
* gnc_option_db_reset_widgets *
* reset all option widgets to their default values. *
@@ -1880,7 +1833,6 @@ gnc_option_db_reset_widgets (GNCOptionDB *odb)
}
}
-
/********************************************************************\
* gnc_option_db_get_default_section *
* returns the malloc'd section name of the default section, *
@@ -1890,7 +1842,7 @@ gnc_option_db_reset_widgets (GNCOptionDB *odb)
* Return: g_malloc'd default section name *
\********************************************************************/
char *
-gnc_option_db_get_default_section(GNCOptionDB *odb)
+gnc_option_db_get_default_section (GNCOptionDB *odb)
{
SCM getter;
SCM value;
@@ -1898,18 +1850,17 @@ gnc_option_db_get_default_section(GNCOptionDB *odb)
if (odb == NULL)
return NULL;
- getter = scm_c_eval_string("gnc:options-get-default-section");
- if (!scm_is_procedure(getter))
+ getter = scm_c_eval_string ("gnc:options-get-default-section");
+ if (!scm_is_procedure (getter))
return NULL;
- value = scm_call_1(getter, odb->guile_options);
- if (!scm_is_string(value))
+ value = scm_call_1 (getter, odb->guile_options);
+ if (!scm_is_string (value))
return NULL;
return gnc_scm_to_utf8_string (value);
}
-
/********************************************************************\
* gnc_option_db_lookup_option *
* looks up an option. If present, returns its SCM value, *
@@ -1922,24 +1873,24 @@ gnc_option_db_get_default_section(GNCOptionDB *odb)
* Return: option value *
\********************************************************************/
SCM
-gnc_option_db_lookup_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- SCM default_value)
+gnc_option_db_lookup_option (GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ SCM default_value)
{
GNCOption *option;
SCM getter;
- option = gnc_option_db_get_option_by_name(odb, section, name);
+ option = gnc_option_db_get_option_by_name (odb, section, name);
if (option == NULL)
return default_value;
- getter = gnc_option_getter(option);
+ getter = gnc_option_getter (option);
if (getter == SCM_UNDEFINED)
return default_value;
- return scm_call_0(getter);
+ return scm_call_0 (getter);
}
/********************************************************************\
@@ -1954,33 +1905,32 @@ gnc_option_db_lookup_option(GNCOptionDB *odb,
* Return: gboolean option value *
\********************************************************************/
gboolean
-gnc_option_db_lookup_boolean_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- gboolean default_value)
+gnc_option_db_lookup_boolean_option (GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ gboolean default_value)
{
GNCOption *option;
SCM getter;
SCM value;
- option = gnc_option_db_get_option_by_name(odb, section, name);
+ option = gnc_option_db_get_option_by_name (odb, section, name);
if (option == NULL)
return default_value;
- getter = gnc_option_getter(option);
+ getter = gnc_option_getter (option);
if (getter == SCM_UNDEFINED)
return default_value;
- value = scm_call_0(getter);
+ value = scm_call_0 (getter);
- if (scm_is_bool(value))
- return scm_is_true(value);
+ if (scm_is_bool (value))
+ return scm_is_true (value);
else
return default_value;
}
-
/********************************************************************\
* gnc_option_db_lookup_string_option *
* looks up a string option. If present, returns its malloc'ed *
@@ -1994,24 +1944,24 @@ gnc_option_db_lookup_boolean_option(GNCOptionDB *odb,
* Return: char * option value *
\********************************************************************/
char *
-gnc_option_db_lookup_string_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- const char *default_value)
+gnc_option_db_lookup_string_option (GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ const char *default_value)
{
GNCOption *option;
SCM getter;
SCM value;
- option = gnc_option_db_get_option_by_name(odb, section, name);
+ option = gnc_option_db_get_option_by_name (odb, section, name);
if (option != NULL)
{
- getter = gnc_option_getter(option);
+ getter = gnc_option_getter (option);
if (getter != SCM_UNDEFINED)
{
- value = scm_call_0(getter);
- if (scm_is_string(value))
+ value = scm_call_0 (getter);
+ if (scm_is_string (value))
return gnc_scm_to_utf8_string (value);
}
}
@@ -2019,10 +1969,9 @@ gnc_option_db_lookup_string_option(GNCOptionDB *odb,
if (default_value == NULL)
return NULL;
- return strdup(default_value);
+ return strdup (default_value);
}
-
/********************************************************************\
* gnc_option_db_lookup_font_option *
* looks up a font option. If present, returns its malloc'ed *
@@ -2036,15 +1985,14 @@ gnc_option_db_lookup_string_option(GNCOptionDB *odb,
* Return: char * option value *
\********************************************************************/
char *
-gnc_option_db_lookup_font_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- const char *default_value)
+gnc_option_db_lookup_font_option (GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ const char *default_value)
{
- return gnc_option_db_lookup_string_option(odb, section, name, default_value);
+ return gnc_option_db_lookup_string_option (odb, section, name, default_value);
}
-
/********************************************************************\
* gnc_option_db_lookup_multichoice_option *
* looks up a multichoice option. If present, returns its *
@@ -2059,24 +2007,24 @@ gnc_option_db_lookup_font_option(GNCOptionDB *odb,
* Return: char * option value *
\********************************************************************/
char *
-gnc_option_db_lookup_multichoice_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- const char *default_value)
+gnc_option_db_lookup_multichoice_option (GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ const char *default_value)
{
GNCOption *option;
SCM getter;
SCM value;
- option = gnc_option_db_get_option_by_name(odb, section, name);
+ option = gnc_option_db_get_option_by_name (odb, section, name);
if (option != NULL)
{
- getter = gnc_option_getter(option);
+ getter = gnc_option_getter (option);
if (getter != SCM_UNDEFINED)
{
- value = scm_call_0(getter);
- if (scm_is_symbol(value))
+ value = scm_call_0 (getter);
+ if (scm_is_symbol (value))
return gnc_scm_symbol_to_locale_string (value);
}
}
@@ -2084,7 +2032,7 @@ gnc_option_db_lookup_multichoice_option(GNCOptionDB *odb,
if (default_value == NULL)
return NULL;
- return strdup(default_value);
+ return strdup (default_value);
}
/********************************************************************\
@@ -2099,32 +2047,30 @@ gnc_option_db_lookup_multichoice_option(GNCOptionDB *odb,
* Return: gdouble representation of value *
\********************************************************************/
gdouble
-gnc_option_db_lookup_number_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;
SCM value;
- option = gnc_option_db_get_option_by_name(odb, section, name);
+ option = gnc_option_db_get_option_by_name (odb, section, name);
if (option != NULL)
{
- getter = gnc_option_getter(option);
+ getter = gnc_option_getter (option);
if (getter != SCM_UNDEFINED)
{
- value = scm_call_0(getter);
- if (scm_is_number(value))
- return scm_to_double(value);
+ value = scm_call_0 (getter);
+ if (scm_is_number (value))
+ return scm_to_double (value);
}
}
-
return default_value;
}
-
/********************************************************************\
* gnc_option_db_lookup_color_option *
* looks up a color option. If present, returns its value in the *
@@ -2139,22 +2085,21 @@ gnc_option_db_lookup_number_option(GNCOptionDB *odb,
* alpha - where to store the alpha value *
* Return: true if option was found *
\********************************************************************/
-gboolean gnc_option_db_lookup_color_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- gdouble *red,
- gdouble *green,
- gdouble *blue,
- gdouble *alpha)
+gboolean gnc_option_db_lookup_color_option (GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ gdouble *red,
+ gdouble *green,
+ gdouble *blue,
+ gdouble *alpha)
{
GNCOption *option;
- option = gnc_option_db_get_option_by_name(odb, section, name);
+ option = gnc_option_db_get_option_by_name (odb, section, name);
- return gnc_option_get_color_info(option, FALSE, red, green, blue, alpha);
+ return gnc_option_get_color_info (option, FALSE, red, green, blue, alpha);
}
-
/********************************************************************\
* gnc_option_db_lookup_color_option_argb *
* looks up a color option. If present, returns its argb value, *
@@ -2166,21 +2111,20 @@ gboolean gnc_option_db_lookup_color_option(GNCOptionDB *odb,
* default_value - default value to return if problem *
* Return: argb value *
\********************************************************************/
-guint32 gnc_option_db_lookup_color_option_argb(GNCOptionDB *odb,
- const char *section,
- const char *name,
- guint32 default_value)
+guint32 gnc_option_db_lookup_color_option_argb (GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ guint32 default_value)
{
GNCOption *option;
- option = gnc_option_db_get_option_by_name(odb, section, name);
+ option = gnc_option_db_get_option_by_name (odb, section, name);
if (option == NULL)
return default_value;
- return gnc_option_get_color_argb(option);
+ return gnc_option_get_color_argb (option);
}
-
/********************************************************************\
* gnc_option_db_lookup_list_option *
* looks up a list option. If present, returns its value as a *
@@ -2193,10 +2137,10 @@ guint32 gnc_option_db_lookup_color_option_argb(GNCOptionDB *odb,
* Return: list of values *
\********************************************************************/
GSList *
-gnc_option_db_lookup_list_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- GSList *default_value)
+gnc_option_db_lookup_list_option (GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ GSList *default_value)
{
GNCOption *option;
GSList *list = NULL;
@@ -2204,41 +2148,39 @@ gnc_option_db_lookup_list_option(GNCOptionDB *odb,
SCM value;
SCM item;
- option = gnc_option_db_get_option_by_name(odb, section, name);
+ option = gnc_option_db_get_option_by_name (odb, section, name);
if (option == NULL)
return default_value;
- getter = gnc_option_getter(option);
+ getter = gnc_option_getter (option);
if (getter == SCM_UNDEFINED)
return default_value;
- value = scm_call_0(getter);
- while (scm_is_list(value) && !scm_is_null(value))
+ value = scm_call_0 (getter);
+ while (scm_is_list (value) && !scm_is_null (value))
{
item = SCM_CAR(value);
value = SCM_CDR(value);
- if (!scm_is_symbol(item))
+ if (!scm_is_symbol (item))
{
- gnc_free_list_option_value(list);
+ gnc_free_list_option_value (list);
return default_value;
}
- list = g_slist_prepend(list, gnc_scm_symbol_to_locale_string (item));
+ list = g_slist_prepend (list, gnc_scm_symbol_to_locale_string (item));
}
- if (!scm_is_list(value) || !scm_is_null(value))
+ if (!scm_is_list (value) || !scm_is_null (value))
{
- gnc_free_list_option_value(list);
+ gnc_free_list_option_value (list);
return default_value;
}
-
return list;
}
-
/********************************************************************\
* gnc_option_db_lookup_currency_option *
* looks up a currency option. If present, returns its value as a *
@@ -2251,42 +2193,42 @@ gnc_option_db_lookup_list_option(GNCOptionDB *odb,
* Return: commodity or NULL if no commodity found *
\********************************************************************/
gnc_commodity *
-gnc_option_db_lookup_currency_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- gnc_commodity *default_value)
+gnc_option_db_lookup_currency_option (GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ gnc_commodity *default_value)
{
GNCOption *option;
SCM getter;
SCM value;
- option = gnc_option_db_get_option_by_name(odb, section, name);
+ option = gnc_option_db_get_option_by_name (odb, section, name);
if (option == NULL)
return default_value;
- getter = gnc_option_getter(option);
+ getter = gnc_option_getter (option);
if (getter == SCM_UNDEFINED)
return default_value;
- value = scm_call_0(getter);
+ value = scm_call_0 (getter);
return gnc_scm_to_commodity (value);
}
static void
-free_helper(gpointer string, gpointer not_used)
+free_helper (gpointer string, gpointer not_used)
{
- if (string) free(string);
+ if (string)
+ free (string);
}
void
-gnc_free_list_option_value(GSList *list)
+gnc_free_list_option_value (GSList *list)
{
- g_slist_foreach(list, free_helper, NULL);
- g_slist_free(list);
+ g_slist_foreach (list, free_helper, NULL);
+ g_slist_free (list);
}
-
/********************************************************************\
* gnc_option_db_set_option_default *
* set the option to its default value *
@@ -2297,18 +2239,17 @@ gnc_free_list_option_value(GSList *list)
* Returns: nothing *
\********************************************************************/
void
-gnc_option_db_set_option_default(GNCOptionDB *odb,
- const char *section,
- const char *name)
+gnc_option_db_set_option_default (GNCOptionDB *odb,
+ const char *section,
+ const char *name)
{
GNCOption *option;
- option = gnc_option_db_get_option_by_name(odb, section, name);
+ option = gnc_option_db_get_option_by_name (odb, section, name);
- gnc_option_set_default(option);
+ gnc_option_set_default (option);
}
-
/********************************************************************\
* gnc_option_db_set_option *
* sets the option to the given value. If successful *
@@ -2321,32 +2262,31 @@ gnc_option_db_set_option_default(GNCOptionDB *odb,
* Return: success indicator *
\********************************************************************/
gboolean
-gnc_option_db_set_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- SCM value)
+gnc_option_db_set_option (GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ SCM value)
{
GNCOption *option;
SCM setter;
- option = gnc_option_db_get_option_by_name(odb, section, name);
+ option = gnc_option_db_get_option_by_name (odb, section, name);
if (option == NULL)
return FALSE;
- value = gnc_option_valid_value(option, value);
+ value = gnc_option_valid_value (option, value);
if (value == SCM_UNDEFINED)
return FALSE;
- setter = gnc_option_setter(option);
+ setter = gnc_option_setter (option);
if (setter == SCM_UNDEFINED)
return FALSE;
- scm_call_1(setter, value);
+ scm_call_1 (setter, value);
return TRUE;
}
-
/********************************************************************\
* gnc_option_db_set_number_option *
* sets the number option to the given value. If successful *
@@ -2359,30 +2299,30 @@ gnc_option_db_set_option(GNCOptionDB *odb,
* Return: success indicator *
\********************************************************************/
gboolean
-gnc_option_db_set_number_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;
SCM setter;
- option = gnc_option_db_get_option_by_name(odb, section, name);
+ option = gnc_option_db_get_option_by_name (odb, section, name);
if (option == NULL)
return FALSE;
scm_value = scm_from_double (value);
- scm_value = gnc_option_valid_value(option, scm_value);
+ scm_value = gnc_option_valid_value (option, scm_value);
if (scm_value == SCM_UNDEFINED)
return FALSE;
- setter = gnc_option_setter(option);
+ setter = gnc_option_setter (option);
if (setter == SCM_UNDEFINED)
return FALSE;
- scm_call_1(setter, scm_value);
+ scm_call_1 (setter, scm_value);
return TRUE;
}
@@ -2399,30 +2339,30 @@ gnc_option_db_set_number_option(GNCOptionDB *odb,
* Return: success indicator *
\********************************************************************/
gboolean
-gnc_option_db_set_boolean_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- gboolean value)
+gnc_option_db_set_boolean_option (GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ gboolean value)
{
GNCOption *option;
SCM scm_value;
SCM setter;
- option = gnc_option_db_get_option_by_name(odb, section, name);
+ option = gnc_option_db_get_option_by_name (odb, section, name);
if (option == NULL)
return FALSE;
scm_value = SCM_BOOL(value);
- scm_value = gnc_option_valid_value(option, scm_value);
+ scm_value = gnc_option_valid_value (option, scm_value);
if (scm_value == SCM_UNDEFINED)
return FALSE;
- setter = gnc_option_setter(option);
+ setter = gnc_option_setter (option);
if (setter == SCM_UNDEFINED)
return FALSE;
- scm_call_1(setter, scm_value);
+ scm_call_1 (setter, scm_value);
return TRUE;
}
@@ -2439,33 +2379,33 @@ gnc_option_db_set_boolean_option(GNCOptionDB *odb,
* Return: success indicator *
\********************************************************************/
gboolean
-gnc_option_db_set_string_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- const char *value)
+gnc_option_db_set_string_option (GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ const char *value)
{
GNCOption *option;
SCM scm_value;
SCM setter;
- option = gnc_option_db_get_option_by_name(odb, section, name);
+ option = gnc_option_db_get_option_by_name (odb, section, name);
if (option == NULL)
return FALSE;
if (value)
- scm_value = scm_from_utf8_string(value);
+ scm_value = scm_from_utf8_string (value);
else
scm_value = SCM_BOOL_F;
- scm_value = gnc_option_valid_value(option, scm_value);
+ scm_value = gnc_option_valid_value (option, scm_value);
if (scm_value == SCM_UNDEFINED)
return FALSE;
- setter = gnc_option_setter(option);
+ setter = gnc_option_setter (option);
if (setter == SCM_UNDEFINED)
return FALSE;
- scm_call_1(setter, scm_value);
+ scm_call_1 (setter, scm_value);
return TRUE;
}
@@ -2478,11 +2418,11 @@ gnc_option_db_set_string_option(GNCOptionDB *odb,
* Return: newly allocated subtype string or NULL *
\*******************************************************************/
char *
-gnc_option_date_option_get_subtype(GNCOption *option)
+gnc_option_date_option_get_subtype (GNCOption *option)
{
- initialize_getters();
+ initialize_getters ();
- return gnc_scm_call_1_symbol_to_string(getters.date_option_subtype, option->guile_option);
+ return gnc_scm_call_1_symbol_to_string (getters.date_option_subtype, option->guile_option);
}
/*******************************************************************\
@@ -2495,7 +2435,7 @@ gnc_option_date_option_get_subtype(GNCOption *option)
char *
gnc_date_option_value_get_type (SCM option_value)
{
- initialize_getters();
+ initialize_getters ();
return gnc_scm_call_1_symbol_to_string (getters.date_option_value_type, option_value);
}
@@ -2511,7 +2451,7 @@ time64
gnc_date_option_value_get_absolute (SCM option_value)
{
SCM value;
- initialize_getters();
+ initialize_getters ();
value = scm_call_1 (getters.date_option_value_absolute, option_value);
return scm_to_int64 (value);
}
@@ -2526,7 +2466,7 @@ gnc_date_option_value_get_absolute (SCM option_value)
SCM
gnc_date_option_value_get_relative (SCM option_value)
{
- initialize_getters();
+ initialize_getters ();
return scm_call_1 (getters.date_option_value_relative, option_value);
}
@@ -2541,7 +2481,7 @@ gnc_date_option_value_get_relative (SCM option_value)
char *
gnc_plot_size_option_value_get_type (SCM option_value)
{
- initialize_getters();
+ initialize_getters ();
return gnc_scm_call_1_symbol_to_string (getters.plot_size_option_value_type, option_value);
}
@@ -2558,11 +2498,11 @@ gnc_plot_size_option_value_get_value (SCM option_value)
{
SCM value;
- initialize_getters();
+ initialize_getters ();
value = scm_call_1 (getters.plot_size_option_value, option_value);
- if (scm_is_number(value))
+ if (scm_is_number (value))
return scm_to_double (value);
else
return 1.0;
@@ -2578,16 +2518,15 @@ gnc_plot_size_option_value_get_value (SCM option_value)
* Returns: malloc'ed char * or NULL *
\********************************************************************/
char *
-gnc_currency_accounting_option_currency_documentation(GNCOption *option)
+gnc_currency_accounting_option_currency_documentation (GNCOption *option)
{
- initialize_getters();
+ initialize_getters ();
return gnc_scm_call_1_to_string
(getters.currency_accounting_option_currency_doc_string,
option->guile_option);
}
-
/********************************************************************\
* gnc_currency_accounting_option_get_default_currency *
* returns the SCM value for the currency-accounting option *
@@ -2597,16 +2536,15 @@ gnc_currency_accounting_option_currency_documentation(GNCOption *option)
* Returns: SCM value *
\********************************************************************/
SCM
-gnc_currency_accounting_option_get_default_currency(GNCOption *option)
+gnc_currency_accounting_option_get_default_currency (GNCOption *option)
{
- initialize_getters();
+ initialize_getters ();
return scm_call_1
(getters.currency_accounting_option_default_currency,
option->guile_option);
}
-
/********************************************************************\
* gnc_currency_accounting_option_policy_documentation *
* returns the malloc'ed documentation string for policy *
@@ -2617,16 +2555,15 @@ gnc_currency_accounting_option_get_default_currency(GNCOption *option)
* Returns: malloc'ed char * or NULL *
\********************************************************************/
char *
-gnc_currency_accounting_option_policy_documentation(GNCOption *option)
+gnc_currency_accounting_option_policy_documentation (GNCOption *option)
{
- initialize_getters();
+ initialize_getters ();
return gnc_scm_call_1_to_string
(getters.currency_accounting_option_policy_doc_string,
option->guile_option);
}
-
/********************************************************************\
* gnc_currency_accounting_option_get_default_policy *
* returns the SCM value for the currency-accounting option *
@@ -2636,16 +2573,15 @@ gnc_currency_accounting_option_policy_documentation(GNCOption *option)
* Returns: SCM value *
\********************************************************************/
SCM
-gnc_currency_accounting_option_get_default_policy(GNCOption *option)
+gnc_currency_accounting_option_get_default_policy (GNCOption *option)
{
- initialize_getters();
+ initialize_getters ();
return scm_call_1
(getters.currency_accounting_option_default_policy,
option->guile_option);
}
-
/********************************************************************\
* gnc_currency_accounting_option_gain_loss_account_documentation *
* returns the malloc'ed documentation string for account *
@@ -2656,16 +2592,15 @@ gnc_currency_accounting_option_get_default_policy(GNCOption *option)
* Returns: malloc'ed char * or NULL *
\********************************************************************/
char *
-gnc_currency_accounting_option_gain_loss_account_documentation(GNCOption *option)
+gnc_currency_accounting_option_gain_loss_account_documentation (GNCOption *option)
{
- initialize_getters();
+ initialize_getters ();
return gnc_scm_call_1_to_string
(getters.currency_accounting_option_gain_loss_account_doc_string,
option->guile_option);
}
-
/*******************************************************************\
* gnc_currency_accounting_option_value_get_method *
* get the currency accounting method of the option as a symbol *
@@ -2676,9 +2611,10 @@ gnc_currency_accounting_option_gain_loss_account_documentation(GNCOption *option
SCM
gnc_currency_accounting_option_value_get_method (SCM option_value)
{
- initialize_getters();
+ initialize_getters ();
- return scm_call_1 (getters.currency_accounting_option_method, option_value);
+ return scm_call_1 (getters.currency_accounting_option_method,
+ option_value);
}
/*******************************************************************\
@@ -2692,9 +2628,10 @@ gnc_currency_accounting_option_value_get_method (SCM option_value)
SCM
gnc_currency_accounting_option_value_get_book_currency (SCM option_value)
{
- initialize_getters();
+ initialize_getters ();
- return scm_call_1 (getters.currency_accounting_option_book_currency, option_value);
+ return scm_call_1 (getters.currency_accounting_option_book_currency,
+ option_value);
}
/*******************************************************************\
@@ -2708,7 +2645,7 @@ gnc_currency_accounting_option_value_get_book_currency (SCM option_value)
SCM
gnc_currency_accounting_option_value_get_default_policy (SCM option_value)
{
- initialize_getters();
+ initialize_getters ();
return scm_call_1
(getters.currency_accounting_option_selected_default_policy,
@@ -2727,7 +2664,7 @@ gnc_currency_accounting_option_value_get_default_policy (SCM option_value)
SCM
gnc_currency_accounting_option_value_get_default_account (SCM option_value)
{
- initialize_getters();
+ initialize_getters ();
return scm_call_1
(getters.currency_accounting_option_selected_default_gain_loss_account,
@@ -2740,12 +2677,10 @@ find_option_db_with_selectable_pred (gpointer key, gpointer value, gpointer data
SCM guile_options = data;
GNCOptionDB *odb = value;
- if (odb && (odb->guile_options == guile_options)
- && odb->set_selectable )
+ if (odb && (odb->guile_options == guile_options) && odb->set_selectable)
return TRUE;
return FALSE;
-
}
static GNCOptionDB *
@@ -2766,10 +2701,10 @@ find_option_db_with_selectable (SCM guile_options)
* Return: SCM value *
\*******************************************************************/
void
-gnc_option_db_set_option_selectable_by_name(SCM guile_options,
- const char *section,
- const char *name,
- gboolean selectable)
+gnc_option_db_set_option_selectable_by_name (SCM guile_options,
+ const char *section,
+ const char *name,
+ gboolean selectable)
{
GNCOptionDB *odb;
GNCOption *option;
@@ -2778,7 +2713,7 @@ gnc_option_db_set_option_selectable_by_name(SCM guile_options,
if (!odb)
return;
- option = gnc_option_db_get_option_by_name(odb, section, name);
+ option = gnc_option_db_get_option_by_name (odb, section, name);
if (!option)
return;
@@ -2789,31 +2724,32 @@ gnc_option_db_set_option_selectable_by_name(SCM guile_options,
* format(symbol), month(symbol), include-years(bool), custom-string(string)
*/
-gboolean gnc_dateformat_option_value_parse(SCM value, QofDateFormat *format,
- GNCDateMonthFormat *months,
- gboolean *years, char **custom)
+gboolean gnc_dateformat_option_value_parse (SCM value,
+ QofDateFormat *format,
+ GNCDateMonthFormat *months,
+ gboolean *years,
+ char **custom)
{
SCM val;
gchar *str;
- if (!scm_is_list(value) || scm_is_null(value))
+ if (!scm_is_list (value) || scm_is_null (value))
return TRUE;
do
{
-
/* Parse the format */
val = SCM_CAR(value);
value = SCM_CDR(value);
- if (!scm_is_symbol(val))
+ if (!scm_is_symbol (val))
break;
- str = gnc_scm_symbol_to_locale_string (val);
+ str = gnc_scm_symbol_to_locale_string (val);
if (!str)
break;
if (format)
{
- if (gnc_date_string_to_dateformat(str, format))
+ if (gnc_date_string_to_dateformat (str, format))
{
g_free (str);
break;
@@ -2824,7 +2760,7 @@ gboolean gnc_dateformat_option_value_parse(SCM value, QofDateFormat *format,
/* parse the months */
val = SCM_CAR(value);
value = SCM_CDR(value);
- if (!scm_is_symbol(val))
+ if (!scm_is_symbol (val))
break;
str = gnc_scm_symbol_to_locale_string (val);
if (!str)
@@ -2832,7 +2768,7 @@ gboolean gnc_dateformat_option_value_parse(SCM value, QofDateFormat *format,
if (months)
{
- if (gnc_date_string_to_monthformat(str, months))
+ if (gnc_date_string_to_monthformat (str, months))
{
g_free (str);
break;
@@ -2843,33 +2779,34 @@ gboolean gnc_dateformat_option_value_parse(SCM value, QofDateFormat *format,
/* parse the years */
val = SCM_CAR(value);
value = SCM_CDR(value);
- if (!scm_is_bool(val))
+ if (!scm_is_bool (val))
break;
if (years)
- *years = scm_is_true(val);
+ *years = scm_is_true (val);
/* parse the custom */
val = SCM_CAR(value);
value = SCM_CDR(value);
- if (!scm_is_string(val))
+ if (!scm_is_string (val))
break;
- if (!scm_is_null(value))
+ if (!scm_is_null (value))
break;
if (custom)
*custom = gnc_scm_to_utf8_string (val);
return FALSE;
-
}
while (FALSE);
return TRUE;
}
-SCM gnc_dateformat_option_set_value(QofDateFormat format, GNCDateMonthFormat months,
- gboolean years, const char *custom)
+SCM gnc_dateformat_option_set_value (QofDateFormat format,
+ GNCDateMonthFormat months,
+ gboolean years,
+ const char *custom)
{
SCM value = SCM_EOL;
SCM val;
@@ -2877,27 +2814,27 @@ SCM gnc_dateformat_option_set_value(QofDateFormat format, GNCDateMonthFormat mon
/* build the list in reverse order */
if (custom)
- val = scm_from_utf8_string(custom);
+ val = scm_from_utf8_string (custom);
else
val = SCM_BOOL_F;
- value = scm_cons(val, value);
+ value = scm_cons (val, value);
val = SCM_BOOL(years);
- value = scm_cons(val, value);
+ value = scm_cons (val, value);
- str = gnc_date_monthformat_to_string(months);
+ str = gnc_date_monthformat_to_string (months);
if (str)
- val = scm_from_locale_symbol(str);
+ val = scm_from_locale_symbol (str);
else
val = SCM_BOOL_F;
- value = scm_cons(val, value);
+ value = scm_cons (val, value);
- str = gnc_date_dateformat_to_string(format);
+ str = gnc_date_dateformat_to_string (format);
if (str)
- val = scm_from_locale_symbol(str);
+ val = scm_from_locale_symbol (str);
else
val = SCM_BOOL_F;
- value = scm_cons(val, value);
+ value = scm_cons (val, value);
return value;
}
@@ -2908,12 +2845,12 @@ SCM gnc_dateformat_option_set_value(QofDateFormat format, GNCDateMonthFormat mon
* its defined kvp options.
*/
void
-gnc_register_kvp_option_generator(QofIdType id_type, SCM generator)
+gnc_register_kvp_option_generator (QofIdType id_type, SCM generator)
{
GList *list;
init_table();
- list = g_hash_table_lookup(kvp_registry, id_type);
- list = g_list_prepend(list, generator);
- g_hash_table_insert(kvp_registry, (gpointer) id_type, list);
- scm_gc_protect_object(generator);
+ list = g_hash_table_lookup (kvp_registry, id_type);
+ list = g_list_prepend (list, generator);
+ g_hash_table_insert (kvp_registry, (gpointer) id_type, list);
+ scm_gc_protect_object (generator);
}
diff --git a/libgnucash/app-utils/option-util.h b/libgnucash/app-utils/option-util.h
index ee963ab5f..1ea0d5ab7 100644
--- a/libgnucash/app-utils/option-util.h
+++ b/libgnucash/app-utils/option-util.h
@@ -60,186 +60,185 @@ gpointer gnc_option_get_widget (GNCOption *option);
* here. */
void gnc_option_set_widget (GNCOption *option, gpointer widget);
-SCM gnc_option_get_ui_value(GNCOption *option);
-void gnc_option_set_ui_value(GNCOption *option, gboolean use_default);
+SCM gnc_option_get_ui_value (GNCOption *option);
+void gnc_option_set_ui_value (GNCOption *option, gboolean use_default);
void gnc_option_set_selectable (GNCOption *option, gboolean selectable);
-GNCOptionDB * gnc_option_db_new(SCM guile_options);
-void gnc_option_db_destroy(GNCOptionDB *odb);
+GNCOptionDB * gnc_option_db_new (SCM guile_options);
+void gnc_option_db_destroy (GNCOptionDB *odb);
/* Create an option DB for a particular type, and save/load from a kvp.
* This assumes the gnc:*kvp-option-path* location for the options
* in the kvp.
*/
-GNCOptionDB * gnc_option_db_new_for_type(QofIdType id_type);
-void gnc_option_db_load(GNCOptionDB* odb, QofBook *book);
-void gnc_option_db_save(GNCOptionDB* odb, QofBook *book, gboolean clear_all);
+GNCOptionDB * gnc_option_db_new_for_type (QofIdType id_type);
+void gnc_option_db_load (GNCOptionDB* odb, QofBook *book);
+void gnc_option_db_save (GNCOptionDB* odb, QofBook *book, gboolean clear_all);
-void gnc_register_kvp_option_generator(QofIdType id_type, SCM generator);
+void gnc_register_kvp_option_generator (QofIdType id_type, SCM generator);
void gnc_option_db_set_ui_callbacks (GNCOptionDB *odb,
GNCOptionGetUIValue get_ui_value,
GNCOptionSetUIValue set_ui_value,
GNCOptionSetSelectable set_selectable);
-SCM gnc_option_db_register_change_callback(GNCOptionDB *odb,
- GNCOptionChangeCallback callback,
- gpointer data,
- const char *section,
- const char *name);
-
-void gnc_option_db_unregister_change_callback_id(GNCOptionDB *odb,
- SCM callback_id);
-
-char * gnc_option_section(GNCOption *option);
-char * gnc_option_name(GNCOption *option);
-char * gnc_option_type(GNCOption *option);
-char * gnc_option_sort_tag(GNCOption *option);
-char * gnc_option_documentation(GNCOption *option);
-SCM gnc_option_getter(GNCOption *option);
-SCM gnc_option_setter(GNCOption *option);
-SCM gnc_option_default_getter(GNCOption *option);
-SCM gnc_option_value_validator(GNCOption *option);
-SCM gnc_option_widget_changed_proc_getter(GNCOption *option);
-SCM gnc_option_get_option_data(GNCOption *option);
-
-int gnc_option_num_permissible_values(GNCOption *option);
-int gnc_option_permissible_value_index(GNCOption *option, SCM value);
-SCM gnc_option_permissible_value(GNCOption *option, int index);
-char * gnc_option_permissible_value_name(GNCOption *option, int index);
-char * gnc_option_permissible_value_description(GNCOption *option, int index);
-
-gboolean gnc_option_show_time(GNCOption *option);
-
-gboolean gnc_option_multiple_selection(GNCOption *option);
-GList * gnc_option_get_account_type_list(GNCOption *option);
-
-gboolean gnc_option_get_range_info(GNCOption *option,
- double *lower_bound,
- double *upper_bound,
- int *num_decimals,
- double *step_size);
-
-gdouble gnc_option_color_range(GNCOption *option);
-gdouble gnc_option_use_alpha(GNCOption *option);
-guint32 gnc_option_get_color_argb(GNCOption *option);
-gboolean gnc_option_get_color_info(GNCOption *option,
- gboolean use_default,
- gdouble *red,
- gdouble *green,
- gdouble *blue,
- gdouble *alpha);
+SCM gnc_option_db_register_change_callback (GNCOptionDB *odb,
+ GNCOptionChangeCallback callback,
+ gpointer data,
+ const char *section,
+ const char *name);
+
+void gnc_option_db_unregister_change_callback_id (GNCOptionDB *odb,
+ SCM callback_id);
+
+char * gnc_option_section (GNCOption *option);
+char * gnc_option_name (GNCOption *option);
+char * gnc_option_type (GNCOption *option);
+char * gnc_option_sort_tag (GNCOption *option);
+char * gnc_option_documentation (GNCOption *option);
+SCM gnc_option_getter (GNCOption *option);
+SCM gnc_option_setter (GNCOption *option);
+SCM gnc_option_default_getter (GNCOption *option);
+SCM gnc_option_value_validator (GNCOption *option);
+SCM gnc_option_widget_changed_proc_getter (GNCOption *option);
+SCM gnc_option_get_option_data (GNCOption *option);
+
+int gnc_option_num_permissible_values (GNCOption *option);
+int gnc_option_permissible_value_index (GNCOption *option, SCM value);
+SCM gnc_option_permissible_value (GNCOption *option, int index);
+char * gnc_option_permissible_value_name (GNCOption *option, int index);
+char * gnc_option_permissible_value_description (GNCOption *option, int index);
+
+gboolean gnc_option_show_time (GNCOption *option);
+
+gboolean gnc_option_multiple_selection (GNCOption *option);
+GList * gnc_option_get_account_type_list (GNCOption *option);
+
+gboolean gnc_option_get_range_info (GNCOption *option,
+ double *lower_bound,
+ double *upper_bound,
+ int *num_decimals,
+ double *step_size);
+
+gdouble gnc_option_color_range (GNCOption *option);
+gdouble gnc_option_use_alpha (GNCOption *option);
+guint32 gnc_option_get_color_argb (GNCOption *option);
+gboolean gnc_option_get_color_info (GNCOption *option,
+ gboolean use_default,
+ gdouble *red,
+ gdouble *green,
+ gdouble *blue,
+ gdouble *alpha);
void gnc_option_call_option_widget_changed_proc (GNCOption *option,
gboolean reset_changed);
-void gnc_option_set_default(GNCOption *option);
+void gnc_option_set_default (GNCOption *option);
-guint gnc_option_db_num_sections(GNCOptionDB *odb);
+guint gnc_option_db_num_sections (GNCOptionDB *odb);
-const char * gnc_option_section_name(GNCOptionSection *section);
-guint gnc_option_section_num_options(GNCOptionSection *section);
+const char * gnc_option_section_name (GNCOptionSection *section);
+guint gnc_option_section_num_options (GNCOptionSection *section);
-GNCOptionSection * gnc_option_db_get_section(GNCOptionDB *odb, gint i);
+GNCOptionSection * gnc_option_db_get_section (GNCOptionDB *odb, gint i);
-GNCOption * gnc_get_option_section_option(GNCOptionSection *section, int i);
+GNCOption * gnc_get_option_section_option (GNCOptionSection *section, int i);
-GNCOption * gnc_option_db_get_option_by_name(GNCOptionDB *odb,
- const char *section_name,
- const char *name);
+GNCOption * gnc_option_db_get_option_by_name (GNCOptionDB *odb,
+ const char *section_name,
+ const char *name);
-GNCOption * gnc_option_db_get_option_by_SCM(GNCOptionDB *odb,
- SCM guile_option);
+GNCOption * gnc_option_db_get_option_by_SCM (GNCOptionDB *odb,
+ SCM guile_option);
-gboolean gnc_option_db_dirty(GNCOptionDB *odb);
-void gnc_option_db_clean(GNCOptionDB *odb);
+gboolean gnc_option_db_dirty (GNCOptionDB *odb);
+void gnc_option_db_clean (GNCOptionDB *odb);
-gboolean gnc_option_db_get_changed(GNCOptionDB *odb);
-GList* gnc_option_db_commit(GNCOptionDB *odb);
+gboolean gnc_option_db_get_changed (GNCOptionDB *odb);
+GList* gnc_option_db_commit (GNCOptionDB *odb);
-char * gnc_option_db_get_default_section(GNCOptionDB *odb);
+char * gnc_option_db_get_default_section (GNCOptionDB *odb);
-SCM gnc_option_db_lookup_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- SCM default_value);
+SCM gnc_option_db_lookup_option (GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ SCM default_value);
-gboolean gnc_option_db_lookup_boolean_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- gboolean default_value);
+gboolean gnc_option_db_lookup_boolean_option (GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ gboolean default_value);
-char * gnc_option_db_lookup_string_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- const char *default_value);
+char * gnc_option_db_lookup_string_option (GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ const char *default_value);
-char * gnc_option_db_lookup_font_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- const char *default_value);
+char * gnc_option_db_lookup_font_option (GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ const char *default_value);
-char * gnc_option_db_lookup_multichoice_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- const char *default_value);
+char * gnc_option_db_lookup_multichoice_option (GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ const char *default_value);
-gdouble gnc_option_db_lookup_number_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,
- const char *name,
- gdouble *red,
- gdouble *green,
- gdouble *blue,
- gdouble *alpha);
+gboolean gnc_option_db_lookup_color_option (GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ gdouble *red,
+ gdouble *green,
+ gdouble *blue,
+ gdouble *alpha);
-guint32 gnc_option_db_lookup_color_option_argb(GNCOptionDB *odb,
- const char *section,
- const char *name,
- guint32 default_value);
+guint32 gnc_option_db_lookup_color_option_argb (GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ guint32 default_value);
-GSList * gnc_option_db_lookup_list_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- GSList *default_value);
+GSList * gnc_option_db_lookup_list_option (GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ GSList *default_value);
-void gnc_free_list_option_value(GSList *list);
+void gnc_free_list_option_value (GSList *list);
-gnc_commodity *
-gnc_option_db_lookup_currency_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- gnc_commodity *default_value);
+gnc_commodity * gnc_option_db_lookup_currency_option (GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ gnc_commodity *default_value);
-void gnc_option_db_set_option_default(GNCOptionDB *odb,
- const char *section,
- const char *name);
+void gnc_option_db_set_option_default (GNCOptionDB *odb,
+ const char *section,
+ const char *name);
-gboolean gnc_option_db_set_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- SCM value);
+gboolean gnc_option_db_set_option (GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ SCM value);
-gboolean gnc_option_db_set_number_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);
-gboolean gnc_option_db_set_boolean_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- gboolean value);
+gboolean gnc_option_db_set_boolean_option (GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ gboolean value);
-gboolean gnc_option_db_set_string_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- const char *value);
+gboolean gnc_option_db_set_string_option (GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ const char *value);
-char * gnc_option_date_option_get_subtype(GNCOption *option);
+char * gnc_option_date_option_get_subtype (GNCOption *option);
char * gnc_date_option_value_get_type (SCM option_value);
time64 gnc_date_option_value_get_absolute (SCM option_value);
@@ -248,34 +247,37 @@ SCM gnc_date_option_value_get_relative (SCM option_value);
char * gnc_plot_size_option_value_get_type (SCM option_value);
gdouble gnc_plot_size_option_value_get_value (SCM option_value);
-char * gnc_currency_accounting_option_currency_documentation(GNCOption *option);
-SCM gnc_currency_accounting_option_get_default_currency(GNCOption *option);
-char * gnc_currency_accounting_option_policy_documentation(GNCOption *option);
-SCM gnc_currency_accounting_option_get_default_policy(GNCOption *option);
-char * gnc_currency_accounting_option_gain_loss_account_documentation(GNCOption *option);
+char * gnc_currency_accounting_option_currency_documentation (GNCOption *option);
+SCM gnc_currency_accounting_option_get_default_currency (GNCOption *option);
+char * gnc_currency_accounting_option_policy_documentation (GNCOption *option);
+SCM gnc_currency_accounting_option_get_default_policy (GNCOption *option);
+char * gnc_currency_accounting_option_gain_loss_account_documentation (GNCOption *option);
SCM gnc_currency_accounting_option_value_get_method (SCM option_value);
SCM gnc_currency_accounting_option_value_get_book_currency (SCM option_value);
SCM gnc_currency_accounting_option_value_get_default_policy (SCM option_value);
SCM gnc_currency_accounting_option_value_get_default_account (SCM option_value);
-void gnc_option_db_set_option_selectable_by_name(SCM guile_options,
- const char *section,
- const char *name,
- gboolean selectable);
+void gnc_option_db_set_option_selectable_by_name (SCM guile_options,
+ const char *section,
+ const char *name,
+ gboolean selectable);
-gboolean gnc_dateformat_option_value_parse(SCM value, QofDateFormat *format,
- GNCDateMonthFormat *months,
- gboolean *years, char **custom);
-SCM gnc_dateformat_option_set_value(QofDateFormat format, GNCDateMonthFormat months,
- gboolean years, const char *custom);
+gboolean gnc_dateformat_option_value_parse (SCM value,
+ QofDateFormat *format,
+ GNCDateMonthFormat *months,
+ gboolean *years, char **custom);
+SCM gnc_dateformat_option_set_value (QofDateFormat format,
+ GNCDateMonthFormat months,
+ gboolean years,
+ const char *custom);
-void gnc_option_db_register_option(GNCOptionDBHandle handle,
- SCM guile_option);
+void gnc_option_db_register_option (GNCOptionDBHandle handle,
+ SCM guile_option);
/* private */
-void gncp_option_invoke_callback(GNCOptionChangeCallback callback,
- gpointer data);
+void gncp_option_invoke_callback (GNCOptionChangeCallback callback,
+ gpointer data);
/* Reset all the widgets in one section to their default values */
void gnc_option_db_section_reset_widgets (GNCOptionSection *section);
commit e5886955027dad50b085871e7f8b6a081a506910
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Thu Oct 22 14:30:11 2020 +0100
Change source files dialog-options.* for spaces and tabs
diff --git a/gnucash/gnome-utils/dialog-options.c b/gnucash/gnome-utils/dialog-options.c
index 511413a03..607c1c8de 100644
--- a/gnucash/gnome-utils/dialog-options.c
+++ b/gnucash/gnome-utils/dialog-options.c
@@ -142,10 +142,11 @@ typedef struct
GtkWidget *gain_loss_account_table;
GtkWidget *default_gain_loss_account_text;
GNCOption *option;
+ Account *prior_gain_loss_account;
gnc_commodity *retrieved_book_currency;
+
SCM retrieved_policy_scm;
SCM retrieved_gain_loss_acct_guid_scm;
- Account *prior_gain_loss_account;
} currency_accounting_data;
@@ -154,22 +155,22 @@ static currency_accounting_data *book_currency_data = NULL;
static GNCOptionWinCallback global_help_cb = NULL;
gpointer global_help_cb_data = NULL;
-static void gnc_options_dialog_reset_cb(GtkWidget * w, gpointer data);
+static void gnc_options_dialog_reset_cb (GtkWidget * w, gpointer data);
void gnc_options_dialog_list_select_cb (GtkTreeSelection *selection,
gpointer data);
-void gnc_set_default_cost_policy_widget(SCM list_symbol);
-void gnc_set_default_gain_loss_account_widget(gnc_commodity *commodity);
-void gnc_option_changed_book_currency_widget_cb(GtkWidget *widget);
-void gnc_option_changed_gain_loss_account_widget_cb(GtkTreeSelection *selection,
- gpointer data);
+void gnc_set_default_cost_policy_widget (SCM list_symbol);
+void gnc_set_default_gain_loss_account_widget (gnc_commodity *commodity);
+void gnc_option_changed_book_currency_widget_cb (GtkWidget *widget);
+void gnc_option_changed_gain_loss_account_widget_cb (GtkTreeSelection *selection,
+ gpointer data);
void gnc_option_changed_gain_loss_account_del_button_widget_cb (GtkButton *button,
- gpointer data);
+ gpointer data);
static void component_close_handler (gpointer data);
GtkWidget *
gnc_option_get_gtk_widget (GNCOption *option)
{
- return (GtkWidget *)gnc_option_get_widget(option);
+ return (GtkWidget *)gnc_option_get_widget (option);
}
static void
@@ -178,7 +179,7 @@ gnc_options_dialog_changed_internal (GtkWidget *widget, gboolean sensitive)
GtkButton *button = NULL;
while (widget && !GTK_IS_WINDOW(widget))
- widget = gtk_widget_get_parent(widget);
+ widget = gtk_widget_get_parent (widget);
if (widget == NULL)
return;
@@ -186,26 +187,26 @@ gnc_options_dialog_changed_internal (GtkWidget *widget, gboolean sensitive)
this way as opposed to using gtk_container_foreach, much less iteration */
if (GTK_IS_CONTAINER(widget))
{
- GList *children = gtk_container_get_children(GTK_CONTAINER(widget));
+ GList *children = gtk_container_get_children (GTK_CONTAINER(widget));
for (GList *it = children; it; it = it->next)
{
- if (GTK_IS_BOX (GTK_WIDGET(it->data)))
+ if (GTK_IS_BOX(GTK_WIDGET(it->data)))
{
- GList *children = gtk_container_get_children(GTK_CONTAINER(it->data));
+ GList *children = gtk_container_get_children (GTK_CONTAINER(it->data));
for (GList *it = children; it; it = it->next)
{
- if (GTK_IS_BUTTON_BOX (GTK_WIDGET(it->data)))
+ if (GTK_IS_BUTTON_BOX(GTK_WIDGET(it->data)))
{
- GList *children = gtk_container_get_children(GTK_CONTAINER(it->data));
+ GList *children = gtk_container_get_children (GTK_CONTAINER(it->data));
for (GList *it = children; it; it = it->next)
{
- if (g_strcmp0 (gtk_widget_get_name(GTK_WIDGET(it->data)), "ok_button") == 0)
+ if (g_strcmp0 (gtk_widget_get_name (GTK_WIDGET(it->data)), "ok_button") == 0)
gtk_widget_set_sensitive (GTK_WIDGET(it->data), sensitive);
- if (g_strcmp0 (gtk_widget_get_name(GTK_WIDGET(it->data)), "apply_button") == 0)
+ if (g_strcmp0 (gtk_widget_get_name (GTK_WIDGET(it->data)), "apply_button") == 0)
gtk_widget_set_sensitive (GTK_WIDGET(it->data), sensitive);
- if (g_strcmp0 (gtk_widget_get_name(GTK_WIDGET(it->data)), "cancel_button") == 0)
+ if (g_strcmp0 (gtk_widget_get_name (GTK_WIDGET(it->data)), "cancel_button") == 0)
button = GTK_BUTTON(it->data);
}
g_list_free (children);
@@ -224,7 +225,6 @@ gnc_options_dialog_changed_internal (GtkWidget *widget, gboolean sensitive)
else
gtk_button_set_label (button, _("_Close"));
}
-
}
void
@@ -236,25 +236,24 @@ gnc_options_dialog_changed (GNCOptionWin *win)
}
void
-gnc_option_changed_widget_cb(GtkWidget *widget, GNCOption *option)
+gnc_option_changed_widget_cb (GtkWidget *widget, GNCOption *option)
{
gnc_option_set_changed (option, TRUE);
- gnc_option_call_option_widget_changed_proc(option, FALSE);
+ gnc_option_call_option_widget_changed_proc (option, FALSE);
gnc_options_dialog_changed_internal (widget, TRUE);
}
void
-gnc_option_changed_option_cb(GtkWidget *dummy, GNCOption *option)
+gnc_option_changed_option_cb (GtkWidget *dummy, GNCOption *option)
{
- GtkWidget *widget;
-
- widget = gnc_option_get_gtk_widget (option);
- gnc_option_changed_widget_cb(widget, option);
+ GtkWidget *widget = gnc_option_get_gtk_widget (option);
+ gnc_option_changed_widget_cb (widget, option);
}
static void
-gnc_date_option_set_select_method(GNCOption *option, gboolean use_absolute,
- gboolean set_buttons)
+gnc_date_option_set_select_method (GNCOption *option,
+ gboolean use_absolute,
+ gboolean set_buttons)
{
GList* widget_list;
GtkWidget *ab_button, *rel_button, *rel_widget, *ab_widget;
@@ -262,47 +261,43 @@ gnc_date_option_set_select_method(GNCOption *option, gboolean use_absolute,
widget = gnc_option_get_gtk_widget (option);
- widget_list = gtk_container_get_children(GTK_CONTAINER(widget));
- ab_button = g_list_nth_data(widget_list, GNC_RD_WID_AB_BUTTON_POS);
- ab_widget = g_list_nth_data(widget_list, GNC_RD_WID_AB_WIDGET_POS);
- rel_button = g_list_nth_data(widget_list, GNC_RD_WID_REL_BUTTON_POS);
- rel_widget = g_list_nth_data(widget_list, GNC_RD_WID_REL_WIDGET_POS);
- g_list_free(widget_list);
+ widget_list = gtk_container_get_children (GTK_CONTAINER(widget));
+ ab_button = g_list_nth_data (widget_list, GNC_RD_WID_AB_BUTTON_POS);
+ ab_widget = g_list_nth_data (widget_list, GNC_RD_WID_AB_WIDGET_POS);
+ rel_button = g_list_nth_data (widget_list, GNC_RD_WID_REL_BUTTON_POS);
+ rel_widget = g_list_nth_data (widget_list, GNC_RD_WID_REL_WIDGET_POS);
+ g_list_free (widget_list);
if (use_absolute)
{
- gtk_widget_set_sensitive(ab_widget, TRUE);
- gtk_widget_set_sensitive(rel_widget, FALSE);
+ gtk_widget_set_sensitive (ab_widget, TRUE);
+ gtk_widget_set_sensitive (rel_widget, FALSE);
if (set_buttons)
- {
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ab_button), TRUE);
- }
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(ab_button), TRUE);
}
else
{
- gtk_widget_set_sensitive(rel_widget, TRUE);
- gtk_widget_set_sensitive(ab_widget, FALSE);
+ gtk_widget_set_sensitive (rel_widget, TRUE);
+ gtk_widget_set_sensitive (ab_widget, FALSE);
if (set_buttons)
- {
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rel_button), TRUE);
- }
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(rel_button), TRUE);
}
}
static void
-gnc_rd_option_ab_set_cb(GtkWidget *widget, gpointer *raw_option)
+gnc_rd_option_ab_set_cb (GtkWidget *widget, gpointer *raw_option)
{
GNCOption *option = (GNCOption *) raw_option;
- gnc_date_option_set_select_method(option, TRUE, FALSE);
- gnc_option_changed_option_cb(widget, option);
+ gnc_date_option_set_select_method (option, TRUE, FALSE);
+ gnc_option_changed_option_cb (widget, option);
}
static void
-gnc_rd_option_rel_set_cb(GtkWidget *widget, gpointer *raw_option)
+gnc_rd_option_rel_set_cb (GtkWidget *widget, gpointer *raw_option)
{
GNCOption *option = (GNCOption *) raw_option;
- gnc_date_option_set_select_method(option, FALSE, FALSE);
- gnc_option_changed_option_cb(widget, option);
+ gnc_date_option_set_select_method (option, FALSE, FALSE);
+ gnc_option_changed_option_cb (widget, option);
return;
}
@@ -315,14 +310,14 @@ gnc_image_option_update_preview_cb (GtkFileChooser *chooser,
GdkPixbuf *pixbuf;
gboolean have_preview;
- g_return_if_fail(chooser != NULL);
+ g_return_if_fail (chooser != NULL);
ENTER("chooser %p, option %p", chooser, option);
- filename = gtk_file_chooser_get_preview_filename(chooser);
+ filename = gtk_file_chooser_get_preview_filename (chooser);
DEBUG("chooser preview name is %s.", filename ? filename : "(null)");
if (filename == NULL)
{
- filename = g_strdup(g_object_get_data(G_OBJECT(chooser), LAST_SELECTION));
+ filename = g_strdup (g_object_get_data (G_OBJECT(chooser), LAST_SELECTION));
DEBUG("using last selection of %s", filename ? filename : "(null)");
if (filename == NULL)
{
@@ -331,16 +326,16 @@ gnc_image_option_update_preview_cb (GtkFileChooser *chooser,
}
}
- image = GTK_IMAGE(gtk_file_chooser_get_preview_widget(chooser));
- pixbuf = gdk_pixbuf_new_from_file_at_size(filename, 128, 128, NULL);
- g_free(filename);
+ image = GTK_IMAGE(gtk_file_chooser_get_preview_widget (chooser));
+ pixbuf = gdk_pixbuf_new_from_file_at_size (filename, 128, 128, NULL);
+ g_free (filename);
have_preview = (pixbuf != NULL);
- gtk_image_set_from_pixbuf(image, pixbuf);
+ gtk_image_set_from_pixbuf (image, pixbuf);
if (pixbuf)
- g_object_unref(pixbuf);
+ g_object_unref (pixbuf);
- gtk_file_chooser_set_preview_widget_active(chooser, have_preview);
+ gtk_file_chooser_set_preview_widget_active (chooser, have_preview);
LEAVE("preview visible is %d", have_preview);
}
@@ -348,12 +343,10 @@ static void
gnc_image_option_selection_changed_cb (GtkFileChooser *chooser,
GNCOption *option)
{
- gchar *filename;
-
- filename = gtk_file_chooser_get_preview_filename(chooser);
+ gchar *filename = gtk_file_chooser_get_preview_filename (chooser);
if (!filename)
return;
- g_object_set_data_full(G_OBJECT(chooser), LAST_SELECTION, filename, g_free);
+ g_object_set_data_full (G_OBJECT(chooser), LAST_SELECTION, filename, g_free);
}
/********************************************************************\
@@ -380,41 +373,37 @@ gnc_option_set_ui_value_internal (GNCOption *option, gboolean use_default)
if (!widget)
return;
- type = gnc_option_type(option);
+ type = gnc_option_type (option);
if (use_default)
{
- SCM opt_getter = gnc_option_getter(option);
- SCM opt_value = scm_call_0(opt_getter);
+ SCM opt_getter = gnc_option_getter (option);
+ SCM opt_value = scm_call_0 (opt_getter);
SCM def_value;
- getter = gnc_option_default_getter(option);
- def_value = scm_call_0(getter);
+ getter = gnc_option_default_getter (option);
+ def_value = scm_call_0 (getter);
// only set changed if the values have changed
- if (!scm_is_true(scm_equal_p(opt_value, def_value)))
+ if (!scm_is_true (scm_equal_p (opt_value, def_value)))
gnc_option_set_changed (option, TRUE);
}
else
- getter = gnc_option_getter(option);
+ getter = gnc_option_getter (option);
- value = scm_call_0(getter);
+ value = scm_call_0 (getter);
option_def = gnc_options_ui_get_option (type);
if (option_def && option_def->set_value)
{
bad_value = option_def->set_value (option, use_default, widget, value);
if (bad_value)
- {
PERR("bad value\n");
- }
}
else
- {
PERR("Unknown type. Ignoring.\n");
- }
- free(type);
+ free (type);
}
/********************************************************************\
@@ -436,19 +425,16 @@ gnc_option_get_ui_value_internal (GNCOption *option)
if (!widget)
return result;
- type = gnc_option_type(option);
+ type = gnc_option_type (option);
option_def = gnc_options_ui_get_option (type);
+
if (option_def && option_def->get_value)
- {
result = option_def->get_value (option, widget);
- }
else
- {
PERR("Unknown type for refresh. Ignoring.\n");
- }
- free(type);
+ free (type);
return result;
}
@@ -477,7 +463,7 @@ gnc_option_set_selectable_internal (GNCOption *option, gboolean selectable)
}
static void
-gnc_option_default_cb(GtkWidget *widget, GNCOption *option)
+gnc_option_default_cb (GtkWidget *widget, GNCOption *option)
{
gnc_option_set_ui_value (option, TRUE);
gnc_option_set_changed (option, TRUE);
@@ -485,28 +471,28 @@ gnc_option_default_cb(GtkWidget *widget, GNCOption *option)
}
static void
-gnc_option_show_hidden_toggled_cb(GtkWidget *widget, GNCOption* option)
+gnc_option_show_hidden_toggled_cb (GtkWidget *widget, GNCOption* option)
{
AccountViewInfo avi;
GncTreeViewAccount *tree_view;
tree_view = GNC_TREE_VIEW_ACCOUNT(gnc_option_get_gtk_widget (option));
gnc_tree_view_account_get_view_info (tree_view, &avi);
- avi.show_hidden = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+ avi.show_hidden = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widget));
gnc_tree_view_account_set_view_info (tree_view, &avi);
- gnc_option_changed_widget_cb(widget, option);
+ gnc_option_changed_widget_cb (widget, option);
}
static void
-gnc_option_multichoice_cb(GtkWidget *widget, gpointer data)
+gnc_option_multichoice_cb (GtkWidget *widget, gpointer data)
{
GNCOption *option = data;
/* GtkComboBox per-item tooltip changes needed below */
- gnc_option_changed_widget_cb(widget, option);
+ gnc_option_changed_widget_cb (widget, option);
}
static void
-gnc_option_radiobutton_cb(GtkWidget *w, gpointer data)
+gnc_option_radiobutton_cb (GtkWidget *w, gpointer data)
{
GNCOption *option = data;
GtkWidget *widget;
@@ -515,24 +501,24 @@ gnc_option_radiobutton_cb(GtkWidget *w, gpointer data)
widget = gnc_option_get_gtk_widget (option);
- _current = g_object_get_data(G_OBJECT(widget), "gnc_radiobutton_index");
- current = GPOINTER_TO_INT (_current);
+ _current = g_object_get_data (G_OBJECT(widget), "gnc_radiobutton_index");
+ current = GPOINTER_TO_INT(_current);
_new_value = g_object_get_data (G_OBJECT(w), "gnc_radiobutton_index");
- new_value = GPOINTER_TO_INT (_new_value);
+ new_value = GPOINTER_TO_INT(_new_value);
if (current == new_value)
return;
g_object_set_data (G_OBJECT(widget), "gnc_radiobutton_index",
GINT_TO_POINTER(new_value));
- gnc_option_changed_widget_cb(widget, option);
+ gnc_option_changed_widget_cb (widget, option);
}
static gboolean
gnc_gain_loss_account_view_filter (Account *account, gpointer data)
{
- GNCAccountType type = xaccAccountGetType(account);
+ GNCAccountType type = xaccAccountGetType (account);
/* gain/loss accts must be an Income or Expense accts and not hidden;
placeholder accounts must be included, irrespective of their currency,
@@ -540,11 +526,11 @@ gnc_gain_loss_account_view_filter (Account *account, gpointer data)
if (((type == ACCT_TYPE_INCOME) || (type == ACCT_TYPE_EXPENSE)) &&
(!xaccAccountIsHidden(account)))
{
- if (xaccAccountGetPlaceholder(account))
+ if (xaccAccountGetPlaceholder (account))
{
GList *placeholder_children = gnc_account_get_children (account);
- if(placeholder_children)
+ if (placeholder_children)
{ /* determine if any children qualify; just need one but don't
double count in gain_loss_accounts_in_filter */
int saved_gain_loss_accounts_in_filter =
@@ -555,11 +541,11 @@ gnc_gain_loss_account_view_filter (Account *account, gpointer data)
{
Account *child_account = l->data;
child_pass_filter =
- gnc_gain_loss_account_view_filter(child_account, NULL);
+ gnc_gain_loss_account_view_filter (child_account, NULL);
if (child_pass_filter)
break;
}
- g_list_free(placeholder_children);
+ g_list_free (placeholder_children);
gain_loss_accounts_in_filter =
saved_gain_loss_accounts_in_filter;
return child_pass_filter;
@@ -572,14 +558,15 @@ gnc_gain_loss_account_view_filter (Account *account, gpointer data)
/* gain/loss accts must be in book-currency; if a book currency has been
specified in the widget, use it to filter */
- if (gtk_combo_box_get_active (GTK_COMBO_BOX(book_currency_data->book_currency_widget)) != -1)
- commodity = gnc_currency_edit_get_currency(
+ if (gtk_combo_box_get_active (GTK_COMBO_BOX(
+ book_currency_data->book_currency_widget)) != -1)
+ commodity = gnc_currency_edit_get_currency (
GNC_CURRENCY_EDIT(
book_currency_data->book_currency_widget));
if (commodity)
{
- if (gnc_commodity_equal(xaccAccountGetCommodity(account),
- commodity))
+ if (gnc_commodity_equal (xaccAccountGetCommodity (account),
+ commodity))
{
gain_loss_accounts_in_filter++;
return TRUE;
@@ -587,8 +574,8 @@ gnc_gain_loss_account_view_filter (Account *account, gpointer data)
else return FALSE;
}
/* else use the default currency */
- else if (gnc_commodity_equal(xaccAccountGetCommodity(account),
- gnc_default_currency()))
+ else if (gnc_commodity_equal (xaccAccountGetCommodity (account),
+ gnc_default_currency ()))
{
gain_loss_accounts_in_filter++;
return TRUE;
@@ -606,9 +593,9 @@ gnc_gain_loss_account_all_fail_filter (Account *account, gpointer data)
}
void
-gnc_set_default_cost_policy_widget(SCM list_symbol)
+gnc_set_default_cost_policy_widget (SCM list_symbol)
{
- GList *list_of_policies = gnc_get_valid_policy_list();
+ GList *list_of_policies = gnc_get_valid_policy_list ();
if (list_of_policies)
{
@@ -617,18 +604,18 @@ gnc_set_default_cost_policy_widget(SCM list_symbol)
for (l = list_of_policies; l != NULL; l = l->next)
{
GNCPolicy *pcy = l->data;
- if (g_strcmp0(PolicyGetName (pcy),
- gnc_scm_symbol_to_locale_string(list_symbol))
- == 0)
+ if (g_strcmp0 (PolicyGetName (pcy),
+ gnc_scm_symbol_to_locale_string (list_symbol))
+ == 0)
{
/* GtkComboBox per-item tooltip changes needed below */
- gnc_combott_set_active(
+ gnc_combott_set_active (
GNC_COMBOTT(
book_currency_data->default_cost_policy_widget), i);
}
i++;
}
- g_list_free(list_of_policies);
+ g_list_free (list_of_policies);
}
else
{
@@ -638,7 +625,7 @@ gnc_set_default_cost_policy_widget(SCM list_symbol)
}
void
-gnc_set_default_gain_loss_account_widget(gnc_commodity *commodity)
+gnc_set_default_gain_loss_account_widget (gnc_commodity *commodity)
{
if (book_currency_data->default_gain_loss_account_widget)
{
@@ -660,10 +647,10 @@ gnc_set_default_gain_loss_account_widget(gnc_commodity *commodity)
book_currency_data->default_gain_loss_account_text);
book_currency_data->default_gain_loss_account_text = NULL;
}
- if (gnc_is_new_book())
+ if (gnc_is_new_book ())
{
book_currency_data->default_gain_loss_account_text =
- gtk_label_new( _("Because no accounts have " \
+ gtk_label_new ( _("Because no accounts have " \
"been set up yet, you will need to return to this " \
"dialog (via File->Properties), after account setup, " \
"if you want to set a default gain/loss account.") );
@@ -677,15 +664,15 @@ gnc_set_default_gain_loss_account_widget(gnc_commodity *commodity)
{
GtkTreeSelection *selection = NULL;
book_currency_data->default_gain_loss_account_widget =
- GTK_WIDGET(gnc_tree_view_account_new(FALSE));
+ GTK_WIDGET(gnc_tree_view_account_new (FALSE));
gain_loss_accounts_in_filter = 0;
- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(
book_currency_data->default_gain_loss_account_widget));
if (!commodity) // that means not book currency
{
/* set the default_gain_loss_account_widget to be blank with a
no-acct filter */
- gnc_tree_view_account_set_filter(GNC_TREE_VIEW_ACCOUNT (
+ gnc_tree_view_account_set_filter (GNC_TREE_VIEW_ACCOUNT(
book_currency_data->default_gain_loss_account_widget),
gnc_gain_loss_account_all_fail_filter,
NULL, /* user data */
@@ -695,7 +682,7 @@ gnc_set_default_gain_loss_account_widget(gnc_commodity *commodity)
else // that means book currency
{
/* see if there are any accounts after filter */
- gnc_tree_view_account_set_filter(GNC_TREE_VIEW_ACCOUNT (
+ gnc_tree_view_account_set_filter (GNC_TREE_VIEW_ACCOUNT(
book_currency_data->default_gain_loss_account_widget),
gnc_gain_loss_account_view_filter,
NULL, /* user data */
@@ -707,12 +694,12 @@ gnc_set_default_gain_loss_account_widget(gnc_commodity *commodity)
GtkTreeViewColumn *col;
book_currency_data->gain_loss_account_del_button =
- gtk_button_new_with_label( _("Select no account") );
+ gtk_button_new_with_label ( _("Select no account") );
- g_signal_connect (GTK_BUTTON (
+ g_signal_connect (GTK_BUTTON(
book_currency_data->gain_loss_account_del_button),
"clicked",
- G_CALLBACK (
+ G_CALLBACK(
gnc_option_changed_gain_loss_account_del_button_widget_cb),
NULL);
gtk_grid_attach (GTK_GRID(book_currency_data->gain_loss_account_table),
@@ -721,7 +708,7 @@ gnc_set_default_gain_loss_account_widget(gnc_commodity *commodity)
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(
book_currency_data->default_gain_loss_account_widget),
TRUE);
- col = gnc_tree_view_add_text_column(GNC_TREE_VIEW(
+ col = gnc_tree_view_add_text_column (GNC_TREE_VIEW(
book_currency_data->default_gain_loss_account_widget),
_("Currency"), /* title */
"commodity", /* pref name */
@@ -730,14 +717,14 @@ gnc_set_default_gain_loss_account_widget(gnc_commodity *commodity)
GNC_TREE_MODEL_ACCOUNT_COL_COMMODITY,
GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
NULL);
- g_object_set_data(G_OBJECT(col), DEFAULT_VISIBLE,
- GINT_TO_POINTER(1));
+ g_object_set_data (G_OBJECT(col), DEFAULT_VISIBLE,
+ GINT_TO_POINTER(1));
// add the color background data function to the column
gnc_tree_view_account_column_add_color (GNC_TREE_VIEW_ACCOUNT(
book_currency_data->default_gain_loss_account_widget), col);
- col = gnc_tree_view_add_toggle_column(GNC_TREE_VIEW(
+ col = gnc_tree_view_add_toggle_column (GNC_TREE_VIEW(
book_currency_data->default_gain_loss_account_widget),
_("Placeholder"),
C_("Column header for 'Placeholder'", "P"),
@@ -746,7 +733,7 @@ gnc_set_default_gain_loss_account_widget(gnc_commodity *commodity)
GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
NULL,
NULL);
- g_object_set_data(G_OBJECT(col), DEFAULT_VISIBLE,
+ g_object_set_data (G_OBJECT(col), DEFAULT_VISIBLE,
GINT_TO_POINTER(1));
// add the color background data function to the column
@@ -755,21 +742,21 @@ gnc_set_default_gain_loss_account_widget(gnc_commodity *commodity)
gnc_tree_view_configure_columns (GNC_TREE_VIEW(
book_currency_data->default_gain_loss_account_widget));
- gnc_tree_view_set_show_column_menu(GNC_TREE_VIEW(
+ gnc_tree_view_set_show_column_menu (GNC_TREE_VIEW(
book_currency_data->default_gain_loss_account_widget),
FALSE);
if (book_currency_data->retrieved_gain_loss_acct_guid_scm &&
- (scm_is_string(
+ (scm_is_string (
book_currency_data->retrieved_gain_loss_acct_guid_scm)))
{
GncGUID *guid= g_new (GncGUID, 1);
if (string_to_guid (
- gnc_scm_to_utf8_string(
+ gnc_scm_to_utf8_string (
book_currency_data->retrieved_gain_loss_acct_guid_scm),
guid))
gain_loss_account =
- xaccAccountLookup(guid, gnc_get_current_book());
+ xaccAccountLookup (guid, gnc_get_current_book ());
g_free (guid);
}
if (gain_loss_account)
@@ -779,22 +766,22 @@ gnc_set_default_gain_loss_account_widget(gnc_commodity *commodity)
book_currency_data->default_gain_loss_account_widget),
gain_loss_account));
selected_account =
- gnc_tree_view_account_get_selected_account(
- GNC_TREE_VIEW_ACCOUNT (
+ gnc_tree_view_account_get_selected_account (
+ GNC_TREE_VIEW_ACCOUNT(
book_currency_data->default_gain_loss_account_widget));
}
if (selected_account)
{
book_currency_data->prior_gain_loss_account =
selected_account;
- gtk_widget_set_sensitive(
+ gtk_widget_set_sensitive (
book_currency_data->gain_loss_account_del_button,
TRUE);
}
else /* none selected */
{
gtk_tree_selection_unselect_all (selection);
- gtk_widget_set_sensitive(
+ gtk_widget_set_sensitive (
book_currency_data->gain_loss_account_del_button,
FALSE);
}
@@ -807,7 +794,7 @@ gnc_set_default_gain_loss_account_widget(gnc_commodity *commodity)
book_currency_data->prior_gain_loss_account = NULL;
gain_loss_accounts_in_filter = 0;
book_currency_data->default_gain_loss_account_text =
- gtk_label_new( _("There are no income " \
+ gtk_label_new ( _("There are no income " \
"or expense accounts of the specified\n" \
"book currency; you will have to return to this " \
"dialog\n(via File->Properties), after account setup, " \
@@ -819,60 +806,59 @@ gnc_set_default_gain_loss_account_widget(gnc_commodity *commodity)
if (book_currency_data->default_gain_loss_account_widget)
{
gtk_widget_set_hexpand (GTK_WIDGET(book_currency_data->default_gain_loss_account_widget), TRUE);
- g_signal_connect (G_OBJECT (selection),
- "changed",
- G_CALLBACK (gnc_option_changed_gain_loss_account_widget_cb),
- NULL);
+ g_signal_connect (G_OBJECT(selection),
+ "changed",
+ G_CALLBACK(gnc_option_changed_gain_loss_account_widget_cb),
+ NULL);
gtk_grid_attach (GTK_GRID(book_currency_data->gain_loss_account_table),
book_currency_data->default_gain_loss_account_widget, 0, 1, 2, 1);
-
}
}
}
void
-gnc_option_changed_book_currency_widget_cb(GtkWidget *widget)
+gnc_option_changed_book_currency_widget_cb (GtkWidget *widget)
{
/* Once the book currency widget is set, need to set the
default_gain_loss_account_widget and/or del-button or text*/
if (gtk_combo_box_get_active (GTK_COMBO_BOX(book_currency_data->book_currency_widget)) != -1)
{
- gnc_commodity *commodity = gnc_currency_edit_get_currency(
- GNC_CURRENCY_EDIT(
- book_currency_data->book_currency_widget));
+ gnc_commodity *commodity = gnc_currency_edit_get_currency (
+ GNC_CURRENCY_EDIT(
+ book_currency_data->book_currency_widget));
- gnc_set_default_gain_loss_account_widget(commodity);
+ gnc_set_default_gain_loss_account_widget (commodity);
}
- gtk_widget_show_all(book_currency_data->book_currency_vbox);
- gnc_option_changed_widget_cb(widget, book_currency_data->option);
+ gtk_widget_show_all (book_currency_data->book_currency_vbox);
+ gnc_option_changed_widget_cb (widget, book_currency_data->option);
}
void
gnc_option_changed_gain_loss_account_widget_cb (GtkTreeSelection *selection,
- gpointer data)
+ gpointer data)
{
Account *account = NULL;
gboolean new_eq_prior_acct = FALSE;
g_return_if_fail (book_currency_data->default_gain_loss_account_widget);
account = gnc_tree_view_account_get_selected_account (
- GNC_TREE_VIEW_ACCOUNT (
+ GNC_TREE_VIEW_ACCOUNT(
book_currency_data->default_gain_loss_account_widget));
if (account && book_currency_data->prior_gain_loss_account)
- new_eq_prior_acct = xaccAccountEqual(account,
+ new_eq_prior_acct = xaccAccountEqual (account,
book_currency_data->prior_gain_loss_account,
TRUE);
if (account && (!new_eq_prior_acct))
{ /* a new account has been selected */
- if (!xaccAccountGetPlaceholder(account))
+ if (!xaccAccountGetPlaceholder (account))
{
GtkWidget *option_widget =
gnc_option_get_gtk_widget (book_currency_data->option);
book_currency_data->prior_gain_loss_account = account;
- gtk_widget_set_sensitive(
+ gtk_widget_set_sensitive (
book_currency_data->gain_loss_account_del_button, TRUE);
- gtk_widget_show_all(book_currency_data->book_currency_vbox);
- gnc_option_changed_option_cb(option_widget, book_currency_data->option);
+ gtk_widget_show_all (book_currency_data->book_currency_vbox);
+ gnc_option_changed_option_cb (option_widget, book_currency_data->option);
}
else /* new account, but placeholder */
{
@@ -902,7 +888,7 @@ gnc_option_changed_gain_loss_account_widget_cb (GtkTreeSelection *selection,
gtk_tree_selection_unselect_all (selection);
if (book_currency_data->gain_loss_account_del_button)
{
- gtk_widget_set_sensitive(
+ gtk_widget_set_sensitive (
book_currency_data->gain_loss_account_del_button, FALSE);
}
}
@@ -910,7 +896,8 @@ gnc_option_changed_gain_loss_account_widget_cb (GtkTreeSelection *selection,
}
void
-gnc_option_changed_gain_loss_account_del_button_widget_cb (GtkButton *button, gpointer data)
+gnc_option_changed_gain_loss_account_del_button_widget_cb (GtkButton *button,
+ gpointer data)
{
GtkTreeSelection *selection = NULL;
GtkWidget *option_widget =
@@ -920,36 +907,36 @@ gnc_option_changed_gain_loss_account_del_button_widget_cb (GtkButton *button, gp
g_return_if_fail (book_currency_data->gain_loss_account_del_button);
selection = gtk_tree_view_get_selection (
- GTK_TREE_VIEW (
+ GTK_TREE_VIEW(
book_currency_data->default_gain_loss_account_widget));
gtk_tree_selection_unselect_all (selection);
book_currency_data->prior_gain_loss_account = NULL;
- gtk_widget_set_sensitive(
+ gtk_widget_set_sensitive (
book_currency_data->gain_loss_account_del_button, FALSE);
- gnc_option_changed_option_cb(option_widget, book_currency_data->option);
+ gnc_option_changed_option_cb (option_widget, book_currency_data->option);
}
static void
-gnc_option_currency_accounting_non_book_cb(GtkWidget *widget, gpointer data)
+gnc_option_currency_accounting_non_book_cb (GtkWidget *widget, gpointer data)
{
gnc_currency_edit_clear_display (GNC_CURRENCY_EDIT(
book_currency_data->book_currency_widget));
- gnc_combott_set_active(GNC_COMBOTT(
- book_currency_data->default_cost_policy_widget),
- -1);
- gnc_set_default_gain_loss_account_widget(NULL);
- gtk_widget_show_all(book_currency_data->book_currency_vbox);
- gtk_widget_set_sensitive(book_currency_data->book_currency_vbox, FALSE);
- gnc_option_radiobutton_cb(widget, (gpointer) book_currency_data->option);
+ gnc_combott_set_active (GNC_COMBOTT(
+ book_currency_data->default_cost_policy_widget),
+ -1);
+ gnc_set_default_gain_loss_account_widget (NULL);
+ gtk_widget_show_all (book_currency_data->book_currency_vbox);
+ gtk_widget_set_sensitive (book_currency_data->book_currency_vbox, FALSE);
+ gnc_option_radiobutton_cb (widget, (gpointer) book_currency_data->option);
}
static void
-gnc_option_currency_accounting_book_cb(GtkWidget *widget, gpointer data)
+gnc_option_currency_accounting_book_cb (GtkWidget *widget, gpointer data)
{
SCM list_symbol =
- gnc_currency_accounting_option_get_default_policy(
+ gnc_currency_accounting_option_get_default_policy (
book_currency_data->option);
- SCM curr_scm = gnc_currency_accounting_option_get_default_currency(
+ SCM curr_scm = gnc_currency_accounting_option_get_default_currency (
book_currency_data->option);
gnc_commodity *commodity = gnc_scm_to_commodity (curr_scm);
@@ -957,32 +944,32 @@ gnc_option_currency_accounting_book_cb(GtkWidget *widget, gpointer data)
{
gnc_currency_edit_set_currency
(GNC_CURRENCY_EDIT(book_currency_data->book_currency_widget),
- book_currency_data->retrieved_book_currency);
+ book_currency_data->retrieved_book_currency);
}
else if (commodity)
{
gnc_currency_edit_set_currency
(GNC_CURRENCY_EDIT(book_currency_data->book_currency_widget),
- commodity);
+ commodity);
}
else
{
gnc_currency_edit_set_currency
(GNC_CURRENCY_EDIT(book_currency_data->book_currency_widget),
- gnc_default_currency());
+ gnc_default_currency());
}
if (book_currency_data->retrieved_policy_scm)
{
- gnc_set_default_cost_policy_widget(
+ gnc_set_default_cost_policy_widget (
book_currency_data->retrieved_policy_scm);
}
else
{
- gnc_set_default_cost_policy_widget(list_symbol);
+ gnc_set_default_cost_policy_widget (list_symbol);
}
- gtk_widget_show_all(book_currency_data->book_currency_vbox);
- gtk_widget_set_sensitive(book_currency_data->book_currency_vbox, TRUE);
- gnc_option_radiobutton_cb(widget, (gpointer) book_currency_data->option);
+ gtk_widget_show_all (book_currency_data->book_currency_vbox);
+ gtk_widget_set_sensitive (book_currency_data->book_currency_vbox, TRUE);
+ gnc_option_radiobutton_cb (widget, (gpointer) book_currency_data->option);
}
static GtkWidget *
@@ -996,30 +983,30 @@ gnc_option_create_date_widget (GNCOption *option)
char *type;
int num_values;
- type = gnc_option_date_option_get_subtype(option);
- show_time = gnc_option_show_time(option);
- use24 = gnc_prefs_get_bool(GNC_PREFS_GROUP_GENERAL, GNC_PREF_CLOCK_24H);
+ type = gnc_option_date_option_get_subtype (option);
+ show_time = gnc_option_show_time (option);
+ use24 = gnc_prefs_get_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_CLOCK_24H);
- if (g_strcmp0(type, "relative") != 0)
+ if (g_strcmp0 (type, "relative") != 0)
{
- ab_widget = gnc_date_edit_new(time(NULL), show_time, use24);
+ ab_widget = gnc_date_edit_new (time (NULL), show_time, use24);
entry = GNC_DATE_EDIT(ab_widget)->date_entry;
- g_signal_connect(G_OBJECT(entry), "changed",
- G_CALLBACK(gnc_option_changed_option_cb), option);
+ g_signal_connect (G_OBJECT(entry), "changed",
+ G_CALLBACK(gnc_option_changed_option_cb), option);
if (show_time)
{
entry = GNC_DATE_EDIT(ab_widget)->time_entry;
- g_signal_connect(G_OBJECT(entry), "changed",
- G_CALLBACK(gnc_option_changed_option_cb), option);
+ g_signal_connect (G_OBJECT(entry), "changed",
+ G_CALLBACK(gnc_option_changed_option_cb), option);
}
}
- if (g_strcmp0(type, "absolute") != 0)
+ if (g_strcmp0 (type, "absolute") != 0)
{
int i;
- num_values = gnc_option_num_permissible_values(option);
+ num_values = gnc_option_num_permissible_values (option);
- g_return_val_if_fail(num_values >= 0, NULL);
+ g_return_val_if_fail (num_values >= 0, NULL);
{
/* GtkComboBox still does not support per-item tooltips, so have
@@ -1033,100 +1020,98 @@ gnc_option_create_date_widget (GNCOption *option)
char *itemstring;
char *description;
- store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
+ store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
/* Add values to the list store, entry and tooltip */
for (i = 0; i < num_values; i++)
{
- itemstring = gnc_option_permissible_value_name(option, i);
- description = gnc_option_permissible_value_description(option, i);
+ itemstring = gnc_option_permissible_value_name (option, i);
+ description = gnc_option_permissible_value_description (option, i);
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter, 0, itemstring, 1, description, -1);
if (itemstring)
- g_free(itemstring);
+ g_free (itemstring);
if (description)
- g_free(description);
+ g_free (description);
}
/* Create the new Combo with tooltip and add the store */
- rel_widget = GTK_WIDGET(gnc_combott_new());
- g_object_set( G_OBJECT(rel_widget), "model", GTK_TREE_MODEL(store), NULL );
- g_object_unref(store);
+ rel_widget = GTK_WIDGET(gnc_combott_new ());
+ g_object_set (G_OBJECT(rel_widget), "model", GTK_TREE_MODEL(store), NULL );
+ g_object_unref (store);
- g_signal_connect(G_OBJECT(rel_widget), "changed",
- G_CALLBACK(gnc_option_multichoice_cb), option);
+ g_signal_connect (G_OBJECT(rel_widget), "changed",
+ G_CALLBACK(gnc_option_multichoice_cb), option);
}
}
- if (g_strcmp0(type, "absolute") == 0)
+ if (g_strcmp0 (type, "absolute") == 0)
{
- free(type);
+ free (type);
gnc_option_set_widget (option, ab_widget);
return ab_widget;
}
- else if (g_strcmp0(type, "relative") == 0)
+ else if (g_strcmp0 (type, "relative") == 0)
{
gnc_option_set_widget (option, rel_widget);
- free(type);
+ free (type);
return rel_widget;
}
- else if (g_strcmp0(type, "both") == 0)
+ else if (g_strcmp0 (type, "both") == 0)
{
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_box_set_homogeneous (GTK_BOX (box), FALSE);
+ gtk_box_set_homogeneous (GTK_BOX(box), FALSE);
- ab_button = gtk_radio_button_new(NULL);
- g_signal_connect(G_OBJECT(ab_button), "toggled",
- G_CALLBACK(gnc_rd_option_ab_set_cb), option);
+ ab_button = gtk_radio_button_new (NULL);
+ g_signal_connect (G_OBJECT(ab_button), "toggled",
+ G_CALLBACK(gnc_rd_option_ab_set_cb), option);
- rel_button = gtk_radio_button_new_from_widget(GTK_RADIO_BUTTON(ab_button));
- g_signal_connect(G_OBJECT(rel_button), "toggled",
- G_CALLBACK(gnc_rd_option_rel_set_cb), option);
+ rel_button = gtk_radio_button_new_from_widget (GTK_RADIO_BUTTON(ab_button));
+ g_signal_connect (G_OBJECT(rel_button), "toggled",
+ G_CALLBACK(gnc_rd_option_rel_set_cb), option);
- gtk_box_pack_start(GTK_BOX(box), ab_button, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(box), ab_widget, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(box), rel_button, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(box), rel_widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(box), ab_button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(box), ab_widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(box), rel_button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(box), rel_widget, FALSE, FALSE, 0);
- free(type);
+ free (type);
gnc_option_set_widget (option, box);
return box;
}
else /* can't happen */
- {
return NULL;
- }
}
static GtkWidget *
-gnc_option_create_budget_widget(GNCOption *option)
+gnc_option_create_budget_widget (GNCOption *option)
{
GtkTreeModel *tm;
GtkComboBox *cb;
GtkCellRenderer *cr;
- tm = gnc_tree_model_budget_new(gnc_get_current_book());
- cb = GTK_COMBO_BOX(gtk_combo_box_new_with_model(tm));
- g_object_unref(tm);
- cr = gtk_cell_renderer_text_new();
- gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(cb), cr, TRUE);
+ tm = gnc_tree_model_budget_new (gnc_get_current_book());
+ cb = GTK_COMBO_BOX(gtk_combo_box_new_with_model (tm));
+ g_object_unref (tm);
+ cr = gtk_cell_renderer_text_new ();
+ gtk_cell_layout_pack_start (GTK_CELL_LAYOUT(cb), cr, TRUE);
- gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(cb), cr, "text",
- BUDGET_NAME_COLUMN, NULL);
+ gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT(cb), cr, "text",
+ BUDGET_NAME_COLUMN, NULL);
return GTK_WIDGET(cb);
}
static GtkWidget *
-gnc_option_create_multichoice_widget(GNCOption *option)
+gnc_option_create_multichoice_widget (GNCOption *option)
{
GtkWidget *widget;
int num_values;
int i;
- num_values = gnc_option_num_permissible_values(option);
+ num_values = gnc_option_num_permissible_values (option);
- g_return_val_if_fail(num_values >= 0, NULL);
+ g_return_val_if_fail (num_values >= 0, NULL);
{
/* GtkComboBox still does not support per-item tooltips, so have
@@ -1139,35 +1124,34 @@ gnc_option_create_multichoice_widget(GNCOption *option)
char *itemstring;
char *description;
- store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
+ store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
/* Add values to the list store, entry and tooltip */
for (i = 0; i < num_values; i++)
{
- itemstring = gnc_option_permissible_value_name(option, i);
- description = gnc_option_permissible_value_description(option, i);
+ itemstring = gnc_option_permissible_value_name (option, i);
+ description = gnc_option_permissible_value_description (option, i);
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter, 0,
(itemstring && *itemstring) ? _(itemstring) : "", 1,
(description && *description) ? _(description) : "", -1);
if (itemstring)
- g_free(itemstring);
+ g_free (itemstring);
if (description)
- g_free(description);
+ g_free (description);
}
/* Create the new Combo with tooltip and add the store */
- widget = GTK_WIDGET(gnc_combott_new());
- g_object_set( G_OBJECT( widget ), "model", GTK_TREE_MODEL(store), NULL );
- g_object_unref(store);
+ widget = GTK_WIDGET(gnc_combott_new ());
+ g_object_set (G_OBJECT( widget ), "model", GTK_TREE_MODEL(store), NULL );
+ g_object_unref (store);
- g_signal_connect(G_OBJECT(widget), "changed",
- G_CALLBACK(gnc_option_multichoice_cb), option);
+ g_signal_connect (G_OBJECT(widget), "changed",
+ G_CALLBACK(gnc_option_multichoice_cb), option);
}
-
return widget;
}
static GtkWidget *
-gnc_option_create_radiobutton_widget(char *name, GNCOption *option)
+gnc_option_create_radiobutton_widget (char *name, GNCOption *option)
{
GtkWidget *frame, *box;
GtkWidget *widget = NULL;
@@ -1176,42 +1160,41 @@ gnc_option_create_radiobutton_widget(char *name, GNCOption *option)
char *tip;
int i;
- num_values = gnc_option_num_permissible_values(option);
+ num_values = gnc_option_num_permissible_values (option);
- g_return_val_if_fail(num_values >= 0, NULL);
+ g_return_val_if_fail (num_values >= 0, NULL);
/* Create our button frame */
frame = gtk_frame_new (name);
/* Create the button box */
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
- gtk_box_set_homogeneous (GTK_BOX (box), FALSE);
- gtk_container_add (GTK_CONTAINER (frame), box);
+ gtk_box_set_homogeneous (GTK_BOX(box), FALSE);
+ gtk_container_add (GTK_CONTAINER(frame), box);
/* Iterate over the options and create a radio button for each one */
for (i = 0; i < num_values; i++)
{
- label = gnc_option_permissible_value_name(option, i);
- tip = gnc_option_permissible_value_description(option, i);
+ label = gnc_option_permissible_value_name (option, i);
+ tip = gnc_option_permissible_value_description (option, i);
widget =
gtk_radio_button_new_with_label_from_widget (widget ?
- GTK_RADIO_BUTTON (widget) :
+ GTK_RADIO_BUTTON(widget) :
NULL,
label && *label ? _(label) : "");
- g_object_set_data (G_OBJECT (widget), "gnc_radiobutton_index",
+ g_object_set_data (G_OBJECT(widget), "gnc_radiobutton_index",
GINT_TO_POINTER (i));
- gtk_widget_set_tooltip_text(widget, tip && *tip ? _(tip) : "");
- g_signal_connect(G_OBJECT(widget), "toggled",
- G_CALLBACK(gnc_option_radiobutton_cb), option);
- gtk_box_pack_start (GTK_BOX (box), widget, FALSE, FALSE, 0);
+ gtk_widget_set_tooltip_text (widget, tip && *tip ? _(tip) : "");
+ g_signal_connect (G_OBJECT(widget), "toggled",
+ G_CALLBACK(gnc_option_radiobutton_cb), option);
+ gtk_box_pack_start (GTK_BOX(box), widget, FALSE, FALSE, 0);
if (label)
free (label);
if (tip)
free (tip);
}
-
return frame;
}
@@ -1222,9 +1205,9 @@ gnc_option_create_currency_accounting_widget (char *name, GNCOption *option)
*widget = NULL,
*vbox = NULL;
int i;
- int num_values = gnc_option_num_permissible_values(option);
+ int num_values = gnc_option_num_permissible_values (option);
- g_return_val_if_fail(num_values == 3, NULL);
+ g_return_val_if_fail (num_values == 3, NULL);
book_currency_data = g_new0 (currency_accounting_data, 1);
book_currency_data->option = option;
@@ -1235,8 +1218,8 @@ gnc_option_create_currency_accounting_widget (char *name, GNCOption *option)
/* Create the vertical button box */
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
- gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE);
- gtk_container_add (GTK_CONTAINER (frame), vbox);
+ gtk_box_set_homogeneous (GTK_BOX(vbox), FALSE);
+ gtk_container_add (GTK_CONTAINER(frame), vbox);
gtk_widget_set_halign (GTK_WIDGET(vbox), GTK_ALIGN_FILL);
gtk_widget_set_hexpand (GTK_WIDGET(vbox), TRUE);
@@ -1250,16 +1233,16 @@ gnc_option_create_currency_accounting_widget (char *name, GNCOption *option)
char *tip;
GtkWidget *table = NULL;
- label = gnc_option_permissible_value_name(option, i);
- tip = gnc_option_permissible_value_description(option, i);
+ label = gnc_option_permissible_value_name (option, i);
+ tip = gnc_option_permissible_value_description (option, i);
widget =
gtk_radio_button_new_with_label_from_widget (widget ?
- GTK_RADIO_BUTTON (widget) :
+ GTK_RADIO_BUTTON(widget) :
NULL,
label && *label ? _(label) : "");
- g_object_set_data (G_OBJECT (widget), "gnc_radiobutton_index",
- GINT_TO_POINTER (i));
+ g_object_set_data (G_OBJECT(widget), "gnc_radiobutton_index",
+ GINT_TO_POINTER(i));
switch (i)
{
case 0:
@@ -1277,91 +1260,91 @@ gnc_option_create_currency_accounting_widget (char *name, GNCOption *option)
default:
break;
}
- gtk_widget_set_tooltip_text(widget, tip && *tip ? _(tip) : "");
- if (g_strcmp0(gnc_option_permissible_value_name(option, i),
+ gtk_widget_set_tooltip_text (widget, tip && *tip ? _(tip) : "");
+ if (g_strcmp0 (gnc_option_permissible_value_name (option, i),
"Use a Book Currency") == 0)
{
GtkWidget *widget_label,
- *policy_table = gtk_grid_new();
+ *policy_table = gtk_grid_new ();
- book_currency_data->book_currency_widget = gnc_currency_edit_new();
+ book_currency_data->book_currency_widget = gnc_currency_edit_new ();
book_currency_data->default_cost_policy_widget =
- gnc_cost_policy_select_new();
+ gnc_cost_policy_select_new ();
book_currency_data->default_gain_loss_account_widget = NULL;
book_currency_data->gain_loss_account_del_button = NULL;
book_currency_data->default_gain_loss_account_text = NULL;
book_currency_data->prior_gain_loss_account = NULL;
book_currency_data->book_currency_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- gtk_box_set_homogeneous (GTK_BOX (book_currency_data->book_currency_vbox), FALSE);
+ gtk_box_set_homogeneous (GTK_BOX(book_currency_data->book_currency_vbox), FALSE);
table = gtk_grid_new ();
gtk_grid_attach (GTK_GRID(table), widget, 0, 0, 2, 1);
- g_signal_connect(G_OBJECT(widget), "toggled",
- G_CALLBACK(gnc_option_currency_accounting_book_cb),
- book_currency_data);
+ g_signal_connect (G_OBJECT(widget), "toggled",
+ G_CALLBACK(gnc_option_currency_accounting_book_cb),
+ book_currency_data);
book_currency_data->book_currency_table = gtk_grid_new ();
- gtk_grid_set_row_spacing (GTK_GRID (book_currency_data->book_currency_table), 6);
- gtk_grid_set_column_spacing (GTK_GRID (book_currency_data->book_currency_table), 6);
+ gtk_grid_set_row_spacing (GTK_GRID(book_currency_data->book_currency_table), 6);
+ gtk_grid_set_column_spacing (GTK_GRID(book_currency_data->book_currency_table), 6);
- tip = gnc_currency_accounting_option_currency_documentation(option);
- widget_label = gtk_label_new( _("Book currency") );
- gtk_widget_set_tooltip_text(book_currency_data->book_currency_table,
- tip && *tip ? _(tip) : "");
+ tip = gnc_currency_accounting_option_currency_documentation (option);
+ widget_label = gtk_label_new ( _("Book currency") );
+ gtk_widget_set_tooltip_text (book_currency_data->book_currency_table,
+ tip && *tip ? _(tip) : "");
gtk_widget_set_halign (GTK_WIDGET(widget_label), GTK_ALIGN_START);
gtk_widget_set_hexpand (GTK_WIDGET(widget_label), TRUE);
gtk_grid_attach (GTK_GRID(book_currency_data->book_currency_table), widget_label, 0, 0, 1, 1);
- g_signal_connect(G_OBJECT(book_currency_data->book_currency_widget),
- "changed",
- G_CALLBACK(gnc_option_changed_book_currency_widget_cb),
- NULL);
+ g_signal_connect (G_OBJECT(book_currency_data->book_currency_widget),
+ "changed",
+ G_CALLBACK(gnc_option_changed_book_currency_widget_cb),
+ NULL);
gtk_grid_attach (GTK_GRID(book_currency_data->book_currency_table),
book_currency_data->book_currency_widget, 1, 0, 1, 1);
- gtk_box_pack_start (GTK_BOX (book_currency_data->book_currency_vbox),
- book_currency_data->book_currency_table,
- TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX(book_currency_data->book_currency_vbox),
+ book_currency_data->book_currency_table,
+ TRUE, TRUE, 0);
gtk_widget_set_margin_start (GTK_WIDGET(book_currency_data->book_currency_table), 12);
- gtk_grid_set_row_spacing (GTK_GRID (policy_table), 6);
- gtk_grid_set_column_spacing (GTK_GRID (policy_table), 6);
+ gtk_grid_set_row_spacing (GTK_GRID(policy_table), 6);
+ gtk_grid_set_column_spacing (GTK_GRID(policy_table), 6);
- tip = gnc_currency_accounting_option_policy_documentation(option);
- widget_label = gtk_label_new( _("Default lot tracking policy") );
- gtk_widget_set_tooltip_text(policy_table, tip && *tip ? _(tip) : "");
+ tip = gnc_currency_accounting_option_policy_documentation (option);
+ widget_label = gtk_label_new ( _("Default lot tracking policy") );
+ gtk_widget_set_tooltip_text (policy_table, tip && *tip ? _(tip) : "");
gtk_widget_set_halign (GTK_WIDGET(widget_label), GTK_ALIGN_START);
gtk_widget_set_hexpand (GTK_WIDGET(widget_label), TRUE);
gtk_grid_attach (GTK_GRID(policy_table), widget_label, 0, 1, 1, 1);
- g_signal_connect(G_OBJECT(
- book_currency_data->default_cost_policy_widget),
- "changed",
- G_CALLBACK(gnc_option_multichoice_cb), option);
+ g_signal_connect (G_OBJECT(book_currency_data->default_cost_policy_widget),
+ "changed",
+ G_CALLBACK(gnc_option_multichoice_cb), option);
gtk_grid_attach (GTK_GRID(policy_table),
book_currency_data->default_cost_policy_widget, 1, 1, 1, 1);
- gtk_box_pack_start (GTK_BOX (book_currency_data->book_currency_vbox),
- policy_table, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX(book_currency_data->book_currency_vbox),
+ policy_table, TRUE, TRUE, 0);
gtk_widget_set_margin_start (GTK_WIDGET(policy_table), 12);
book_currency_data->gain_loss_account_table = gtk_grid_new ();
- gtk_grid_set_row_spacing (GTK_GRID (book_currency_data->gain_loss_account_table), 6);
- gtk_grid_set_column_spacing (GTK_GRID (book_currency_data->gain_loss_account_table), 6);
+ gtk_grid_set_row_spacing (GTK_GRID(book_currency_data->gain_loss_account_table), 6);
+ gtk_grid_set_column_spacing (GTK_GRID(book_currency_data->gain_loss_account_table), 6);
- tip = gnc_currency_accounting_option_gain_loss_account_documentation(option);
- widget_label = gtk_label_new( _("Default gain/loss account") );
+ tip = gnc_currency_accounting_option_gain_loss_account_documentation (option);
+ widget_label = gtk_label_new ( _("Default gain/loss account") );
gnc_label_set_alignment (GTK_WIDGET(widget_label), 0.0, 0.5);
- gtk_widget_set_tooltip_text(book_currency_data->gain_loss_account_table,
- tip && *tip ? _(tip) : "");
+ gtk_widget_set_tooltip_text (book_currency_data->gain_loss_account_table,
+ tip && *tip ? _(tip) : "");
- gtk_grid_attach (GTK_GRID(book_currency_data->gain_loss_account_table), widget_label, 0, 0, 1, 1);
+ gtk_grid_attach (GTK_GRID(book_currency_data->gain_loss_account_table),
+ widget_label, 0, 0, 1, 1);
widget_label = NULL;
gtk_box_pack_start (GTK_BOX (book_currency_data->book_currency_vbox),
@@ -1375,11 +1358,11 @@ gnc_option_create_currency_accounting_widget (char *name, GNCOption *option)
table = gtk_grid_new ();
gtk_grid_attach (GTK_GRID(table), widget, 0, 1, 1, 1);
- g_signal_connect(G_OBJECT(widget), "toggled",
- G_CALLBACK(gnc_option_currency_accounting_non_book_cb),
- book_currency_data);
+ g_signal_connect (G_OBJECT(widget), "toggled",
+ G_CALLBACK(gnc_option_currency_accounting_non_book_cb),
+ book_currency_data);
}
- gtk_box_pack_start (GTK_BOX (vbox), table, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX(vbox), table, TRUE, TRUE, 0);
if (label)
free (label);
@@ -1390,45 +1373,42 @@ gnc_option_create_currency_accounting_widget (char *name, GNCOption *option)
}
static void
-gnc_option_account_cb(GtkTreeSelection *selection, gpointer data)
+gnc_option_account_cb (GtkTreeSelection *selection, gpointer data)
{
GNCOption *option = data;
- GtkTreeView *tree_view;
-
- tree_view = gtk_tree_selection_get_tree_view(selection);
-
- gnc_option_changed_widget_cb(GTK_WIDGET(tree_view), option);
+ GtkTreeView *tree_view = gtk_tree_selection_get_tree_view (selection);
+ gnc_option_changed_widget_cb (GTK_WIDGET(tree_view), option);
}
static void
-gnc_option_account_select_all_cb(GtkWidget *widget, gpointer data)
+gnc_option_account_select_all_cb (GtkWidget *widget, gpointer data)
{
GNCOption *option = data;
GncTreeViewAccount *tree_view;
GtkTreeSelection *selection;
tree_view = GNC_TREE_VIEW_ACCOUNT(gnc_option_get_gtk_widget (option));
- gtk_tree_view_expand_all(GTK_TREE_VIEW(tree_view));
- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));
- gtk_tree_selection_select_all(selection);
- gnc_option_changed_widget_cb(widget, option);
+ gtk_tree_view_expand_all (GTK_TREE_VIEW(tree_view));
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(tree_view));
+ gtk_tree_selection_select_all (selection);
+ gnc_option_changed_widget_cb (widget, option);
}
static void
-gnc_option_account_clear_all_cb(GtkWidget *widget, gpointer data)
+gnc_option_account_clear_all_cb (GtkWidget *widget, gpointer data)
{
GNCOption *option = data;
GncTreeViewAccount *tree_view;
GtkTreeSelection *selection;
tree_view = GNC_TREE_VIEW_ACCOUNT(gnc_option_get_gtk_widget (option));
- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));
- gtk_tree_selection_unselect_all(selection);
- gnc_option_changed_widget_cb(widget, option);
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(tree_view));
+ gtk_tree_selection_unselect_all (selection);
+ gnc_option_changed_widget_cb (widget, option);
}
static void
-gnc_option_account_select_children_cb(GtkWidget *widget, gpointer data)
+gnc_option_account_select_children_cb (GtkWidget *widget, gpointer data)
{
GNCOption *option = data;
GncTreeViewAccount *tree_view;
@@ -1444,7 +1424,7 @@ gnc_option_account_select_children_cb(GtkWidget *widget, gpointer data)
}
static GtkWidget *
-gnc_option_create_account_widget(GNCOption *option, char *name)
+gnc_option_create_account_widget (GNCOption *option, char *name)
{
gboolean multiple_selection;
GtkWidget *scroll_win;
@@ -1456,15 +1436,15 @@ gnc_option_create_account_widget(GNCOption *option, char *name)
GList *acct_type_list;
GtkTreeSelection *selection;
- multiple_selection = gnc_option_multiple_selection(option);
- acct_type_list = gnc_option_get_account_type_list(option);
+ multiple_selection = gnc_option_multiple_selection (option);
+ acct_type_list = gnc_option_get_account_type_list (option);
- frame = gtk_frame_new(name);
+ frame = gtk_frame_new (name);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE);
+ gtk_box_set_homogeneous (GTK_BOX(vbox), FALSE);
- gtk_container_add(GTK_CONTAINER(frame), vbox);
+ gtk_container_add (GTK_CONTAINER(frame), vbox);
tree = GTK_WIDGET(gnc_tree_view_account_new (FALSE));
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(tree), FALSE);
@@ -1480,7 +1460,7 @@ gnc_option_create_account_widget(GNCOption *option, char *name)
AccountViewInfo avi;
int i;
- gnc_tree_view_account_get_view_info (GNC_TREE_VIEW_ACCOUNT (tree), &avi);
+ gnc_tree_view_account_get_view_info (GNC_TREE_VIEW_ACCOUNT(tree), &avi);
for (i = 0; i < NUM_ACCOUNT_TYPES; i++)
avi.include_type[i] = FALSE;
@@ -1488,11 +1468,11 @@ gnc_option_create_account_widget(GNCOption *option, char *name)
for (node = acct_type_list; node; node = node->next)
{
- GNCAccountType type = GPOINTER_TO_INT (node->data);
+ GNCAccountType type = GPOINTER_TO_INT(node->data);
avi.include_type[type] = TRUE;
}
- gnc_tree_view_account_set_view_info (GNC_TREE_VIEW_ACCOUNT (tree), &avi);
+ gnc_tree_view_account_set_view_info (GNC_TREE_VIEW_ACCOUNT(tree), &avi);
g_list_free (acct_type_list);
}
else
@@ -1500,57 +1480,57 @@ gnc_option_create_account_widget(GNCOption *option, char *name)
AccountViewInfo avi;
int i;
- gnc_tree_view_account_get_view_info (GNC_TREE_VIEW_ACCOUNT (tree), &avi);
+ gnc_tree_view_account_get_view_info (GNC_TREE_VIEW_ACCOUNT(tree), &avi);
for (i = 0; i < NUM_ACCOUNT_TYPES; i++)
avi.include_type[i] = TRUE;
avi.show_hidden = FALSE;
- gnc_tree_view_account_set_view_info (GNC_TREE_VIEW_ACCOUNT (tree), &avi);
+ gnc_tree_view_account_set_view_info (GNC_TREE_VIEW_ACCOUNT(tree), &avi);
}
- scroll_win = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll_win),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
+ scroll_win = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(scroll_win),
+ GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_AUTOMATIC);
- gtk_box_pack_start(GTK_BOX(vbox), scroll_win, TRUE, TRUE, 0);
- gtk_container_set_border_width(GTK_CONTAINER(scroll_win), 5);
- gtk_container_add(GTK_CONTAINER(scroll_win), tree);
+ gtk_box_pack_start (GTK_BOX(vbox), scroll_win, TRUE, TRUE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER(scroll_win), 5);
+ gtk_container_add (GTK_CONTAINER(scroll_win), tree);
bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_SPREAD);
- gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 10);
+ gtk_button_box_set_layout (GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_SPREAD);
+ gtk_box_pack_start (GTK_BOX(vbox), bbox, FALSE, FALSE, 10);
if (multiple_selection)
{
- button = gtk_button_new_with_label(_("Select All"));
- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_widget_set_tooltip_text(button, _("Select all accounts."));
+ button = gtk_button_new_with_label (_("Select All"));
+ gtk_box_pack_start (GTK_BOX(bbox), button, FALSE, FALSE, 0);
+ gtk_widget_set_tooltip_text (button, _("Select all accounts."));
- g_signal_connect(G_OBJECT(button), "clicked",
- G_CALLBACK(gnc_option_account_select_all_cb), option);
+ g_signal_connect (G_OBJECT(button), "clicked",
+ G_CALLBACK(gnc_option_account_select_all_cb), option);
- button = gtk_button_new_with_label(_("Clear All"));
- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_widget_set_tooltip_text(button, _("Clear the selection and unselect all accounts."));
+ button = gtk_button_new_with_label (_("Clear All"));
+ gtk_box_pack_start (GTK_BOX(bbox), button, FALSE, FALSE, 0);
+ gtk_widget_set_tooltip_text (button, _("Clear the selection and unselect all accounts."));
- g_signal_connect(G_OBJECT(button), "clicked",
- G_CALLBACK(gnc_option_account_clear_all_cb), option);
+ g_signal_connect (G_OBJECT(button), "clicked",
+ G_CALLBACK(gnc_option_account_clear_all_cb), option);
- button = gtk_button_new_with_label(_("Select Children"));
- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_widget_set_tooltip_text(button, _("Select all descendents of selected account."));
+ button = gtk_button_new_with_label (_("Select Children"));
+ gtk_box_pack_start (GTK_BOX(bbox), button, FALSE, FALSE, 0);
+ gtk_widget_set_tooltip_text (button, _("Select all descendents of selected account."));
- g_signal_connect(G_OBJECT(button), "clicked",
- G_CALLBACK(gnc_option_account_select_children_cb), option);
+ g_signal_connect (G_OBJECT(button), "clicked",
+ G_CALLBACK(gnc_option_account_select_children_cb), option);
}
- button = gtk_button_new_with_label(_("Select Default"));
- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_widget_set_tooltip_text(button, _("Select the default account selection."));
+ button = gtk_button_new_with_label (_("Select Default"));
+ gtk_box_pack_start (GTK_BOX(bbox), button, FALSE, FALSE, 0);
+ gtk_widget_set_tooltip_text (button, _("Select the default account selection."));
- g_signal_connect(G_OBJECT(button), "clicked",
- G_CALLBACK(gnc_option_default_cb), option);
+ g_signal_connect (G_OBJECT(button), "clicked",
+ G_CALLBACK(gnc_option_default_cb), option);
gtk_widget_set_margin_start (GTK_WIDGET(bbox), 6);
gtk_widget_set_margin_end (GTK_WIDGET(bbox), 6);
@@ -1560,16 +1540,16 @@ gnc_option_create_account_widget(GNCOption *option, char *name)
/* Put the "Show hidden" checkbox on a separate line since the 4 buttons make
the dialog too wide. */
bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_START);
- gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
+ gtk_button_box_set_layout (GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_START);
+ gtk_box_pack_start (GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
}
- button = gtk_check_button_new_with_label(_("Show Hidden Accounts"));
- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_widget_set_tooltip_text(button, _("Show accounts that have been marked hidden."));
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), FALSE);
- g_signal_connect(G_OBJECT(button), "toggled",
- G_CALLBACK(gnc_option_show_hidden_toggled_cb), option);
+ button = gtk_check_button_new_with_label (_("Show Hidden Accounts"));
+ gtk_box_pack_start (GTK_BOX(bbox), button, FALSE, FALSE, 0);
+ gtk_widget_set_tooltip_text (button, _("Show accounts that have been marked hidden."));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(button), FALSE);
+ g_signal_connect (G_OBJECT(button), "toggled",
+ G_CALLBACK(gnc_option_show_hidden_toggled_cb), option);
gnc_option_set_widget (option, tree);
@@ -1577,43 +1557,41 @@ gnc_option_create_account_widget(GNCOption *option, char *name)
}
static void
-gnc_option_list_changed_cb(GtkTreeSelection *selection,
- GNCOption *option)
+gnc_option_list_changed_cb (GtkTreeSelection *selection,
+ GNCOption *option)
{
- GtkTreeView *view;
-
- view = gtk_tree_selection_get_tree_view(selection);
- gnc_option_changed_widget_cb(GTK_WIDGET(view), option);
+ GtkTreeView *view = gtk_tree_selection_get_tree_view (selection);
+ gnc_option_changed_widget_cb (GTK_WIDGET(view), option);
}
static void
-gnc_option_list_select_all_cb(GtkWidget *widget, gpointer data)
+gnc_option_list_select_all_cb (GtkWidget *widget, gpointer data)
{
GNCOption *option = data;
GtkTreeView *view;
GtkTreeSelection *selection;
view = GTK_TREE_VIEW(gnc_option_get_gtk_widget (option));
- selection = gtk_tree_view_get_selection(view);
- gtk_tree_selection_select_all(selection);
- gnc_option_changed_widget_cb(GTK_WIDGET(view), option);
+ selection = gtk_tree_view_get_selection (view);
+ gtk_tree_selection_select_all (selection);
+ gnc_option_changed_widget_cb (GTK_WIDGET(view), option);
}
static void
-gnc_option_list_clear_all_cb(GtkWidget *widget, gpointer data)
+gnc_option_list_clear_all_cb (GtkWidget *widget, gpointer data)
{
GNCOption *option = data;
GtkTreeView *view;
GtkTreeSelection *selection;
view = GTK_TREE_VIEW(gnc_option_get_gtk_widget (option));
- selection = gtk_tree_view_get_selection(view);
- gtk_tree_selection_unselect_all(selection);
- gnc_option_changed_widget_cb(GTK_WIDGET(view), option);
+ selection = gtk_tree_view_get_selection (view);
+ gtk_tree_selection_unselect_all (selection);
+ gnc_option_changed_widget_cb (GTK_WIDGET(view), option);
}
static GtkWidget *
-gnc_option_create_list_widget(GNCOption *option, char *name)
+gnc_option_create_list_widget (GNCOption *option, char *name)
{
GtkListStore *store;
GtkTreeView *view;
@@ -1629,66 +1607,66 @@ gnc_option_create_list_widget(GNCOption *option, char *name)
gint num_values;
gint i;
- frame = gtk_frame_new(name);
+ frame = gtk_frame_new (name);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE);
- gtk_container_add(GTK_CONTAINER(frame), hbox);
-
- store = gtk_list_store_new(1, G_TYPE_STRING);
- view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)));
- g_object_unref(store);
- renderer = gtk_cell_renderer_text_new();
- column = gtk_tree_view_column_new_with_attributes("", renderer,
- "text", 0,
- NULL);
- gtk_tree_view_append_column(view, column);
- gtk_tree_view_set_headers_visible(view, FALSE);
-
- num_values = gnc_option_num_permissible_values(option);
+ gtk_box_set_homogeneous (GTK_BOX(hbox), FALSE);
+ gtk_container_add (GTK_CONTAINER(frame), hbox);
+
+ store = gtk_list_store_new (1, G_TYPE_STRING);
+ view = GTK_TREE_VIEW(gtk_tree_view_new_with_model (GTK_TREE_MODEL(store)));
+ g_object_unref (store);
+ renderer = gtk_cell_renderer_text_new ();
+ column = gtk_tree_view_column_new_with_attributes ("", renderer,
+ "text", 0,
+ NULL);
+ gtk_tree_view_append_column (view, column);
+ gtk_tree_view_set_headers_visible (view, FALSE);
+
+ num_values = gnc_option_num_permissible_values (option);
for (i = 0; i < num_values; i++)
{
gchar *raw_string, *string;
- raw_string = gnc_option_permissible_value_name(option, i);
+ raw_string = gnc_option_permissible_value_name (option, i);
string = (raw_string && *raw_string) ? _(raw_string) : "";
- gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter,
- 0, string ? string : "",
- -1);
- g_free(raw_string);
+ gtk_list_store_append (store, &iter);
+ gtk_list_store_set (store, &iter,
+ 0, string ? string : "",
+ -1);
+ g_free (raw_string);
}
- gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(view), FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(hbox), GTK_WIDGET(view), FALSE, FALSE, 0);
- selection = gtk_tree_view_get_selection(view);
- gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE);
- g_signal_connect(selection, "changed",
- G_CALLBACK(gnc_option_list_changed_cb), option);
+ selection = gtk_tree_view_get_selection (view);
+ gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
+ g_signal_connect (selection, "changed",
+ G_CALLBACK(gnc_option_list_changed_cb), option);
bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
- gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_SPREAD);
- gtk_box_pack_end(GTK_BOX(hbox), bbox, FALSE, FALSE, 0);
+ gtk_button_box_set_layout (GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_SPREAD);
+ gtk_box_pack_end (GTK_BOX(hbox), bbox, FALSE, FALSE, 0);
- button = gtk_button_new_with_label(_("Select All"));
- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_widget_set_tooltip_text(button, _("Select all entries."));
+ button = gtk_button_new_with_label (_("Select All"));
+ gtk_box_pack_start (GTK_BOX(bbox), button, FALSE, FALSE, 0);
+ gtk_widget_set_tooltip_text (button, _("Select all entries."));
- g_signal_connect(G_OBJECT(button), "clicked",
- G_CALLBACK(gnc_option_list_select_all_cb), option);
+ g_signal_connect (G_OBJECT(button), "clicked",
+ G_CALLBACK(gnc_option_list_select_all_cb), option);
- button = gtk_button_new_with_label(_("Clear All"));
- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_widget_set_tooltip_text(button, _("Clear the selection and unselect all entries."));
+ button = gtk_button_new_with_label (_("Clear All"));
+ gtk_box_pack_start (GTK_BOX(bbox), button, FALSE, FALSE, 0);
+ gtk_widget_set_tooltip_text (button, _("Clear the selection and unselect all entries."));
- g_signal_connect(G_OBJECT(button), "clicked",
- G_CALLBACK(gnc_option_list_clear_all_cb), option);
+ g_signal_connect (G_OBJECT(button), "clicked",
+ G_CALLBACK(gnc_option_list_clear_all_cb), option);
- button = gtk_button_new_with_label(_("Select Default"));
- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_widget_set_tooltip_text(button, _("Select the default selection."));
+ button = gtk_button_new_with_label (_("Select Default"));
+ gtk_box_pack_start (GTK_BOX(bbox), button, FALSE, FALSE, 0);
+ gtk_widget_set_tooltip_text (button, _("Select the default selection."));
- g_signal_connect(G_OBJECT(button), "clicked",
- G_CALLBACK(gnc_option_default_cb), option);
+ g_signal_connect (G_OBJECT(button), "clicked",
+ G_CALLBACK(gnc_option_default_cb), option);
g_object_set (G_OBJECT(hbox), "margin", 3, NULL);
@@ -1698,19 +1676,19 @@ gnc_option_create_list_widget(GNCOption *option, char *name)
}
static void
-gnc_option_color_changed_cb(GtkColorButton *color_button, GNCOption *option)
+gnc_option_color_changed_cb (GtkColorButton *color_button, GNCOption *option)
{
- gnc_option_changed_widget_cb(GTK_WIDGET(color_button), option);
+ gnc_option_changed_widget_cb (GTK_WIDGET(color_button), option);
}
static void
-gnc_option_font_changed_cb(GtkFontButton *font_button, GNCOption *option)
+gnc_option_font_changed_cb (GtkFontButton *font_button, GNCOption *option)
{
- gnc_option_changed_widget_cb(GTK_WIDGET(font_button), option);
+ gnc_option_changed_widget_cb (GTK_WIDGET(font_button), option);
}
static void
-gnc_option_set_ui_widget(GNCOption *option, GtkGrid *page_box, gint grid_row)
+gnc_option_set_ui_widget (GNCOption *option, GtkGrid *page_box, gint grid_row)
{
GtkWidget *enclosing = NULL;
GtkWidget *value = NULL;
@@ -1722,8 +1700,8 @@ gnc_option_set_ui_widget(GNCOption *option, GtkGrid *page_box, gint grid_row)
GtkLabel *name_label;
ENTER("option %p(%s), box %p",
- option, gnc_option_name(option), page_box);
- type = gnc_option_type(option);
+ option, gnc_option_name (option), page_box);
+ type = gnc_option_type (option);
if (type == NULL)
{
LEAVE("bad type");
@@ -1735,13 +1713,13 @@ gnc_option_set_ui_widget(GNCOption *option, GtkGrid *page_box, gint grid_row)
return;
}
- raw_name = gnc_option_name(option);
+ raw_name = gnc_option_name (option);
if (raw_name && *raw_name)
name = _(raw_name);
else
name = NULL;
- raw_documentation = gnc_option_documentation(option);
+ raw_documentation = gnc_option_documentation (option);
if (raw_documentation && *raw_documentation)
documentation = _(raw_documentation);
else
@@ -1763,7 +1741,7 @@ gnc_option_set_ui_widget(GNCOption *option, GtkGrid *page_box, gint grid_row)
}
/* attach the name label to the first column of the grid and align to the end
- * if option is a check button, do not add a label as we are using the biult
+ * if option is a check button, do not add a label as we are using the built
* in one */
if (!GTK_IS_CHECK_BUTTON(value))
gtk_grid_attach (GTK_GRID(page_box), GTK_WIDGET(name_label),
@@ -1776,9 +1754,9 @@ gnc_option_set_ui_widget(GNCOption *option, GtkGrid *page_box, gint grid_row)
{
/* Pack option widget into an extra eventbox because otherwise the
"documentation" tooltip is not displayed. */
- GtkWidget *eventbox = gtk_event_box_new();
+ GtkWidget *eventbox = gtk_event_box_new ();
- gtk_container_add (GTK_CONTAINER (eventbox), enclosing);
+ gtk_container_add (GTK_CONTAINER(eventbox), enclosing);
/* attach the option widget to the second column of the grid */
gtk_grid_attach (GTK_GRID(page_box), eventbox,
@@ -1789,27 +1767,27 @@ gnc_option_set_ui_widget(GNCOption *option, GtkGrid *page_box, gint grid_row)
}
if (value != NULL)
- gtk_widget_set_tooltip_text(value, documentation);
+ gtk_widget_set_tooltip_text (value, documentation);
if (raw_name != NULL)
- free(raw_name);
+ free (raw_name);
if (raw_documentation != NULL)
- free(raw_documentation);
- free(type);
+ free (raw_documentation);
+ free (type);
LEAVE(" ");
}
static void
-gnc_options_dialog_add_option(GtkWidget *page,
- GNCOption *option, gint row)
+gnc_options_dialog_add_option (GtkWidget *page,
+ GNCOption *option, gint row)
{
g_object_set_data (G_OBJECT(page), "options-grid-row", GINT_TO_POINTER(row));
- gnc_option_set_ui_widget(option, GTK_GRID(page), row);
+ gnc_option_set_ui_widget (option, GTK_GRID(page), row);
}
static gint
-gnc_options_dialog_append_page(GNCOptionWin * propertybox,
- GNCOptionSection *section)
+gnc_options_dialog_append_page (GNCOptionWin * propertybox,
+ GNCOptionSection *section)
{
GNCOption *option;
GtkWidget *page_label;
@@ -1828,106 +1806,107 @@ gnc_options_dialog_append_page(GNCOptionWin * propertybox,
gint i, page_count, name_offset;
gboolean advanced;
- name = gnc_option_section_name(section);
+ name = gnc_option_section_name (section);
if (!name)
return -1;
- if (strncmp(name, "__", 2) == 0)
+ if (strncmp (name, "__", 2) == 0)
return -1;
- advanced = (strncmp(name, "_+", 2) == 0);
+ advanced = (strncmp (name, "_+", 2) == 0);
name_offset = (advanced) ? 2 : 0;
- page_label = gtk_label_new(_(name + name_offset));
+ page_label = gtk_label_new (_(name + name_offset));
PINFO("Page_label is %s", _(name + name_offset));
- gtk_widget_show(page_label);
+ gtk_widget_show (page_label);
/* Build this options page */
page_content_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
gtk_widget_set_name (page_content_box, "page-content-box");
gtk_box_set_homogeneous (GTK_BOX (page_content_box), FALSE);
- gtk_container_set_border_width(GTK_CONTAINER(page_content_box), 12);
+ gtk_container_set_border_width (GTK_CONTAINER(page_content_box), 12);
- options_scrolled_win = gtk_scrolled_window_new(NULL, NULL);
- gtk_box_pack_start(GTK_BOX(page_content_box), options_scrolled_win, TRUE, TRUE, 0);
+ options_scrolled_win = gtk_scrolled_window_new (NULL, NULL);
+ gtk_box_pack_start (GTK_BOX(page_content_box), options_scrolled_win, TRUE, TRUE, 0);
/* Build space for the content - the options box */
- options_box = gtk_grid_new(); // this will have two columns
+ options_box = gtk_grid_new (); // this will have two columns
gtk_widget_set_name (options_box, "options-box");
gtk_grid_set_row_homogeneous (GTK_GRID(options_box), FALSE);
gtk_grid_set_column_homogeneous (GTK_GRID(options_box), FALSE);
gtk_grid_set_row_spacing (GTK_GRID(options_box), 6);
gtk_grid_set_column_spacing (GTK_GRID(options_box), 6);
- gtk_container_set_border_width(GTK_CONTAINER(options_box), 0);
+ gtk_container_set_border_width (GTK_CONTAINER(options_box), 0);
gtk_container_add (GTK_CONTAINER(options_scrolled_win), GTK_WIDGET(options_box));
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(options_scrolled_win), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(options_scrolled_win),
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
/* Create all the options */
- num_options = gnc_option_section_num_options(section);
+ num_options = gnc_option_section_num_options (section);
for (i = 0; i < num_options; i++)
{
- option = gnc_get_option_section_option(section, i);
- gnc_options_dialog_add_option(options_box, option, i);
+ option = gnc_get_option_section_option (section, i);
+ gnc_options_dialog_add_option (options_box, option, i);
}
/* Add a button box at the bottom of the page */
buttonbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_button_box_set_layout (GTK_BUTTON_BOX (buttonbox),
GTK_BUTTONBOX_EDGE);
- gtk_container_set_border_width(GTK_CONTAINER (buttonbox), 5);
- gtk_box_pack_end(GTK_BOX(page_content_box), buttonbox, FALSE, FALSE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER(buttonbox), 5);
+ gtk_box_pack_end (GTK_BOX(page_content_box), buttonbox, FALSE, FALSE, 0);
/* The reset button on each option page */
reset_button = gtk_button_new_with_label (_("Reset defaults"));
- gtk_widget_set_tooltip_text(reset_button,
- _("Reset all values to their defaults."));
+ gtk_widget_set_tooltip_text (reset_button,
+ _("Reset all values to their defaults."));
- g_signal_connect(G_OBJECT(reset_button), "clicked",
- G_CALLBACK(gnc_options_dialog_reset_cb), propertybox);
- g_object_set_data(G_OBJECT(reset_button), "section", section);
- gtk_box_pack_end(GTK_BOX(buttonbox), reset_button, FALSE, FALSE, 0);
- gtk_widget_show_all(page_content_box);
- gtk_notebook_append_page(GTK_NOTEBOOK(propertybox->notebook),
- page_content_box, page_label);
+ g_signal_connect (G_OBJECT(reset_button), "clicked",
+ G_CALLBACK(gnc_options_dialog_reset_cb), propertybox);
+ g_object_set_data (G_OBJECT(reset_button), "section", section);
+ gtk_box_pack_end (GTK_BOX(buttonbox), reset_button, FALSE, FALSE, 0);
+ gtk_widget_show_all (page_content_box);
+ gtk_notebook_append_page (GTK_NOTEBOOK(propertybox->notebook),
+ page_content_box, page_label);
/* Switch to selection from a list if the page count threshold is reached */
- page_count = gtk_notebook_page_num(GTK_NOTEBOOK(propertybox->notebook),
- page_content_box);
+ page_count = gtk_notebook_page_num (GTK_NOTEBOOK(propertybox->notebook),
+ page_content_box);
if (propertybox->page_list_view)
{
/* Build the matching list item for selecting from large page sets */
view = GTK_TREE_VIEW(propertybox->page_list_view);
- list = GTK_LIST_STORE(gtk_tree_view_get_model(view));
+ list = GTK_LIST_STORE(gtk_tree_view_get_model (view));
PINFO("Page name is %s and page_count is %d", name, page_count);
- gtk_list_store_append(list, &iter);
- gtk_list_store_set(list, &iter,
- PAGE_NAME, _(name),
- PAGE_INDEX, page_count,
- -1);
+ gtk_list_store_append (list, &iter);
+ gtk_list_store_set (list, &iter,
+ PAGE_NAME, _(name),
+ PAGE_INDEX, page_count,
+ -1);
if (page_count > MAX_TAB_COUNT - 1) /* Convert 1-based -> 0-based */
{
- gtk_widget_show(propertybox->page_list);
- gtk_notebook_set_show_tabs(GTK_NOTEBOOK(propertybox->notebook), FALSE);
- gtk_notebook_set_show_border(GTK_NOTEBOOK(propertybox->notebook), FALSE);
+ gtk_widget_show (propertybox->page_list);
+ gtk_notebook_set_show_tabs (GTK_NOTEBOOK(propertybox->notebook), FALSE);
+ gtk_notebook_set_show_border (GTK_NOTEBOOK(propertybox->notebook), FALSE);
}
else
- gtk_widget_hide(propertybox->page_list);
+ gtk_widget_hide (propertybox->page_list);
/* Tweak "advanced" pages for later handling. */
if (advanced)
{
- notebook_page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(propertybox->notebook),
- page_count);
+ notebook_page = gtk_notebook_get_nth_page (GTK_NOTEBOOK(propertybox->notebook),
+ page_count);
- g_object_set_data(G_OBJECT(notebook_page), "listitem", listitem);
- g_object_set_data(G_OBJECT(notebook_page), "advanced",
- GINT_TO_POINTER(advanced));
+ g_object_set_data (G_OBJECT(notebook_page), "listitem", listitem);
+ g_object_set_data (G_OBJECT(notebook_page), "advanced",
+ GINT_TO_POINTER(advanced));
}
}
- return(page_count);
+ return (page_count);
}
/********************************************************************\
@@ -1979,8 +1958,8 @@ gnc_options_dialog_build_contents_full (GNCOptionWin *propertybox,
propertybox->option_db = odb;
- num_sections = gnc_option_db_num_sections(odb);
- default_section_name = gnc_option_db_get_default_section(odb);
+ num_sections = gnc_option_db_num_sections (odb);
+ default_section_name = gnc_option_db_get_default_section (odb);
PINFO("Default Section name is %s", default_section_name);
@@ -1988,88 +1967,88 @@ gnc_options_dialog_build_contents_full (GNCOptionWin *propertybox,
{
const char *section_name;
- section = gnc_option_db_get_section(odb, i);
- page = gnc_options_dialog_append_page(propertybox, section);
+ section = gnc_option_db_get_section (odb, i);
+ page = gnc_options_dialog_append_page (propertybox, section);
- section_name = gnc_option_section_name(section);
- if (g_strcmp0(section_name, default_section_name) == 0)
+ section_name = gnc_option_section_name (section);
+ if (g_strcmp0 (section_name, default_section_name) == 0)
default_page = page;
}
if (default_section_name != NULL)
- free(default_section_name);
+ free (default_section_name);
/* call each option widget changed callbacks once at this point,
* now that all options widgets exist.
*/
for (i = 0; i < num_sections; i++)
{
- section = gnc_option_db_get_section(odb, i);
+ section = gnc_option_db_get_section (odb, i);
- for (j = 0; j < gnc_option_section_num_options(section); j++)
+ for (j = 0; j < gnc_option_section_num_options (section); j++)
{
// setting TRUE will clear the changed flag after proc
- gnc_option_call_option_widget_changed_proc(
+ gnc_option_call_option_widget_changed_proc (
gnc_get_option_section_option(section, j), TRUE);
}
}
- gtk_notebook_popup_enable(GTK_NOTEBOOK(propertybox->notebook));
+ gtk_notebook_popup_enable (GTK_NOTEBOOK(propertybox->notebook));
if (default_page >= 0)
{
/* Find the page list and set the selection to the default page */
- GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(propertybox->page_list_view));
+ GtkTreeSelection* selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(propertybox->page_list_view));
GtkTreeIter iter;
GtkTreeModel *model;
- model = gtk_tree_view_get_model(GTK_TREE_VIEW(propertybox->page_list_view));
- gtk_tree_model_iter_nth_child(model, &iter, NULL, default_page);
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW(propertybox->page_list_view));
+ gtk_tree_model_iter_nth_child (model, &iter, NULL, default_page);
gtk_tree_selection_select_iter (selection, &iter);
- gtk_notebook_set_current_page(GTK_NOTEBOOK(propertybox->notebook), default_page);
+ gtk_notebook_set_current_page (GTK_NOTEBOOK(propertybox->notebook), default_page);
}
- gnc_options_dialog_changed_internal(propertybox->window, FALSE);
+ gnc_options_dialog_changed_internal (propertybox->window, FALSE);
if (show_dialog)
- gtk_widget_show(propertybox->window);
+ gtk_widget_show (propertybox->window);
}
GtkWidget *
-gnc_options_dialog_widget(GNCOptionWin * win)
+gnc_options_dialog_widget (GNCOptionWin * win)
{
return win->window;
}
GtkWidget *
-gnc_options_page_list(GNCOptionWin * win)
+gnc_options_page_list (GNCOptionWin * win)
{
return win->page_list;
}
GtkWidget *
-gnc_options_dialog_notebook(GNCOptionWin * win)
+gnc_options_dialog_notebook (GNCOptionWin * win)
{
return win->notebook;
}
static void
-gnc_options_dialog_help_button_cb(GtkWidget * widget, GNCOptionWin *win)
+gnc_options_dialog_help_button_cb (GtkWidget * widget, GNCOptionWin *win)
{
if (win->help_cb)
(win->help_cb)(win, win->help_cb_data);
}
static void
-gnc_options_dialog_cancel_button_cb(GtkWidget * widget, GNCOptionWin *win)
+gnc_options_dialog_cancel_button_cb (GtkWidget * widget, GNCOptionWin *win)
{
gnc_save_window_size (GNC_PREFS_GROUP, GTK_WINDOW(win->window));
if (win->close_cb)
(win->close_cb)(win, win->close_cb_data);
else
- gtk_widget_hide(win->window);
+ gtk_widget_hide (win->window);
}
static void
-gnc_options_dialog_apply_button_cb(GtkWidget * widget, GNCOptionWin *win)
+gnc_options_dialog_apply_button_cb (GtkWidget * widget, GNCOptionWin *win)
{
GNCOptionWinCallback close_cb = win->close_cb;
@@ -2082,7 +2061,7 @@ gnc_options_dialog_apply_button_cb(GtkWidget * widget, GNCOptionWin *win)
}
static void
-gnc_options_dialog_ok_button_cb(GtkWidget * widget, GNCOptionWin *win)
+gnc_options_dialog_ok_button_cb (GtkWidget * widget, GNCOptionWin *win)
{
GNCOptionWinCallback close_cb = win->close_cb;
@@ -2096,7 +2075,7 @@ gnc_options_dialog_ok_button_cb(GtkWidget * widget, GNCOptionWin *win)
if (win->close_cb)
(win->close_cb)(win, win->close_cb_data);
else
- gtk_widget_hide(win->window);
+ gtk_widget_hide (win->window);
}
static void
@@ -2112,7 +2091,9 @@ gnc_options_dialog_destroy_cb (GtkWidget *object, GNCOptionWin *win)
}
static gboolean
-gnc_options_dialog_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+gnc_options_dialog_window_key_press_cb (GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer data)
{
GNCOptionWin *win = data;
@@ -2126,7 +2107,7 @@ gnc_options_dialog_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, gp
}
static void
-gnc_options_dialog_reset_cb(GtkWidget * w, gpointer data)
+gnc_options_dialog_reset_cb (GtkWidget * w, gpointer data)
{
GNCOptionWin *win = data;
GNCOptionSection *section;
@@ -2153,13 +2134,13 @@ gnc_options_dialog_list_select_cb (GtkTreeSelection *selection,
GtkTreeIter iter;
gint index = 0;
- if (!gtk_tree_selection_get_selected(selection, &list, &iter))
+ if (!gtk_tree_selection_get_selected (selection, &list, &iter))
return;
- gtk_tree_model_get(list, &iter,
- PAGE_INDEX, &index,
- -1);
+ gtk_tree_model_get (list, &iter,
+ PAGE_INDEX, &index,
+ -1);
PINFO("Index is %d", index);
- gtk_notebook_set_current_page(GTK_NOTEBOOK(win->notebook), index);
+ gtk_notebook_set_current_page (GTK_NOTEBOOK(win->notebook), index);
}
void
@@ -2224,9 +2205,9 @@ refresh_handler (GHashTable *changes, gpointer user_data)
*
*/
GNCOptionWin *
-gnc_options_dialog_new(gchar *title, GtkWindow *parent)
+gnc_options_dialog_new (gchar *title, GtkWindow *parent)
{
- return gnc_options_dialog_new_modal(FALSE, title, NULL, parent);
+ return gnc_options_dialog_new_modal (FALSE, title, NULL, parent);
}
/* gnc_options_dialog_new_modal:
@@ -2243,9 +2224,9 @@ gnc_options_dialog_new(gchar *title, GtkWindow *parent)
* the window stack instead of creating a new dialog.
*/
GNCOptionWin *
-gnc_options_dialog_new_modal(gboolean modal, gchar *title,
- const char *component_class,
- GtkWindow *parent)
+gnc_options_dialog_new_modal (gboolean modal, gchar *title,
+ const char *component_class,
+ GtkWindow *parent)
{
GNCOptionWin *retval;
GtkBuilder *builder;
@@ -2253,8 +2234,8 @@ gnc_options_dialog_new_modal(gboolean modal, gchar *title,
gint component_id;
GtkWidget *button;
- retval = g_new0(GNCOptionWin, 1);
- builder = gtk_builder_new();
+ retval = g_new0 (GNCOptionWin, 1);
+ builder = gtk_builder_new ();
gnc_builder_add_from_file (builder, "dialog-options.glade", "gnucash_options_window");
retval->window = GTK_WIDGET(gtk_builder_get_object (builder, "gnucash_options_window"));
retval->page_list = GTK_WIDGET(gtk_builder_get_object (builder, "page_list_scroll"));
@@ -2274,31 +2255,32 @@ gnc_options_dialog_new_modal(gboolean modal, gchar *title,
view = GTK_TREE_VIEW(retval->page_list_view);
- store = gtk_list_store_new(NUM_COLUMNS, G_TYPE_INT, G_TYPE_STRING);
- gtk_tree_view_set_model(view, GTK_TREE_MODEL(store));
- g_object_unref(store);
+ store = gtk_list_store_new (NUM_COLUMNS, G_TYPE_INT, G_TYPE_STRING);
+ gtk_tree_view_set_model (view, GTK_TREE_MODEL(store));
+ g_object_unref (store);
- renderer = gtk_cell_renderer_text_new();
- column = gtk_tree_view_column_new_with_attributes(_("Page"), renderer,
- "text", PAGE_NAME, NULL);
- gtk_tree_view_append_column(view, column);
+ renderer = gtk_cell_renderer_text_new ();
+ column = gtk_tree_view_column_new_with_attributes (_("Page"), renderer,
+ "text", PAGE_NAME,
+ NULL);
+ gtk_tree_view_append_column (view, column);
- gtk_tree_view_column_set_alignment(column, 0.5);
+ gtk_tree_view_column_set_alignment (column, 0.5);
- selection = gtk_tree_view_get_selection(view);
- gtk_tree_selection_set_mode(selection, GTK_SELECTION_BROWSE);
+ selection = gtk_tree_view_get_selection (view);
+ gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
g_signal_connect (selection, "changed",
G_CALLBACK (gnc_options_dialog_list_select_cb), retval);
}
button = GTK_WIDGET(gtk_builder_get_object (builder, "helpbutton"));
- g_signal_connect(button, "clicked", G_CALLBACK(gnc_options_dialog_help_button_cb), retval);
+ g_signal_connect (button, "clicked", G_CALLBACK(gnc_options_dialog_help_button_cb), retval);
button = GTK_WIDGET(gtk_builder_get_object (builder, "cancelbutton"));
- g_signal_connect(button, "clicked", G_CALLBACK(gnc_options_dialog_cancel_button_cb), retval);
+ g_signal_connect (button, "clicked", G_CALLBACK(gnc_options_dialog_cancel_button_cb), retval);
button = GTK_WIDGET(gtk_builder_get_object (builder, "applybutton"));
- g_signal_connect(button, "clicked", G_CALLBACK(gnc_options_dialog_apply_button_cb), retval);
+ g_signal_connect (button, "clicked", G_CALLBACK(gnc_options_dialog_apply_button_cb), retval);
button = GTK_WIDGET(gtk_builder_get_object (builder, "okbutton"));
- g_signal_connect(button, "clicked", G_CALLBACK(gnc_options_dialog_ok_button_cb), retval);
+ g_signal_connect (button, "clicked", G_CALLBACK(gnc_options_dialog_ok_button_cb), retval);
gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, retval);
@@ -2306,7 +2288,7 @@ gnc_options_dialog_new_modal(gboolean modal, gchar *title,
gnc_restore_window_size (GNC_PREFS_GROUP, GTK_WINDOW(retval->window), parent);
if (title)
- gtk_window_set_title(GTK_WINDOW(retval->window), title);
+ gtk_window_set_title (GTK_WINDOW(retval->window), title);
/* modal */
if (modal == TRUE)
@@ -2319,12 +2301,12 @@ gnc_options_dialog_new_modal(gboolean modal, gchar *title,
/* glade doesn't support a notebook with zero pages */
hbox = GTK_WIDGET(gtk_builder_get_object (builder, "notebook_placeholder"));
- retval->notebook = gtk_notebook_new();
+ retval->notebook = gtk_notebook_new ();
gtk_widget_set_vexpand (retval->notebook, TRUE);
- gtk_widget_show(retval->notebook);
- gtk_box_pack_start(GTK_BOX(hbox), retval->notebook, TRUE, TRUE, 5);
+ gtk_widget_show (retval->notebook);
+ gtk_box_pack_start (GTK_BOX(hbox), retval->notebook, TRUE, TRUE, 5);
retval->component_class =
(component_class ? component_class : DIALOG_OPTIONS_CM_CLASS);
@@ -2334,11 +2316,11 @@ gnc_options_dialog_new_modal(gboolean modal, gchar *title,
gnc_gui_component_set_session (component_id, gnc_get_current_session());
/* Watch account maintenance events only if book option dialog */
- if (g_strcmp0(retval->component_class, DIALOG_BOOK_OPTIONS_CM_CLASS) == 0)
+ if (g_strcmp0 (retval->component_class, DIALOG_BOOK_OPTIONS_CM_CLASS) == 0)
{
gnc_gui_component_watch_entity_type (component_id,
- GNC_ID_ACCOUNT,
- QOF_EVENT_MODIFY | QOF_EVENT_DESTROY);
+ GNC_ID_ACCOUNT,
+ QOF_EVENT_MODIFY | QOF_EVENT_DESTROY);
}
g_signal_connect (retval->window, "destroy",
@@ -2347,7 +2329,7 @@ gnc_options_dialog_new_modal(gboolean modal, gchar *title,
g_signal_connect (retval->window, "key_press_event",
G_CALLBACK(gnc_options_dialog_window_key_press_cb), retval);
- g_object_unref(G_OBJECT(builder));
+ g_object_unref (G_OBJECT(builder));
retval->destroyed = FALSE;
return retval;
@@ -2356,42 +2338,42 @@ gnc_options_dialog_new_modal(gboolean modal, gchar *title,
/* Creates a new GNCOptionWin structure, but assumes you have your own
dialog widget you want to plugin */
GNCOptionWin *
-gnc_options_dialog_new_w_dialog(gchar *title, GtkWidget *window)
+gnc_options_dialog_new_w_dialog (gchar *title, GtkWidget *window)
{
GNCOptionWin * retval;
- retval = g_new0(GNCOptionWin, 1);
+ retval = g_new0 (GNCOptionWin, 1);
retval->window = window;
return retval;
}
void
-gnc_options_dialog_set_apply_cb(GNCOptionWin * win, GNCOptionWinCallback cb,
- gpointer data)
+gnc_options_dialog_set_apply_cb (GNCOptionWin * win, GNCOptionWinCallback cb,
+ gpointer data)
{
win->apply_cb = cb;
win->apply_cb_data = data;
}
void
-gnc_options_dialog_set_help_cb(GNCOptionWin * win, GNCOptionWinCallback cb,
- gpointer data)
+gnc_options_dialog_set_help_cb (GNCOptionWin * win, GNCOptionWinCallback cb,
+ gpointer data)
{
win->help_cb = cb;
win->help_cb_data = data;
}
void
-gnc_options_dialog_set_close_cb(GNCOptionWin * win, GNCOptionWinCallback cb,
- gpointer data)
+gnc_options_dialog_set_close_cb (GNCOptionWin * win, GNCOptionWinCallback cb,
+ gpointer data)
{
win->close_cb = cb;
win->close_cb_data = data;
}
void
-gnc_options_dialog_set_global_help_cb(GNCOptionWinCallback thunk,
- gpointer cb_data)
+gnc_options_dialog_set_global_help_cb (GNCOptionWinCallback thunk,
+ gpointer cb_data)
{
global_help_cb = thunk;
global_help_cb_data = cb_data;
@@ -2399,14 +2381,14 @@ gnc_options_dialog_set_global_help_cb(GNCOptionWinCallback thunk,
/* This is for global program preferences. */
void
-gnc_options_dialog_destroy(GNCOptionWin * win)
+gnc_options_dialog_destroy (GNCOptionWin * win)
{
if (!win) return;
- gnc_unregister_gui_component_by_data(win->component_class, win);
+ gnc_unregister_gui_component_by_data (win->component_class, win);
win->destroyed = TRUE;
- gtk_widget_destroy(win->window);
+ gtk_widget_destroy (win->window);
win->window = NULL;
win->notebook = NULL;
@@ -2414,7 +2396,7 @@ gnc_options_dialog_destroy(GNCOptionWin * win)
win->help_cb = NULL;
win->component_class = NULL;
- g_free(win);
+ g_free (win);
}
/*****************************************************************/
@@ -2473,17 +2455,17 @@ gnc_option_set_ui_widget_boolean (GNCOption *option, GtkGrid *page_box,
GtkWidget *value;
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
+ gtk_box_set_homogeneous (GTK_BOX(*enclosing), FALSE);
value = gtk_check_button_new_with_label (gtk_label_get_text (name_label));
gnc_option_set_widget (option, value);
- gnc_option_set_ui_value(option, FALSE);
+ gnc_option_set_ui_value (option, FALSE);
- g_signal_connect(G_OBJECT(value), "toggled",
- G_CALLBACK(gnc_option_changed_widget_cb), option);
+ g_signal_connect (G_OBJECT(value), "toggled",
+ G_CALLBACK(gnc_option_changed_widget_cb), option);
- gtk_box_pack_start(GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
- gtk_widget_show_all(*enclosing);
+ gtk_box_pack_start (GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
+ gtk_widget_show_all (*enclosing);
return value;
}
@@ -2498,20 +2480,20 @@ gnc_option_set_ui_widget_string (GNCOption *option, GtkGrid *page_box,
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_widget_set_hexpand (GTK_WIDGET(*enclosing), TRUE);
- gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
- value = gtk_entry_new();
+ gtk_box_set_homogeneous (GTK_BOX(*enclosing), FALSE);
+ value = gtk_entry_new ();
gnc_option_set_widget (option, value);
- gnc_option_set_ui_value(option, FALSE);
+ gnc_option_set_ui_value (option, FALSE);
if (gtk_widget_get_direction (GTK_WIDGET(value)) == GTK_TEXT_DIR_RTL)
gtk_entry_set_alignment (GTK_ENTRY(value), 1.0);
- g_signal_connect(G_OBJECT(value), "changed",
- G_CALLBACK(gnc_option_changed_widget_cb), option);
+ g_signal_connect (G_OBJECT(value), "changed",
+ G_CALLBACK(gnc_option_changed_widget_cb), option);
- gtk_box_pack_start(GTK_BOX(*enclosing), value, TRUE, TRUE, 0);
- gtk_widget_show_all(*enclosing);
+ gtk_box_pack_start (GTK_BOX(*enclosing), value, TRUE, TRUE, 0);
+ gtk_widget_show_all (*enclosing);
return value;
}
@@ -2530,33 +2512,33 @@ gnc_option_set_ui_widget_text (GNCOption *option, GtkGrid *page_box,
gnc_option_set_ui_label_alignment (name_label);
- scroll = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
- GTK_POLICY_NEVER,
- GTK_POLICY_AUTOMATIC);
- gtk_container_set_border_width(GTK_CONTAINER(scroll), 2);
+ scroll = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(scroll),
+ GTK_POLICY_NEVER,
+ GTK_POLICY_AUTOMATIC);
+ gtk_container_set_border_width (GTK_CONTAINER(scroll), 2);
- gtk_container_add(GTK_CONTAINER(frame), scroll);
+ gtk_container_add (GTK_CONTAINER(frame), scroll);
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
gtk_widget_set_vexpand (GTK_WIDGET(*enclosing), TRUE);
gtk_widget_set_hexpand (GTK_WIDGET(*enclosing), TRUE);
gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
- value = gtk_text_view_new();
- gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(value), GTK_WRAP_WORD);
- gtk_text_view_set_editable(GTK_TEXT_VIEW(value), TRUE);
+ value = gtk_text_view_new ();
+ gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW(value), GTK_WRAP_WORD);
+ gtk_text_view_set_editable (GTK_TEXT_VIEW(value), TRUE);
gtk_text_view_set_accepts_tab (GTK_TEXT_VIEW(value), FALSE);
- gtk_container_add (GTK_CONTAINER (scroll), value);
+ gtk_container_add (GTK_CONTAINER(scroll), value);
gnc_option_set_widget (option, value);
- gnc_option_set_ui_value(option, FALSE);
+ gnc_option_set_ui_value (option, FALSE);
- text_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(value));
- g_signal_connect(G_OBJECT(text_buffer), "changed",
- G_CALLBACK(gnc_option_changed_option_cb), option);
+ text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(value));
+ g_signal_connect (G_OBJECT(text_buffer), "changed",
+ G_CALLBACK(gnc_option_changed_option_cb), option);
- gtk_box_pack_start(GTK_BOX(*enclosing), frame, TRUE, TRUE, 0);
- gtk_widget_show_all(*enclosing);
+ gtk_box_pack_start (GTK_BOX(*enclosing), frame, TRUE, TRUE, 0);
+ gtk_widget_show_all (*enclosing);
return value;
}
@@ -2569,17 +2551,17 @@ gnc_option_set_ui_widget_currency (GNCOption *option, GtkGrid *page_box,
GtkWidget *value;
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
- value = gnc_currency_edit_new();
+ gtk_box_set_homogeneous (GTK_BOX(*enclosing), FALSE);
+ value = gnc_currency_edit_new ();
gnc_option_set_widget (option, value);
- gnc_option_set_ui_value(option, FALSE);
+ gnc_option_set_ui_value (option, FALSE);
- g_signal_connect(G_OBJECT(value), "changed",
- G_CALLBACK(gnc_option_changed_widget_cb), option);
+ g_signal_connect (G_OBJECT(value), "changed",
+ G_CALLBACK(gnc_option_changed_widget_cb), option);
- gtk_box_pack_start(GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
- gtk_widget_show_all(*enclosing);
+ gtk_box_pack_start (GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
+ gtk_widget_show_all (*enclosing);
return value;
}
@@ -2592,24 +2574,24 @@ gnc_option_set_ui_widget_commodity (GNCOption *option, GtkGrid *page_box,
GtkWidget *value;
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
- value = gnc_general_select_new(GNC_GENERAL_SELECT_TYPE_SELECT,
- gnc_commodity_edit_get_string,
- gnc_commodity_edit_new_select,
- NULL);
+ gtk_box_set_homogeneous (GTK_BOX(*enclosing), FALSE);
+ value = gnc_general_select_new (GNC_GENERAL_SELECT_TYPE_SELECT,
+ gnc_commodity_edit_get_string,
+ gnc_commodity_edit_new_select,
+ NULL);
gnc_option_set_widget (option, value);
- gnc_option_set_ui_value(option, FALSE);
+ gnc_option_set_ui_value (option, FALSE);
if (documentation != NULL)
- gtk_widget_set_tooltip_text(GNC_GENERAL_SELECT(value)->entry,
- documentation);
+ gtk_widget_set_tooltip_text (GNC_GENERAL_SELECT(value)->entry,
+ documentation);
- g_signal_connect(G_OBJECT(GNC_GENERAL_SELECT(value)->entry), "changed",
- G_CALLBACK(gnc_option_changed_widget_cb), option);
+ g_signal_connect (G_OBJECT(GNC_GENERAL_SELECT(value)->entry), "changed",
+ G_CALLBACK(gnc_option_changed_widget_cb), option);
- gtk_box_pack_start(GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
- gtk_widget_show_all(*enclosing);
+ gtk_box_pack_start (GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
+ gtk_widget_show_all (*enclosing);
return value;
}
@@ -2622,14 +2604,14 @@ gnc_option_set_ui_widget_multichoice (GNCOption *option, GtkGrid *page_box,
GtkWidget *value;
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
+ gtk_box_set_homogeneous (GTK_BOX(*enclosing), FALSE);
- value = gnc_option_create_multichoice_widget(option);
+ value = gnc_option_create_multichoice_widget (option);
gnc_option_set_widget (option, value);
- gnc_option_set_ui_value(option, FALSE);
- gtk_box_pack_start(GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
- gtk_widget_show_all(*enclosing);
+ gnc_option_set_ui_value (option, FALSE);
+ gtk_box_pack_start (GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
+ gtk_widget_show_all (*enclosing);
return value;
}
@@ -2648,16 +2630,16 @@ gnc_option_set_ui_widget_date (GNCOption *option, GtkGrid *page_box,
gint grid_row = GPOINTER_TO_INT(g_object_get_data
(G_OBJECT(page_box), "options-grid-row"));
- value = gnc_option_create_date_widget(option);
+ value = gnc_option_create_date_widget (option);
gnc_option_set_widget (option, value);
- if (g_strcmp0(type, "relative") == 0)
+ if (g_strcmp0 (type, "relative") == 0)
{
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
+ gtk_box_set_homogeneous (GTK_BOX(*enclosing), FALSE);
- gtk_box_pack_start(GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
}
else
{
@@ -2672,16 +2654,16 @@ gnc_option_set_ui_widget_date (GNCOption *option, GtkGrid *page_box,
/* Pack option widget into an extra eventbox because otherwise the
"documentation" tooltip is not displayed. */
- eventbox = gtk_event_box_new();
- gtk_container_add (GTK_CONTAINER (eventbox), *enclosing);
+ eventbox = gtk_event_box_new ();
+ gtk_container_add (GTK_CONTAINER(eventbox), *enclosing);
gtk_grid_attach (GTK_GRID(page_box), eventbox, 1, grid_row, 1, 1);
*packed = TRUE;
gtk_widget_set_tooltip_text (eventbox, documentation);
- gnc_option_set_ui_value(option, FALSE);
- gtk_widget_show_all(*enclosing);
+ gnc_option_set_ui_value (option, FALSE);
+ gtk_widget_show_all (*enclosing);
return value;
}
@@ -2698,27 +2680,27 @@ gnc_option_set_ui_widget_account_list (GNCOption *option, GtkGrid *page_box,
gnc_option_set_ui_label_alignment (name_label);
- *enclosing = gnc_option_create_account_widget(option, NULL);
+ *enclosing = gnc_option_create_account_widget (option, NULL);
gtk_widget_set_vexpand (GTK_WIDGET(*enclosing), TRUE);
gtk_widget_set_hexpand (GTK_WIDGET(*enclosing), TRUE);
value = gnc_option_get_gtk_widget (option);
- gtk_widget_set_tooltip_text(*enclosing, documentation);
+ gtk_widget_set_tooltip_text (*enclosing, documentation);
gtk_grid_attach (GTK_GRID(page_box), *enclosing, 1, grid_row, 1, 1);
*packed = TRUE;
//gtk_widget_realize(value);
- gnc_option_set_ui_value(option, FALSE);
+ gnc_option_set_ui_value (option, FALSE);
- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(value));
- g_signal_connect(G_OBJECT(selection), "changed",
- G_CALLBACK(gnc_option_account_cb), option);
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(value));
+ g_signal_connect (G_OBJECT(selection), "changed",
+ G_CALLBACK(gnc_option_account_cb), option);
// gtk_clist_set_row_height(GTK_CLIST(value), 0);
// gtk_widget_set_size_request(value, -1, GTK_CLIST(value)->row_height * 10);
- gtk_widget_show_all(*enclosing);
+ gtk_widget_show_all (*enclosing);
return value;
}
@@ -2731,19 +2713,19 @@ gnc_option_set_ui_widget_account_sel (GNCOption *option, GtkGrid *page_box,
GtkWidget *value = gnc_account_sel_new ();
GList *acct_type_list = gnc_option_get_account_type_list (option);
- gnc_account_sel_set_acct_filters(GNC_ACCOUNT_SEL(value), acct_type_list, NULL);
+ gnc_account_sel_set_acct_filters (GNC_ACCOUNT_SEL(value), acct_type_list, NULL);
- g_signal_connect(value, "account_sel_changed",
- G_CALLBACK(gnc_option_changed_widget_cb), option);
+ g_signal_connect (value, "account_sel_changed",
+ G_CALLBACK(gnc_option_changed_widget_cb), option);
gnc_option_set_widget (option, value);
- gnc_option_set_ui_value(option, FALSE);
+ gnc_option_set_ui_value (option, FALSE);
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
- gtk_box_pack_start(GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
- gtk_widget_show_all(*enclosing);
+ gtk_box_set_homogeneous (GTK_BOX(*enclosing), FALSE);
+ gtk_box_pack_start (GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
+ gtk_widget_show_all (*enclosing);
return value;
}
@@ -2758,23 +2740,23 @@ gnc_option_set_ui_widget_list (GNCOption *option, GtkGrid *page_box,
gint grid_row = GPOINTER_TO_INT(g_object_get_data
(G_OBJECT(page_box), "options-grid-row"));
- *enclosing = gnc_option_create_list_widget(option, NULL);
+ *enclosing = gnc_option_create_list_widget (option, NULL);
value = gnc_option_get_gtk_widget (option);
gnc_option_set_ui_label_alignment (name_label);
/* Pack option widget into an extra eventbox because otherwise the
"documentation" tooltip is not displayed. */
- eventbox = gtk_event_box_new();
- gtk_container_add (GTK_CONTAINER (eventbox), *enclosing);
+ eventbox = gtk_event_box_new ();
+ gtk_container_add (GTK_CONTAINER(eventbox), *enclosing);
gtk_grid_attach (GTK_GRID(page_box), eventbox, 1, grid_row, 1, 1);
*packed = TRUE;
- gtk_widget_set_tooltip_text(eventbox, documentation);
+ gtk_widget_set_tooltip_text (eventbox, documentation);
- gnc_option_set_ui_value(option, FALSE);
- gtk_widget_show(*enclosing);
+ gnc_option_set_ui_value (option, FALSE);
+ gtk_widget_show (*enclosing);
return value;
}
@@ -2792,16 +2774,16 @@ gnc_option_set_ui_widget_number_range (GNCOption *option, GtkGrid *page_box,
int num_decimals = 0;
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
+ gtk_box_set_homogeneous (GTK_BOX(*enclosing), FALSE);
- gnc_option_get_range_info(option, &lower_bound, &upper_bound,
- &num_decimals, &step_size);
- adj = GTK_ADJUSTMENT(gtk_adjustment_new(lower_bound, lower_bound,
- upper_bound, step_size,
- step_size * 5.0,
- 0));
- value = gtk_spin_button_new(adj, step_size, num_decimals);
- gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(value), TRUE);
+ gnc_option_get_range_info (option, &lower_bound, &upper_bound,
+ &num_decimals, &step_size);
+ adj = GTK_ADJUSTMENT(gtk_adjustment_new (lower_bound, lower_bound,
+ upper_bound, step_size,
+ step_size * 5.0,
+ 0));
+ value = gtk_spin_button_new (adj, step_size, num_decimals);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON(value), TRUE);
{
gdouble biggest;
@@ -2822,17 +2804,17 @@ gnc_option_set_ui_widget_number_range (GNCOption *option, GtkGrid *page_box,
num_digits += num_decimals;
- gtk_entry_set_width_chars(GTK_ENTRY(value), num_digits);
+ gtk_entry_set_width_chars (GTK_ENTRY(value), num_digits);
}
gnc_option_set_widget (option, value);
- gnc_option_set_ui_value(option, FALSE);
+ gnc_option_set_ui_value (option, FALSE);
- g_signal_connect(G_OBJECT(value), "changed",
- G_CALLBACK(gnc_option_changed_widget_cb), option);
+ g_signal_connect (G_OBJECT(value), "changed",
+ G_CALLBACK(gnc_option_changed_widget_cb), option);
- gtk_box_pack_start(GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
- gtk_widget_show_all(*enclosing);
+ gtk_box_pack_start (GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
+ gtk_widget_show_all (*enclosing);
return value;
}
@@ -2846,21 +2828,21 @@ gnc_option_set_ui_widget_color (GNCOption *option, GtkGrid *page_box,
gboolean use_alpha;
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
+ gtk_box_set_homogeneous (GTK_BOX(*enclosing), FALSE);
- use_alpha = gnc_option_use_alpha(option);
+ use_alpha = gnc_option_use_alpha (option);
- value = gtk_color_button_new();
- gtk_color_chooser_set_use_alpha(GTK_COLOR_CHOOSER(value), use_alpha);
+ value = gtk_color_button_new ();
+ gtk_color_chooser_set_use_alpha (GTK_COLOR_CHOOSER(value), use_alpha);
gnc_option_set_widget (option, value);
- gnc_option_set_ui_value(option, FALSE);
+ gnc_option_set_ui_value (option, FALSE);
- g_signal_connect(G_OBJECT(value), "color-set",
- G_CALLBACK(gnc_option_color_changed_cb), option);
+ g_signal_connect (G_OBJECT(value), "color-set",
+ G_CALLBACK(gnc_option_color_changed_cb), option);
- gtk_box_pack_start(GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
- gtk_widget_show_all(*enclosing);
+ gtk_box_pack_start (GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
+ gtk_widget_show_all (*enclosing);
return value;
}
@@ -2873,23 +2855,23 @@ gnc_option_set_ui_widget_font (GNCOption *option, GtkGrid *page_box,
GtkWidget *value;
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
- value = gtk_font_button_new();
- g_object_set(G_OBJECT(value),
- "use-font", TRUE,
- "show-style", TRUE,
- "show-size", TRUE,
- (char *)NULL);
+ gtk_box_set_homogeneous (GTK_BOX(*enclosing), FALSE);
+ value = gtk_font_button_new ();
+ g_object_set (G_OBJECT(value),
+ "use-font", TRUE,
+ "show-style", TRUE,
+ "show-size", TRUE,
+ (char *)NULL);
gnc_option_set_widget (option, value);
- gnc_option_set_ui_value(option, FALSE);
+ gnc_option_set_ui_value (option, FALSE);
- g_signal_connect(G_OBJECT(value), "font-set",
- G_CALLBACK(gnc_option_font_changed_cb), option);
+ g_signal_connect (G_OBJECT(value), "font-set",
+ G_CALLBACK(gnc_option_font_changed_cb), option);
- gtk_box_pack_start(GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
- gtk_widget_show_all(*enclosing);
+ gtk_box_pack_start (GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
+ gtk_widget_show_all (*enclosing);
return value;
}
@@ -2903,35 +2885,35 @@ gnc_option_set_ui_widget_pixmap (GNCOption *option, GtkGrid *page_box,
GtkWidget *button;
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
-
- button = gtk_button_new_with_label(_("Clear"));
- gtk_widget_set_tooltip_text(button, _("Clear any selected image file."));
-
- value = gtk_file_chooser_button_new(_("Select image"),
- GTK_FILE_CHOOSER_ACTION_OPEN);
- gtk_widget_set_tooltip_text(value, _("Select an image file."));
- g_object_set(G_OBJECT(value),
- "width-chars", 30,
- "preview-widget", gtk_image_new(),
- (char *)NULL);
- g_signal_connect(G_OBJECT (value), "selection-changed",
- G_CALLBACK(gnc_option_changed_widget_cb), option);
- g_signal_connect(G_OBJECT (value), "selection-changed",
- G_CALLBACK(gnc_image_option_selection_changed_cb), option);
- g_signal_connect(G_OBJECT (value), "update-preview",
- G_CALLBACK(gnc_image_option_update_preview_cb), option);
- g_signal_connect_swapped(G_OBJECT (button), "clicked",
- G_CALLBACK(gtk_file_chooser_unselect_all), value);
+ gtk_box_set_homogeneous (GTK_BOX(*enclosing), FALSE);
+
+ button = gtk_button_new_with_label (_("Clear"));
+ gtk_widget_set_tooltip_text (button, _("Clear any selected image file."));
+
+ value = gtk_file_chooser_button_new (_("Select image"),
+ GTK_FILE_CHOOSER_ACTION_OPEN);
+ gtk_widget_set_tooltip_text (value, _("Select an image file."));
+ g_object_set (G_OBJECT(value),
+ "width-chars", 30,
+ "preview-widget", gtk_image_new(),
+ (char *)NULL);
+ g_signal_connect (G_OBJECT(value), "selection-changed",
+ G_CALLBACK(gnc_option_changed_widget_cb), option);
+ g_signal_connect (G_OBJECT(value), "selection-changed",
+ G_CALLBACK(gnc_image_option_selection_changed_cb), option);
+ g_signal_connect (G_OBJECT(value), "update-preview",
+ G_CALLBACK(gnc_image_option_update_preview_cb), option);
+ g_signal_connect_swapped (G_OBJECT(button), "clicked",
+ G_CALLBACK(gtk_file_chooser_unselect_all), value);
gnc_option_set_widget (option, value);
- gnc_option_set_ui_value(option, FALSE);
+ gnc_option_set_ui_value (option, FALSE);
- gtk_box_pack_start(GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(*enclosing), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(*enclosing), button, FALSE, FALSE, 0);
- gtk_widget_show(value);
- gtk_widget_show(*enclosing);
+ gtk_widget_show (value);
+ gtk_widget_show (*enclosing);
return value;
}
@@ -2945,16 +2927,16 @@ gnc_option_set_ui_widget_radiobutton (GNCOption *option, GtkGrid *page_box,
GtkWidget *value;
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
+ gtk_box_set_homogeneous (GTK_BOX(*enclosing), FALSE);
gnc_option_set_ui_label_alignment (name_label);
- value = gnc_option_create_radiobutton_widget(NULL, option);
+ value = gnc_option_create_radiobutton_widget (NULL, option);
gnc_option_set_widget (option, value);
- gnc_option_set_ui_value(option, FALSE);
- gtk_box_pack_start(GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
- gtk_widget_show_all(*enclosing);
+ gnc_option_set_ui_value (option, FALSE);
+ gtk_box_pack_start (GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
+ gtk_widget_show_all (*enclosing);
return value;
}
@@ -2969,15 +2951,15 @@ gnc_option_set_ui_widget_dateformat (GNCOption *option, GtkGrid *page_box,
gnc_option_set_ui_label_alignment (name_label);
- gnc_option_set_ui_value(option, FALSE);
- g_signal_connect(G_OBJECT(*enclosing), "format_changed",
- G_CALLBACK(gnc_option_changed_option_cb), option);
- gtk_widget_show_all(*enclosing);
+ gnc_option_set_ui_value (option, FALSE);
+ g_signal_connect (G_OBJECT(*enclosing), "format_changed",
+ G_CALLBACK(gnc_option_changed_option_cb), option);
+ gtk_widget_show_all (*enclosing);
return *enclosing;
}
static void
-gnc_plot_size_option_set_select_method(GNCOption *option, gboolean set_buttons)
+gnc_plot_size_option_set_select_method (GNCOption *option, gboolean set_buttons)
{
GList* widget_list;
GtkWidget *px_widget, *p_widget;
@@ -2985,43 +2967,42 @@ gnc_plot_size_option_set_select_method(GNCOption *option, gboolean set_buttons)
widget = gnc_option_get_gtk_widget (option);
- widget_list = gtk_container_get_children(GTK_CONTAINER(widget));
+ widget_list = gtk_container_get_children (GTK_CONTAINER(widget));
// px_button item 0
- px_widget = g_list_nth_data(widget_list, 1);
+ px_widget = g_list_nth_data (widget_list, 1);
// p_button item 2
- p_widget = g_list_nth_data(widget_list, 3);
- g_list_free(widget_list);
+ p_widget = g_list_nth_data (widget_list, 3);
+ g_list_free (widget_list);
if (set_buttons)
{
- gtk_widget_set_sensitive(px_widget, TRUE);
- gtk_widget_set_sensitive(p_widget, FALSE);
+ gtk_widget_set_sensitive (px_widget, TRUE);
+ gtk_widget_set_sensitive (p_widget, FALSE);
}
else
{
- gtk_widget_set_sensitive(p_widget, TRUE);
- gtk_widget_set_sensitive(px_widget, FALSE);
+ gtk_widget_set_sensitive (p_widget, TRUE);
+ gtk_widget_set_sensitive (px_widget, FALSE);
}
}
static void
-gnc_rd_option_px_set_cb(GtkWidget *widget, gpointer *raw_option)
+gnc_rd_option_px_set_cb (GtkWidget *widget, gpointer *raw_option)
{
GNCOption *option = (GNCOption *) raw_option;
- gnc_plot_size_option_set_select_method(option, TRUE);
- gnc_option_changed_option_cb(widget, option);
+ gnc_plot_size_option_set_select_method (option, TRUE);
+ gnc_option_changed_option_cb (widget, option);
}
static void
-gnc_rd_option_p_set_cb(GtkWidget *widget, gpointer *raw_option)
+gnc_rd_option_p_set_cb (GtkWidget *widget, gpointer *raw_option)
{
GNCOption *option = (GNCOption *) raw_option;
- gnc_plot_size_option_set_select_method(option, FALSE);
- gnc_option_changed_option_cb(widget, option);
+ gnc_plot_size_option_set_select_method (option, FALSE);
+ gnc_option_changed_option_cb (widget, option);
return;
}
-
static GtkWidget *
gnc_option_set_ui_widget_plot_size (GNCOption *option, GtkGrid *page_box,
GtkLabel *name_label, char *documentation,
@@ -3037,24 +3018,24 @@ gnc_option_set_ui_widget_plot_size (GNCOption *option, GtkGrid *page_box,
gdouble step_size = 1.0;
int num_decimals = 0;
- *enclosing = gtk_frame_new(NULL);
+ *enclosing = gtk_frame_new (NULL);
gtk_widget_set_halign (GTK_WIDGET(*enclosing), GTK_ALIGN_START);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE);
+ gtk_box_set_homogeneous (GTK_BOX(hbox), FALSE);
g_object_set (G_OBJECT(hbox), "margin", 3, NULL);
- gtk_container_add(GTK_CONTAINER(*enclosing), hbox);
+ gtk_container_add (GTK_CONTAINER(*enclosing), hbox);
- gnc_option_get_range_info(option, &lower_bound, &upper_bound,
- &num_decimals, &step_size);
- adj_px = GTK_ADJUSTMENT(gtk_adjustment_new(lower_bound, lower_bound,
- upper_bound, step_size,
- step_size * 5.0,
- 0));
+ gnc_option_get_range_info (option, &lower_bound, &upper_bound,
+ &num_decimals, &step_size);
+ adj_px = GTK_ADJUSTMENT(gtk_adjustment_new (lower_bound, lower_bound,
+ upper_bound, step_size,
+ step_size * 5.0,
+ 0));
- value_px = gtk_spin_button_new(adj_px, step_size, num_decimals);
- gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(value_px), TRUE);
+ value_px = gtk_spin_button_new (adj_px, step_size, num_decimals);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON(value_px), TRUE);
{
gdouble biggest;
@@ -3075,41 +3056,41 @@ gnc_option_set_ui_widget_plot_size (GNCOption *option, GtkGrid *page_box,
num_digits += num_decimals;
- gtk_entry_set_width_chars(GTK_ENTRY(value_px), num_digits);
+ gtk_entry_set_width_chars (GTK_ENTRY(value_px), num_digits);
}
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(value_px), (upper_bound / 2)); //default
- g_signal_connect(G_OBJECT(value_px), "changed",
- G_CALLBACK(gnc_option_changed_widget_cb), option);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON(value_px), (upper_bound / 2)); //default
+ g_signal_connect (G_OBJECT(value_px), "changed",
+ G_CALLBACK(gnc_option_changed_widget_cb), option);
- adj_percent = GTK_ADJUSTMENT(gtk_adjustment_new(1, 10, 100, 1, 5.0, 0));
- value_percent = gtk_spin_button_new(adj_percent, 1, 0);
- gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(value_percent), TRUE);
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(value_percent), 100); //default
- gtk_entry_set_width_chars(GTK_ENTRY(value_percent), 3);
- gtk_widget_set_sensitive(value_percent, FALSE);
+ adj_percent = GTK_ADJUSTMENT(gtk_adjustment_new (1, 10, 100, 1, 5.0, 0));
+ value_percent = gtk_spin_button_new (adj_percent, 1, 0);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON(value_percent), TRUE);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON(value_percent), 100); //default
+ gtk_entry_set_width_chars (GTK_ENTRY(value_percent), 3);
+ gtk_widget_set_sensitive (value_percent, FALSE);
- g_signal_connect(G_OBJECT(value_percent), "changed",
- G_CALLBACK(gnc_option_changed_widget_cb), option);
+ g_signal_connect (G_OBJECT(value_percent), "changed",
+ G_CALLBACK(gnc_option_changed_widget_cb), option);
- px_butt = gtk_radio_button_new_with_label(NULL, _("Pixels"));
+ px_butt = gtk_radio_button_new_with_label (NULL, _("Pixels"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(px_butt), TRUE);
- g_signal_connect(G_OBJECT(px_butt), "toggled",
- G_CALLBACK(gnc_rd_option_px_set_cb), option);
+ g_signal_connect (G_OBJECT(px_butt), "toggled",
+ G_CALLBACK(gnc_rd_option_px_set_cb), option);
- p_butt = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(px_butt), _("Percent"));
- g_signal_connect(G_OBJECT(p_butt), "toggled",
- G_CALLBACK(gnc_rd_option_p_set_cb), option);
+ p_butt = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON(px_butt), _("Percent"));
+ g_signal_connect (G_OBJECT(p_butt), "toggled",
+ G_CALLBACK(gnc_rd_option_p_set_cb), option);
- gtk_box_pack_start(GTK_BOX(hbox), px_butt, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(hbox), value_px, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(hbox), p_butt, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(hbox), value_percent, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(hbox), px_butt, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(hbox), value_px, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(hbox), p_butt, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(hbox), value_percent, FALSE, FALSE, 0);
gnc_option_set_widget (option, hbox);
gnc_option_set_ui_value (option, FALSE);
- gtk_widget_show_all(*enclosing);
+ gtk_widget_show_all (*enclosing);
return hbox;
}
@@ -3123,19 +3104,19 @@ gnc_option_set_ui_widget_budget (GNCOption *option, GtkGrid *page_box,
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
+ gtk_box_set_homogeneous (GTK_BOX(*enclosing), FALSE);
- value = gnc_option_create_budget_widget(option);
+ value = gnc_option_create_budget_widget (option);
gnc_option_set_widget (option, value);
- gnc_option_set_ui_value(option, FALSE);
+ gnc_option_set_ui_value (option, FALSE);
/* Maybe connect destroy handler for tree model here? */
- g_signal_connect(G_OBJECT(value), "changed",
- G_CALLBACK(gnc_option_changed_widget_cb), option);
+ g_signal_connect (G_OBJECT(value), "changed",
+ G_CALLBACK(gnc_option_changed_widget_cb), option);
- gtk_box_pack_start(GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
- gtk_widget_show_all(*enclosing);
+ gtk_box_pack_start (GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
+ gtk_widget_show_all (*enclosing);
return value;
}
@@ -3150,14 +3131,14 @@ gnc_option_set_ui_widget_currency_accounting (GNCOption *option,
GtkWidget *value;
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
+ gtk_box_set_homogeneous (GTK_BOX(*enclosing), FALSE);
- value = gnc_option_create_currency_accounting_widget(NULL, option);
+ value = gnc_option_create_currency_accounting_widget (NULL, option);
gnc_option_set_widget (option, value);
- gnc_option_set_ui_value(option, FALSE);
- gtk_box_pack_start(GTK_BOX(*enclosing), value, TRUE, TRUE, 0);
- gtk_widget_show_all(*enclosing);
+ gnc_option_set_ui_value (option, FALSE);
+ gtk_box_pack_start (GTK_BOX(*enclosing), value, TRUE, TRUE, 0);
+ gtk_widget_show_all (*enclosing);
return value;
}
@@ -3177,10 +3158,10 @@ static gboolean
gnc_option_set_ui_value_boolean (GNCOption *option, gboolean use_default,
GtkWidget *widget, SCM value)
{
- if (scm_is_bool(value))
+ if (scm_is_bool (value))
{
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget),
- scm_is_true(value));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(widget),
+ scm_is_true(value));
return FALSE;
}
else
@@ -3191,12 +3172,12 @@ static gboolean
gnc_option_set_ui_value_string (GNCOption *option, gboolean use_default,
GtkWidget *widget, SCM value)
{
- if (scm_is_string(value))
+ if (scm_is_string (value))
{
const gchar *string;
string = gnc_scm_to_utf8_string (value);
- gtk_entry_set_text(GTK_ENTRY(widget), string);
+ gtk_entry_set_text (GTK_ENTRY(widget), string);
g_free ((gpointer *) string);
return FALSE;
}
@@ -3213,9 +3194,9 @@ gnc_option_set_ui_value_text (GNCOption *option, gboolean use_default,
if (GTK_IS_TEXT_BUFFER(object))
buffer = GTK_TEXT_BUFFER(object);
else
- buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(object));
+ buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(object));
- if (scm_is_string(value))
+ if (scm_is_string (value))
{
const gchar *string;
@@ -3237,7 +3218,7 @@ gnc_option_set_ui_value_currency (GNCOption *option, gboolean use_default,
commodity = gnc_scm_to_commodity (value);
if (commodity)
{
- gnc_currency_edit_set_currency(GNC_CURRENCY_EDIT(widget), commodity);
+ gnc_currency_edit_set_currency (GNC_CURRENCY_EDIT(widget), commodity);
return FALSE;
}
else
@@ -3253,7 +3234,7 @@ gnc_option_set_ui_value_commodity (GNCOption *option, gboolean use_default,
commodity = gnc_scm_to_commodity (value);
if (commodity)
{
- gnc_general_select_set_selected(GNC_GENERAL_SELECT (widget), commodity);
+ gnc_general_select_set_selected (GNC_GENERAL_SELECT(widget), commodity);
return FALSE;
}
else
@@ -3266,13 +3247,13 @@ gnc_option_set_ui_value_multichoice (GNCOption *option, gboolean use_default,
{
int index;
- index = gnc_option_permissible_value_index(option, value);
+ index = gnc_option_permissible_value_index (option, value);
if (index < 0)
return TRUE;
else
{
/* GtkComboBox per-item tooltip changes needed below */
- gnc_combott_set_active(GNC_COMBOTT(widget), index);
+ gnc_combott_set_active (GNC_COMBOTT(widget), index);
return FALSE;
}
}
@@ -3286,84 +3267,76 @@ gnc_option_set_ui_value_date (GNCOption *option, gboolean use_default,
char *symbol_str;
gboolean bad_value = FALSE;
- date_option_type = gnc_option_date_option_get_subtype(option);
+ date_option_type = gnc_option_date_option_get_subtype (option);
- if (scm_is_pair(value))
+ if (scm_is_pair (value))
{
symbol_str = gnc_date_option_value_get_type (value);
if (symbol_str)
{
- if (g_strcmp0(symbol_str, "relative") == 0)
+ if (g_strcmp0 (symbol_str, "relative") == 0)
{
SCM relative = gnc_date_option_value_get_relative (value);
- index = gnc_option_permissible_value_index(option, relative);
- if (g_strcmp0(date_option_type, "relative") == 0)
+ index = gnc_option_permissible_value_index (option, relative);
+ if (g_strcmp0 (date_option_type, "relative") == 0)
{
/* GtkComboBox per-item tooltip changes needed below */
- gnc_combott_set_active(GNC_COMBOTT(widget), index);
+ gnc_combott_set_active (GNC_COMBOTT(widget), index);
}
- else if (g_strcmp0(date_option_type, "both") == 0)
+ else if (g_strcmp0 (date_option_type, "both") == 0)
{
GList *widget_list;
GtkWidget *rel_date_widget;
- widget_list = gtk_container_get_children(GTK_CONTAINER(widget));
- rel_date_widget = g_list_nth_data(widget_list,
- GNC_RD_WID_REL_WIDGET_POS);
- g_list_free(widget_list);
- gnc_date_option_set_select_method(option, FALSE, TRUE);
+ widget_list = gtk_container_get_children (GTK_CONTAINER(widget));
+ rel_date_widget = g_list_nth_data (widget_list,
+ GNC_RD_WID_REL_WIDGET_POS);
+ g_list_free (widget_list);
+ gnc_date_option_set_select_method (option, FALSE, TRUE);
/* GtkComboBox per-item tooltip changes needed below */
- gnc_combott_set_active(GNC_COMBOTT(rel_date_widget), index);
+ gnc_combott_set_active (GNC_COMBOTT(rel_date_widget), index);
}
else
- {
bad_value = TRUE;
- }
}
- else if (g_strcmp0(symbol_str, "absolute") == 0)
+ else if (g_strcmp0 (symbol_str, "absolute") == 0)
{
time64 time;
time = gnc_date_option_value_get_absolute (value);
- if (g_strcmp0(date_option_type, "absolute") == 0)
+ if (g_strcmp0 (date_option_type, "absolute") == 0)
{
- gnc_date_edit_set_time(GNC_DATE_EDIT(widget), time);
+ gnc_date_edit_set_time (GNC_DATE_EDIT(widget), time);
}
- else if (g_strcmp0(date_option_type, "both") == 0)
+ else if (g_strcmp0 (date_option_type, "both") == 0)
{
GList *widget_list;
GtkWidget *ab_widget;
- widget_list = gtk_container_get_children(GTK_CONTAINER(widget));
- ab_widget = g_list_nth_data(widget_list,
- GNC_RD_WID_AB_WIDGET_POS);
- g_list_free(widget_list);
- gnc_date_option_set_select_method(option, TRUE, TRUE);
- gnc_date_edit_set_time(GNC_DATE_EDIT(ab_widget), time);
+ widget_list = gtk_container_get_children (GTK_CONTAINER(widget));
+ ab_widget = g_list_nth_data (widget_list,
+ GNC_RD_WID_AB_WIDGET_POS);
+ g_list_free (widget_list);
+ gnc_date_option_set_select_method (option, TRUE, TRUE);
+ gnc_date_edit_set_time (GNC_DATE_EDIT(ab_widget), time);
}
else
- {
bad_value = TRUE;
- }
}
else
- {
bad_value = TRUE;
- }
if (symbol_str)
- free(symbol_str);
+ free (symbol_str);
}
}
else
- {
bad_value = TRUE;
- }
if (date_option_type)
- free(date_option_type);
+ free (date_option_type);
return bad_value;
}
@@ -3374,12 +3347,11 @@ gnc_option_set_ui_value_account_list (GNCOption *option, gboolean use_default,
{
GList *list;
- list = gnc_scm_list_to_glist(value);
+ list = gnc_scm_list_to_glist (value);
gnc_tree_view_account_set_selected_accounts (GNC_TREE_VIEW_ACCOUNT(widget),
- list, TRUE);
-
- g_list_free(list);
+ list, TRUE);
+ g_list_free (list);
return FALSE;
}
@@ -3391,11 +3363,11 @@ gnc_option_set_ui_value_account_sel (GNCOption *option, gboolean use_default,
if (value != SCM_BOOL_F)
{
- if (!SWIG_IsPointer(value))
- scm_misc_error("gnc_option_set_ui_value_account_sel",
- "Option Value not a wcp.", value);
+ if (!SWIG_IsPointer (value))
+ scm_misc_error ("gnc_option_set_ui_value_account_sel",
+ "Option Value not a wcp.", value);
- acc = SWIG_MustGetPtr(value, SWIG_TypeQuery("_p_Account"), 4, 0);
+ acc = SWIG_MustGetPtr (value, SWIG_TypeQuery ("_p_Account"), 4, 0);
}
//doesn't default because this function is called to set a specific account
@@ -3412,28 +3384,28 @@ gnc_option_set_ui_value_list (GNCOption *option, gboolean use_default,
GtkTreePath *path;
gint row;
- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget));
- gtk_tree_selection_unselect_all(selection);
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(widget));
+ gtk_tree_selection_unselect_all (selection);
- while (scm_is_list(value) && !scm_is_null(value))
+ while (scm_is_list (value) && !scm_is_null (value))
{
SCM item;
item = SCM_CAR(value);
value = SCM_CDR(value);
- row = gnc_option_permissible_value_index(option, item);
+ row = gnc_option_permissible_value_index (option, item);
if (row < 0)
{
return TRUE;
}
- path = gtk_tree_path_new_from_indices(row, -1);
- gtk_tree_selection_select_path(selection, path);
- gtk_tree_path_free(path);
+ path = gtk_tree_path_new_from_indices (row, -1);
+ gtk_tree_selection_select_path (selection, path);
+ gtk_tree_path_free (path);
}
- if (!scm_is_list(value) || !scm_is_null(value))
+ if (!scm_is_list (value) || !scm_is_null (value))
return TRUE;
return FALSE;
@@ -3448,10 +3420,10 @@ gnc_option_set_ui_value_number_range (GNCOption *option, gboolean use_default,
spinner = GTK_SPIN_BUTTON(widget);
- if (scm_is_number(value))
+ if (scm_is_number (value))
{
- d_value = scm_to_double(value);
- gtk_spin_button_set_value(spinner, d_value);
+ d_value = scm_to_double (value);
+ gtk_spin_button_set_value (spinner, d_value);
return FALSE;
}
else
@@ -3464,9 +3436,9 @@ gnc_option_set_ui_value_color (GNCOption *option, gboolean use_default,
{
GdkRGBA color;
- if (gnc_option_get_color_info(option, use_default,
- &color.red, &color.green,
- &color.blue, &color.alpha))
+ if (gnc_option_get_color_info (option, use_default,
+ &color.red, &color.green,
+ &color.blue, &color.alpha))
{
GtkColorChooser *color_button;
@@ -3474,7 +3446,7 @@ gnc_option_set_ui_value_color (GNCOption *option, gboolean use_default,
color.red, color.green, color.blue, color.alpha);
color_button = GTK_COLOR_CHOOSER(widget);
- gtk_color_chooser_set_rgba(color_button, &color);
+ gtk_color_chooser_set_rgba (color_button, &color);
return FALSE;
}
@@ -3486,7 +3458,7 @@ static gboolean
gnc_option_set_ui_value_font (GNCOption *option, gboolean use_default,
GtkWidget *widget, SCM value)
{
- if (scm_is_string(value))
+ if (scm_is_string (value))
{
const gchar *string;
@@ -3494,7 +3466,7 @@ gnc_option_set_ui_value_font (GNCOption *option, gboolean use_default,
if ((string != NULL) && (*string != '\0'))
{
GtkFontButton *font_button = GTK_FONT_BUTTON(widget);
- gtk_font_button_set_font_name(font_button, string);
+ gtk_font_button_set_font_name (font_button, string);
}
g_free ((gpointer *) string);
return FALSE;
@@ -3507,8 +3479,8 @@ static gboolean
gnc_option_set_ui_value_pixmap (GNCOption *option, gboolean use_default,
GtkWidget *widget, SCM value)
{
- ENTER("option %p(%s)", option, gnc_option_name(option));
- if (scm_is_string(value))
+ ENTER("option %p(%s)", option, gnc_option_name (option));
+ if (scm_is_string (value))
{
const gchar *string;
@@ -3517,12 +3489,12 @@ gnc_option_set_ui_value_pixmap (GNCOption *option, gboolean use_default,
{
gchar *test;
DEBUG("string = %s", string);
- gtk_file_chooser_select_filename(GTK_FILE_CHOOSER(widget), string);
- test = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
- g_object_set_data_full(G_OBJECT(widget), LAST_SELECTION,
- g_strdup(string), g_free);
+ gtk_file_chooser_select_filename (GTK_FILE_CHOOSER(widget), string);
+ test = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(widget));
+ g_object_set_data_full (G_OBJECT(widget), LAST_SELECTION,
+ g_strdup (string), g_free);
DEBUG("Set %s, retrieved %s", string, test ? test : "(null)");
- gnc_image_option_update_preview_cb(GTK_FILE_CHOOSER(widget), option);
+ gnc_image_option_update_preview_cb (GTK_FILE_CHOOSER(widget), option);
}
LEAVE("FALSE");
g_free ((gpointer *) string);
@@ -3533,30 +3505,30 @@ gnc_option_set_ui_value_pixmap (GNCOption *option, gboolean use_default,
return TRUE;
}
-static gboolean gnc_option_set_ui_value_budget(
- GNCOption *option, gboolean use_default, GtkWidget *widget, SCM value)
+static gboolean gnc_option_set_ui_value_budget (GNCOption *option,
+ gboolean use_default,
+ GtkWidget *widget,
+ SCM value)
{
GncBudget *bgt;
// if (!scm_is_null(value)) {
if (value != SCM_BOOL_F)
{
- if (!SWIG_IsPointer(value))
- scm_misc_error("gnc_option_set_ui_value_budget",
- "Option Value not a wcp.", value);
+ if (!SWIG_IsPointer (value))
+ scm_misc_error ("gnc_option_set_ui_value_budget",
+ "Option Value not a wcp.", value);
- bgt = SWIG_MustGetPtr(value, SWIG_TypeQuery("GncBudget *"), 4, 0);
+ bgt = SWIG_MustGetPtr (value, SWIG_TypeQuery ("GncBudget *"), 4, 0);
if (bgt)
{
GtkComboBox *cb = GTK_COMBO_BOX(widget);
- GtkTreeModel *tm = gtk_combo_box_get_model(cb);
+ GtkTreeModel *tm = gtk_combo_box_get_model (cb);
GtkTreeIter iter;
- if (gnc_tree_model_budget_get_iter_for_budget(tm, &iter, bgt))
- gtk_combo_box_set_active_iter(cb, &iter);
+ if (gnc_tree_model_budget_get_iter_for_budget (tm, &iter, bgt))
+ gtk_combo_box_set_active_iter (cb, &iter);
}
}
-
-
//FIXME: Unimplemented.
return FALSE;
}
@@ -3567,7 +3539,7 @@ gnc_option_set_ui_value_radiobutton (GNCOption *option, gboolean use_default,
{
int index;
- index = gnc_option_permissible_value_index(option, value);
+ index = gnc_option_permissible_value_index (option, value);
if (index < 0)
return TRUE;
else
@@ -3577,21 +3549,21 @@ gnc_option_set_ui_value_radiobutton (GNCOption *option, gboolean use_default,
int i;
gpointer val;
- list = gtk_container_get_children (GTK_CONTAINER (widget));
+ list = gtk_container_get_children (GTK_CONTAINER(widget));
box = list->data;
g_list_free(list);
- list = gtk_container_get_children (GTK_CONTAINER (box));
+ list = gtk_container_get_children (GTK_CONTAINER(box));
for (i = 0; i < index && list; i++)
list = list->next;
g_return_val_if_fail (list, TRUE);
button = list->data;
- g_list_free(list);
- val = g_object_get_data (G_OBJECT (button), "gnc_radiobutton_index");
- g_return_val_if_fail (GPOINTER_TO_INT (val) == index, TRUE);
+ g_list_free (list);
+ val = g_object_get_data (G_OBJECT(button), "gnc_radiobutton_index");
+ g_return_val_if_fail (GPOINTER_TO_INT(val) == index, TRUE);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(button), TRUE);
// g_object_set_data(G_OBJECT(widget), "gnc_radiobutton_index",
// GINT_TO_POINTER(index));
return FALSE;
@@ -3608,53 +3580,53 @@ gnc_option_set_ui_value_dateformat (GNCOption *option, gboolean use_default,
gboolean years;
char *custom;
- if (gnc_dateformat_option_value_parse(value, &format, &months, &years, &custom))
+ if (gnc_dateformat_option_value_parse (value, &format, &months, &years, &custom))
return TRUE;
- gnc_date_format_set_format(gdf, format);
- gnc_date_format_set_months(gdf, months);
- gnc_date_format_set_years(gdf, years);
- gnc_date_format_set_custom(gdf, custom);
- gnc_date_format_refresh(gdf);
+ gnc_date_format_set_format (gdf, format);
+ gnc_date_format_set_months (gdf, months);
+ gnc_date_format_set_years (gdf, years);
+ gnc_date_format_set_custom (gdf, custom);
+ gnc_date_format_refresh (gdf);
if (custom)
- free(custom);
+ free (custom);
return FALSE;
}
static gboolean
gnc_option_set_ui_value_plot_size (GNCOption *option, gboolean use_default,
- GtkWidget *widget, SCM value)
+ GtkWidget *widget, SCM value)
{
GList* widget_list;
GtkWidget *px_button, *p_button, *px_widget, *p_widget;
char *symbol_str;
gdouble d_value;
- widget_list = gtk_container_get_children(GTK_CONTAINER(widget));
- px_button = g_list_nth_data(widget_list, 0);
- px_widget = g_list_nth_data(widget_list, 1);
- p_button = g_list_nth_data(widget_list, 2);
- p_widget = g_list_nth_data(widget_list, 3);
- g_list_free(widget_list);
+ widget_list = gtk_container_get_children (GTK_CONTAINER(widget));
+ px_button = g_list_nth_data (widget_list, 0);
+ px_widget = g_list_nth_data (widget_list, 1);
+ p_button = g_list_nth_data (widget_list, 2);
+ p_widget = g_list_nth_data (widget_list, 3);
+ g_list_free (widget_list);
- if (scm_is_pair(value))
+ if (scm_is_pair (value))
{
- symbol_str = gnc_plot_size_option_value_get_type(value);
- d_value = gnc_plot_size_option_value_get_value(value);
+ symbol_str = gnc_plot_size_option_value_get_type (value);
+ d_value = gnc_plot_size_option_value_get_value (value);
if (symbol_str)
{
- if (g_strcmp0(symbol_str, "pixels") == 0) // pixel values
+ if (g_strcmp0 (symbol_str, "pixels") == 0) // pixel values
{
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(px_widget), d_value);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(px_button), TRUE);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON(px_widget), d_value);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(px_button), TRUE);
}
else // percent values
{
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(p_widget), (d_value));
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(p_button), TRUE);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON(p_widget), (d_value));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(p_button), TRUE);
}
return FALSE;
}
@@ -3667,7 +3639,7 @@ gnc_option_set_ui_value_currency_accounting (GNCOption *option,
gboolean use_default,
GtkWidget *widget, SCM value)
{
- if (scm_is_pair(value))
+ if (scm_is_pair (value))
{
SCM rb_symbol;
@@ -3677,7 +3649,7 @@ gnc_option_set_ui_value_currency_accounting (GNCOption *option,
{
int index;
- index = gnc_option_permissible_value_index(option, rb_symbol);
+ index = gnc_option_permissible_value_index (option, rb_symbol);
if (index < 0)
return TRUE;
else
@@ -3700,12 +3672,12 @@ gnc_option_set_ui_value_currency_accounting (GNCOption *option,
return TRUE;
}
- val = g_object_get_data (G_OBJECT (button),
+ val = g_object_get_data (G_OBJECT(button),
"gnc_radiobutton_index");
- g_return_val_if_fail (GPOINTER_TO_INT (val) == index, TRUE);
+ g_return_val_if_fail (GPOINTER_TO_INT(val) == index, TRUE);
- if (g_strcmp0(gnc_option_permissible_value_name(option,
- index),
+ if (g_strcmp0 (gnc_option_permissible_value_name (option,
+ index),
"Use a Book Currency") == 0)
{
gnc_commodity *commodity = NULL;
@@ -3747,7 +3719,7 @@ gnc_option_set_ui_value_currency_accounting (GNCOption *option,
NULL;
}
}
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(button), TRUE);
/* when an unselected button in a group is clicked the clicked
button receives the “toggled†signal, as does the
previously selected button; however, if the first button
@@ -3758,7 +3730,7 @@ gnc_option_set_ui_value_currency_accounting (GNCOption *option,
FALSE, explicitly call the handler here if first button */
if (index == 0)
{
- gnc_option_currency_accounting_non_book_cb(button,
+ gnc_option_currency_accounting_non_book_cb (button,
(gpointer) book_currency_data);
}
return FALSE;
@@ -3787,7 +3759,7 @@ gnc_option_get_ui_value_boolean (GNCOption *option, GtkWidget *widget)
{
gboolean active;
- active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+ active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widget));
return SCM_BOOL(active);
}
@@ -3797,9 +3769,9 @@ gnc_option_get_ui_value_string (GNCOption *option, GtkWidget *widget)
char * string;
SCM result;
- string = gtk_editable_get_chars(GTK_EDITABLE(widget), 0, -1);
- result = scm_from_utf8_string(string ? string : "");
- g_free(string);
+ string = gtk_editable_get_chars (GTK_EDITABLE(widget), 0, -1);
+ result = scm_from_utf8_string (string ? string : "");
+ g_free (string);
return result;
}
@@ -3810,8 +3782,8 @@ gnc_option_get_ui_value_text (GNCOption *option, GtkWidget *widget)
SCM result;
string = xxxgtk_textview_get_text (GTK_TEXT_VIEW(widget));
- result = scm_from_utf8_string(string ? string : "");
- g_free(string);
+ result = scm_from_utf8_string (string ? string : "");
+ g_free (string);
return result;
}
@@ -3821,7 +3793,7 @@ gnc_option_get_ui_value_currency (GNCOption *option, GtkWidget *widget)
gnc_commodity *commodity;
commodity =
- gnc_currency_edit_get_currency(GNC_CURRENCY_EDIT(widget));
+ gnc_currency_edit_get_currency (GNC_CURRENCY_EDIT(widget));
return (gnc_commodity_to_scm (commodity));
}
@@ -3832,9 +3804,9 @@ gnc_option_get_ui_value_commodity (GNCOption *option, GtkWidget *widget)
gnc_commodity *commodity;
commodity =
- gnc_general_select_get_selected(GNC_GENERAL_SELECT(widget));
+ gnc_general_select_get_selected (GNC_GENERAL_SELECT(widget));
- return (gnc_commodity_to_scm(commodity));
+ return (gnc_commodity_to_scm (commodity));
}
static SCM
@@ -3843,8 +3815,8 @@ gnc_option_get_ui_value_multichoice (GNCOption *option, GtkWidget *widget)
int index;
/* GtkComboBox per-item tooltip changes needed below */
- index = gnc_combott_get_active(GNC_COMBOTT(widget));
- return (gnc_option_permissible_value(option, index));
+ index = gnc_combott_get_active (GNC_COMBOTT(widget));
+ return (gnc_option_permissible_value (option, index));
}
static SCM
@@ -3852,24 +3824,24 @@ gnc_option_get_ui_value_date (GNCOption *option, GtkWidget *widget)
{
int index;
SCM type, val, result = SCM_UNDEFINED;
- char *subtype = gnc_option_date_option_get_subtype(option);
+ char *subtype = gnc_option_date_option_get_subtype (option);
- if (g_strcmp0(subtype, "relative") == 0)
+ if (g_strcmp0 (subtype, "relative") == 0)
{
/* GtkComboBox per-item tooltip changes needed below */
- index = gnc_combott_get_active(GNC_COMBOTT(widget));
+ index = gnc_combott_get_active (GNC_COMBOTT(widget));
type = scm_from_locale_symbol ("relative");
- val = gnc_option_permissible_value(option, index);
- result = scm_cons(type, val);
+ val = gnc_option_permissible_value (option, index);
+ result = scm_cons (type, val);
}
- else if (g_strcmp0(subtype, "absolute") == 0)
+ else if (g_strcmp0 (subtype, "absolute") == 0)
{
time64 time;
- time = gnc_date_edit_get_date(GNC_DATE_EDIT(widget));
- result = scm_cons(scm_from_locale_symbol ("absolute"), scm_from_int64(time));
+ time = gnc_date_edit_get_date (GNC_DATE_EDIT(widget));
+ result = scm_cons (scm_from_locale_symbol ("absolute"), scm_from_int64 (time));
}
- else if (g_strcmp0(subtype, "both") == 0)
+ else if (g_strcmp0 (subtype, "both") == 0)
{
time64 time;
int index;
@@ -3877,28 +3849,28 @@ gnc_option_get_ui_value_date (GNCOption *option, GtkWidget *widget)
GList *widget_list;
GtkWidget *ab_button, *rel_widget, *ab_widget;
- widget_list = gtk_container_get_children(GTK_CONTAINER(widget));
- ab_button = g_list_nth_data(widget_list, GNC_RD_WID_AB_BUTTON_POS);
- ab_widget = g_list_nth_data(widget_list, GNC_RD_WID_AB_WIDGET_POS);
- rel_widget = g_list_nth_data(widget_list, GNC_RD_WID_REL_WIDGET_POS);
- g_list_free(widget_list);
+ widget_list = gtk_container_get_children (GTK_CONTAINER(widget));
+ ab_button = g_list_nth_data (widget_list, GNC_RD_WID_AB_BUTTON_POS);
+ ab_widget = g_list_nth_data (widget_list, GNC_RD_WID_AB_WIDGET_POS);
+ rel_widget = g_list_nth_data (widget_list, GNC_RD_WID_REL_WIDGET_POS);
+ g_list_free (widget_list);
/* if it's an absolute date */
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ab_button)))
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(ab_button)))
{
- time = gnc_date_edit_get_date(GNC_DATE_EDIT(ab_widget));
- result = scm_cons(scm_from_locale_symbol ("absolute"), scm_from_int64 (time));
+ time = gnc_date_edit_get_date (GNC_DATE_EDIT(ab_widget));
+ result = scm_cons (scm_from_locale_symbol ("absolute"), scm_from_int64 (time));
}
else
{
/* GtkComboBox per-item tooltip changes needed below */
- index = gnc_combott_get_active(GNC_COMBOTT(rel_widget));
+ index = gnc_combott_get_active (GNC_COMBOTT(rel_widget));
- val = gnc_option_permissible_value(option, index);
- result = scm_cons(scm_from_locale_symbol ("relative"), val);
+ val = gnc_option_permissible_value (option, index);
+ result = scm_cons (scm_from_locale_symbol ("relative"), val);
}
}
- g_free(subtype);
+ g_free (subtype);
return result;
}
@@ -3913,8 +3885,8 @@ gnc_option_get_ui_value_account_list (GNCOption *option, GtkWidget *widget)
list = gnc_tree_view_account_get_selected_accounts (tree);
/* handover list */
- result = gnc_glist_to_scm_list(list, "_p_Account");
- g_list_free(list);
+ result = gnc_glist_to_scm_list (list, "_p_Account");
+ g_list_free (list);
return result;
}
@@ -3930,11 +3902,11 @@ gnc_option_get_ui_value_account_sel (GNCOption *option, GtkWidget *widget)
if (!acc)
return SCM_BOOL_F;
- return SWIG_NewPointerObj(acc, SWIG_TypeQuery("_p_Account"), 0);
+ return SWIG_NewPointerObj (acc, SWIG_TypeQuery ("_p_Account"), 0);
}
static SCM
-gnc_option_get_ui_value_budget(GNCOption *option, GtkWidget *widget)
+gnc_option_get_ui_value_budget (GNCOption *option, GtkWidget *widget)
{
GncBudget *bgt;
GtkComboBox *cb;
@@ -3942,14 +3914,14 @@ gnc_option_get_ui_value_budget(GNCOption *option, GtkWidget *widget)
GtkTreeIter iter;
cb = GTK_COMBO_BOX(widget);
- gtk_combo_box_get_active_iter(cb, &iter);
- tm = gtk_combo_box_get_model(cb);
- bgt = gnc_tree_model_budget_get_budget(tm, &iter);
+ gtk_combo_box_get_active_iter (cb, &iter);
+ tm = gtk_combo_box_get_model (cb);
+ bgt = gnc_tree_model_budget_get_budget (tm, &iter);
if (!bgt)
return SCM_BOOL_F;
- return SWIG_NewPointerObj(bgt, SWIG_TypeQuery("_p_budget_s"), 0);
+ return SWIG_NewPointerObj (bgt, SWIG_TypeQuery ("_p_budget_s"), 0);
}
static SCM
@@ -3962,20 +3934,19 @@ gnc_option_get_ui_value_list (GNCOption *option, GtkWidget *widget)
gint num_rows;
gint row;
- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget));
- num_rows = gnc_option_num_permissible_values(option);
- result = scm_c_eval_string("'()");
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(widget));
+ num_rows = gnc_option_num_permissible_values (option);
+ result = scm_c_eval_string ("'()");
for (row = 0; row < num_rows; row++)
{
- path = gtk_tree_path_new_from_indices(row, -1);
- selected = gtk_tree_selection_path_is_selected(selection, path);
- gtk_tree_path_free(path);
+ path = gtk_tree_path_new_from_indices (row, -1);
+ selected = gtk_tree_selection_path_is_selected (selection, path);
+ gtk_tree_path_free (path);
if (selected)
- result = scm_cons(gnc_option_permissible_value(option, row), result);
+ result = scm_cons (gnc_option_permissible_value (option, row), result);
}
-
- return (scm_reverse(result));
+ return (scm_reverse (result));
}
static SCM
@@ -3986,7 +3957,7 @@ gnc_option_get_ui_value_number_range (GNCOption *option, GtkWidget *widget)
spinner = GTK_SPIN_BUTTON(widget);
- value = gtk_spin_button_get_value(spinner);
+ value = gtk_spin_button_get_value (spinner);
return (scm_from_double (value));
}
@@ -4000,18 +3971,18 @@ gnc_option_get_ui_value_color (GNCOption *option, GtkWidget *widget)
gdouble scale;
ENTER("option %p(%s), widget %p",
- option, gnc_option_name(option), widget);
+ option, gnc_option_name (option), widget);
color_button = GTK_COLOR_CHOOSER(widget);
- gtk_color_chooser_get_rgba(color_button, &color);
+ gtk_color_chooser_get_rgba (color_button, &color);
- scale = gnc_option_color_range(option);
+ scale = gnc_option_color_range (option);
result = SCM_EOL;
- result = scm_cons(scm_from_double (color.alpha * scale), result);
- result = scm_cons(scm_from_double (color.blue * scale), result);
- result = scm_cons(scm_from_double (color.green * scale), result);
- result = scm_cons(scm_from_double (color.red * scale), result);
+ result = scm_cons (scm_from_double (color.alpha * scale), result);
+ result = scm_cons (scm_from_double (color.blue * scale), result);
+ result = scm_cons (scm_from_double (color.green * scale), result);
+ result = scm_cons (scm_from_double (color.red * scale), result);
return result;
}
@@ -4021,8 +3992,8 @@ gnc_option_get_ui_value_font (GNCOption *option, GtkWidget *widget)
GtkFontButton *font_button = GTK_FONT_BUTTON(widget);
const gchar * string;
- string = gtk_font_button_get_font_name(font_button);
- return (string ? scm_from_utf8_string(string) : SCM_BOOL_F);
+ string = gtk_font_button_get_font_name (font_button);
+ return (string ? scm_from_utf8_string (string) : SCM_BOOL_F);
}
static SCM
@@ -4031,10 +4002,10 @@ gnc_option_get_ui_value_pixmap (GNCOption *option, GtkWidget *widget)
gchar *string;
SCM result;
- string = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
+ string = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(widget));
DEBUG("filename %s", string ? string : "(null)");
- result = scm_from_utf8_string(string ? string : "");
- g_free(string);
+ result = scm_from_utf8_string (string ? string : "");
+ g_free (string);
return result;
}
@@ -4044,10 +4015,10 @@ gnc_option_get_ui_value_radiobutton (GNCOption *option, GtkWidget *widget)
gpointer _index;
int index;
- _index = g_object_get_data(G_OBJECT(widget), "gnc_radiobutton_index");
+ _index = g_object_get_data (G_OBJECT(widget), "gnc_radiobutton_index");
index = GPOINTER_TO_INT(_index);
- return (gnc_option_permissible_value(option, index));
+ return (gnc_option_permissible_value (option, index));
}
static SCM
@@ -4059,12 +4030,12 @@ gnc_option_get_ui_value_dateformat (GNCOption *option, GtkWidget *widget)
gboolean years;
const char* custom;
- format = gnc_date_format_get_format(gdf);
- months = gnc_date_format_get_months(gdf);
- years = gnc_date_format_get_years(gdf);
- custom = gnc_date_format_get_custom(gdf);
+ format = gnc_date_format_get_format (gdf);
+ months = gnc_date_format_get_months (gdf);
+ years = gnc_date_format_get_years (gdf);
+ custom = gnc_date_format_get_custom (gdf);
- return (gnc_dateformat_option_set_value(format, months, years, custom));
+ return (gnc_dateformat_option_set_value (format, months, years, custom));
}
static SCM
@@ -4075,41 +4046,41 @@ gnc_option_get_ui_value_plot_size (GNCOption *option, GtkWidget *widget)
gdouble d_value;
SCM type, val;
- widget_list = gtk_container_get_children(GTK_CONTAINER(widget));
- px_button = g_list_nth_data(widget_list, 0);
- px_widget = g_list_nth_data(widget_list, 1);
+ widget_list = gtk_container_get_children (GTK_CONTAINER(widget));
+ px_button = g_list_nth_data (widget_list, 0);
+ px_widget = g_list_nth_data (widget_list, 1);
// p_button item 2
- p_widget = g_list_nth_data(widget_list, 3);
- g_list_free(widget_list);
+ p_widget = g_list_nth_data (widget_list, 3);
+ g_list_free (widget_list);
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(px_button)))
{
- type = scm_from_locale_symbol("pixels");
- d_value = gtk_spin_button_get_value(GTK_SPIN_BUTTON(px_widget));
+ type = scm_from_locale_symbol ("pixels");
+ d_value = gtk_spin_button_get_value (GTK_SPIN_BUTTON(px_widget));
}
else
{
- type = scm_from_locale_symbol("percent");
- d_value = gtk_spin_button_get_value(GTK_SPIN_BUTTON(p_widget));
+ type = scm_from_locale_symbol ("percent");
+ d_value = gtk_spin_button_get_value (GTK_SPIN_BUTTON(p_widget));
}
- val = scm_from_double(d_value);
- return scm_cons(type, val);
+ val = scm_from_double (d_value);
+ return scm_cons (type, val);
}
static SCM
-gnc_option_get_ui_value_currency_accounting (
- GNCOption *option, GtkWidget *widget)
+gnc_option_get_ui_value_currency_accounting (GNCOption *option,
+ GtkWidget *widget)
{
gpointer _index;
int index;
SCM value = SCM_EOL;
- _index = g_object_get_data(G_OBJECT(widget), "gnc_radiobutton_index");
+ _index = g_object_get_data (G_OBJECT(widget), "gnc_radiobutton_index");
index = GPOINTER_TO_INT(_index);
/* build the return list in reverse order */
- if (g_strcmp0(gnc_option_permissible_value_name(option, index),
- "Use a Book Currency") == 0)
+ if (g_strcmp0 (gnc_option_permissible_value_name (option, index),
+ "Use a Book Currency") == 0)
{
gnc_commodity *commodity = NULL;
int policy_index;
@@ -4124,7 +4095,7 @@ gnc_option_get_ui_value_currency_accounting (
gain_loss_account =
gnc_tree_view_account_get_selected_account
- (GNC_TREE_VIEW_ACCOUNT (
+ (GNC_TREE_VIEW_ACCOUNT(
book_currency_data->default_gain_loss_account_widget));
if (gain_loss_account == NULL)
@@ -4144,17 +4115,17 @@ gnc_option_get_ui_value_currency_accounting (
{
val = SCM_BOOL_F;
}
- value = scm_cons(val, value);
+ value = scm_cons (val, value);
- list_of_policies = gnc_get_valid_policy_list();
+ list_of_policies = gnc_get_valid_policy_list ();
if (list_of_policies && book_currency_data->default_cost_policy_widget)
{
GList *l = NULL;
gint i = 0;
/* GtkComboBox per-item tooltip changes needed below */
policy_index =
- gnc_combott_get_active(GNC_COMBOTT(
- book_currency_data->default_cost_policy_widget));
+ gnc_combott_get_active (GNC_COMBOTT(
+ book_currency_data->default_cost_policy_widget));
for (l = list_of_policies; l != NULL; l = l->next)
{
GNCPolicy *pcy = l->data;
@@ -4162,27 +4133,27 @@ gnc_option_get_ui_value_currency_accounting (
str = PolicyGetName (pcy);
i++;
}
- g_list_free(list_of_policies);
+ g_list_free (list_of_policies);
}
if (str)
{
- val = scm_from_locale_symbol(str);
+ val = scm_from_locale_symbol (str);
}
else
{
val = SCM_BOOL_F;
}
- value = scm_cons(val, value);
+ value = scm_cons (val, value);
if (gtk_combo_box_get_active (GTK_COMBO_BOX(book_currency_data->book_currency_widget)) != -1)
{
commodity =
- gnc_currency_edit_get_currency(
+ gnc_currency_edit_get_currency (
GNC_CURRENCY_EDIT(
book_currency_data->book_currency_widget));
if (commodity)
{
- val = gnc_commodity_to_scm(commodity);
+ val = gnc_commodity_to_scm (commodity);
}
else
{
@@ -4193,10 +4164,10 @@ gnc_option_get_ui_value_currency_accounting (
{
val = SCM_BOOL_F;
}
- value = scm_cons(val, value);
+ value = scm_cons (val, value);
}
- return (scm_cons (gnc_option_permissible_value(option, index), value));
+ return (scm_cons (gnc_option_permissible_value (option, index), value));
}
/************************************/
@@ -4319,7 +4290,7 @@ GNCOptionDef_t * gnc_options_ui_get_option (const char *option_name)
void gnc_options_ui_initialize (void)
{
- SWIG_GetModule(NULL); /* Work-around for SWIG bug. */
+ SWIG_GetModule (NULL); /* Work-around for SWIG bug. */
// gnc_options_register_stocks ();
g_return_if_fail (optionTable == NULL);
optionTable = g_hash_table_new (g_str_hash, g_str_equal);
@@ -4345,14 +4316,14 @@ scm_apply_cb (GNCOptionWin *win, gpointer data)
results = gnc_option_db_commit (win->option_db);
for (iter = results; iter; iter = iter->next)
{
- GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(gnc_options_dialog_widget(win)),
- 0,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
- "%s",
- (char*)iter->data);
- gtk_dialog_run(GTK_DIALOG(dialog));
- gtk_widget_destroy(dialog);
+ GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW(gnc_options_dialog_widget (win)),
+ 0,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ "%s",
+ (char*)iter->data);
+ gtk_dialog_run (GTK_DIALOG(dialog));
+ gtk_widget_destroy (dialog);
g_free (iter->data);
}
g_list_free (results);
diff --git a/gnucash/gnome-utils/dialog-options.h b/gnucash/gnome-utils/dialog-options.h
index e59c1c89e..300071734 100644
--- a/gnucash/gnome-utils/dialog-options.h
+++ b/gnucash/gnome-utils/dialog-options.h
@@ -35,49 +35,49 @@ typedef struct gnc_option_win GNCOptionWin;
typedef void (* GNCOptionWinCallback)(GNCOptionWin *, gpointer data);
-GNCOptionWin * gnc_options_dialog_new_modal(gboolean modal, gchar *title,
- const char *component_class,
- GtkWindow *parent);
-GNCOptionWin * gnc_options_dialog_new(gchar *title, GtkWindow *parent);
-GNCOptionWin * gnc_options_dialog_new_w_dialog(gchar *title, GtkWidget *dialog);
-void gnc_options_dialog_destroy(GNCOptionWin * win);
+GNCOptionWin * gnc_options_dialog_new_modal (gboolean modal, gchar *title,
+ const char *component_class,
+ GtkWindow *parent);
+GNCOptionWin * gnc_options_dialog_new (gchar *title, GtkWindow *parent);
+GNCOptionWin * gnc_options_dialog_new_w_dialog (gchar *title, GtkWidget *dialog);
+void gnc_options_dialog_destroy (GNCOptionWin * win);
void gnc_options_register_stocks (void);
-GtkWidget * gnc_options_dialog_widget(GNCOptionWin * win);
-GtkWidget * gnc_options_page_list(GNCOptionWin * win);
-GtkWidget * gnc_options_dialog_notebook(GNCOptionWin * win);
+GtkWidget * gnc_options_dialog_widget (GNCOptionWin * win);
+GtkWidget * gnc_options_page_list (GNCOptionWin * win);
+GtkWidget * gnc_options_dialog_notebook (GNCOptionWin * win);
void gnc_options_dialog_changed (GNCOptionWin *win);
-void gnc_option_changed_widget_cb(GtkWidget *widget, GNCOption *option);
-void gnc_option_changed_option_cb(GtkWidget *dummy, GNCOption *option);
+void gnc_option_changed_widget_cb (GtkWidget *widget, GNCOption *option);
+void gnc_option_changed_option_cb (GtkWidget *dummy, GNCOption *option);
-void gnc_options_dialog_set_apply_cb(GNCOptionWin * win,
- GNCOptionWinCallback thunk,
- gpointer cb_data);
-void gnc_options_dialog_set_help_cb(GNCOptionWin * win,
- GNCOptionWinCallback thunk,
- gpointer cb_data);
-void gnc_options_dialog_set_close_cb(GNCOptionWin * win,
+void gnc_options_dialog_set_apply_cb (GNCOptionWin * win,
+ GNCOptionWinCallback thunk,
+ gpointer cb_data);
+void gnc_options_dialog_set_help_cb (GNCOptionWin * win,
GNCOptionWinCallback thunk,
gpointer cb_data);
+void gnc_options_dialog_set_close_cb (GNCOptionWin * win,
+ GNCOptionWinCallback thunk,
+ gpointer cb_data);
-void gnc_options_dialog_set_global_help_cb(GNCOptionWinCallback thunk,
- gpointer cb_data);
+void gnc_options_dialog_set_global_help_cb (GNCOptionWinCallback thunk,
+ gpointer cb_data);
-void gnc_options_dialog_build_contents(GNCOptionWin *win,
- GNCOptionDB *odb);
+void gnc_options_dialog_build_contents (GNCOptionWin *win,
+ GNCOptionDB *odb);
-void gnc_options_dialog_build_contents_full(GNCOptionWin *win,
- GNCOptionDB *odb,
- gboolean show_dialog);
+void gnc_options_dialog_build_contents_full (GNCOptionWin *win,
+ GNCOptionDB *odb,
+ gboolean show_dialog);
/* Both apply_cb and close_cb should be scheme functions with 0 arguments.
* References to these functions will be held until the close_cb is called
*/
void gnc_options_dialog_set_scm_callbacks (GNCOptionWin *win,
- SCM apply_cb,
- SCM close_cb);
+ SCM apply_cb,
+ SCM close_cb);
/*****************************************************************/
/* Option Registration */
commit f93f850f17a333105c8a5106aa05517eea0990a0
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Thu Oct 22 14:27:54 2020 +0100
Bug 345924 - Conditionally change Options dialog cancel button
When the options dialog is loaded, the main buttons are a sensitive
'Cancel' button and insensitive 'OK' and 'Apply' buttons. When changes
are made the 'OK' and 'Apply' buttons become sensitive and when pressed
the 'OK' button will make changes and close dialog whereas the 'Apply'
button will make changes and the dialog will remain open but with these
buttons insensitive leaving just 'Cancel' sensitive.
This could be confusing so this commit changes conditionally the text
label of the 'Cancel' button between 'Cancel' and 'Close'.
diff --git a/gnucash/gnome-utils/dialog-options.c b/gnucash/gnome-utils/dialog-options.c
index a9f2ca0ea..511413a03 100644
--- a/gnucash/gnome-utils/dialog-options.c
+++ b/gnucash/gnome-utils/dialog-options.c
@@ -175,6 +175,8 @@ gnc_option_get_gtk_widget (GNCOption *option)
static void
gnc_options_dialog_changed_internal (GtkWidget *widget, gboolean sensitive)
{
+ GtkButton *button = NULL;
+
while (widget && !GTK_IS_WINDOW(widget))
widget = gtk_widget_get_parent(widget);
if (widget == NULL)
@@ -202,6 +204,9 @@ gnc_options_dialog_changed_internal (GtkWidget *widget, gboolean sensitive)
if (g_strcmp0 (gtk_widget_get_name(GTK_WIDGET(it->data)), "apply_button") == 0)
gtk_widget_set_sensitive (GTK_WIDGET(it->data), sensitive);
+
+ if (g_strcmp0 (gtk_widget_get_name(GTK_WIDGET(it->data)), "cancel_button") == 0)
+ button = GTK_BUTTON(it->data);
}
g_list_free (children);
}
@@ -211,6 +216,15 @@ gnc_options_dialog_changed_internal (GtkWidget *widget, gboolean sensitive)
}
g_list_free (children);
}
+
+ if (button)
+ {
+ if (sensitive)
+ gtk_button_set_label (button, _("_Cancel"));
+ else
+ gtk_button_set_label (button, _("_Close"));
+ }
+
}
void
commit c11f4db96ef1c23903075807bd944731a8eab167
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Thu Oct 22 14:26:50 2020 +0100
Bug 345924 - Report options 'Reset Button' always flags changes
If a report is loaded with default settings and the 'Reset button' is
pressed the 'OK/Apply' buttons will be enabled which should not happen
as there are no changes to be made.
Fixed by resetting the changed flag on options load and then comparing
the current value to the default one when the 'Reset button' pressed.
diff --git a/gnucash/gnome-utils/dialog-options.c b/gnucash/gnome-utils/dialog-options.c
index 50a654ee0..a9f2ca0ea 100644
--- a/gnucash/gnome-utils/dialog-options.c
+++ b/gnucash/gnome-utils/dialog-options.c
@@ -225,7 +225,7 @@ void
gnc_option_changed_widget_cb(GtkWidget *widget, GNCOption *option)
{
gnc_option_set_changed (option, TRUE);
- gnc_option_call_option_widget_changed_proc(option);
+ gnc_option_call_option_widget_changed_proc(option, FALSE);
gnc_options_dialog_changed_internal (widget, TRUE);
}
@@ -369,7 +369,18 @@ gnc_option_set_ui_value_internal (GNCOption *option, gboolean use_default)
type = gnc_option_type(option);
if (use_default)
+ {
+ SCM opt_getter = gnc_option_getter(option);
+ SCM opt_value = scm_call_0(opt_getter);
+ SCM def_value;
+
getter = gnc_option_default_getter(option);
+ def_value = scm_call_0(getter);
+
+ // only set changed if the values have changed
+ if (!scm_is_true(scm_equal_p(opt_value, def_value)))
+ gnc_option_set_changed (option, TRUE);
+ }
else
getter = gnc_option_getter(option);
@@ -1983,8 +1994,9 @@ gnc_options_dialog_build_contents_full (GNCOptionWin *propertybox,
for (j = 0; j < gnc_option_section_num_options(section); j++)
{
+ // setting TRUE will clear the changed flag after proc
gnc_option_call_option_widget_changed_proc(
- gnc_get_option_section_option(section, j) );
+ gnc_get_option_section_option(section, j), TRUE);
}
}
@@ -2106,13 +2118,16 @@ gnc_options_dialog_reset_cb(GtkWidget * w, gpointer data)
GNCOptionSection *section;
gpointer val;
- val = g_object_get_data(G_OBJECT(w), "section");
+ val = g_object_get_data (G_OBJECT(w), "section");
g_return_if_fail (val);
g_return_if_fail (win);
section = (GNCOptionSection*)val;
+
gnc_option_db_section_reset_widgets (section);
- gnc_options_dialog_changed_internal (win->window, TRUE);
+
+ if (gnc_option_db_get_changed (win->option_db))
+ gnc_options_dialog_changed_internal (win->window, TRUE);
}
void
diff --git a/libgnucash/app-utils/option-util.c b/libgnucash/app-utils/option-util.c
index 3ae27a74c..42c3b5a19 100644
--- a/libgnucash/app-utils/option-util.c
+++ b/libgnucash/app-utils/option-util.c
@@ -790,17 +790,19 @@ gnc_option_widget_changed_proc_getter(GNCOption *option)
}
-/********************************************************************\
- * gnc_option_call_option_widget_changed_proc *
- * If there is an option_widget_changed_cb for this option, call *
- * it with the SCM value of the option that is passed in. If *
- * there is no such callback function or value, do nothing. *
- * *
- * Args: option - the GNCOption *
- * Returns: void *
-\********************************************************************/
+/**********************************************************************\
+ * gnc_option_call_option_widget_changed_proc *
+ * If there is an option_widget_changed_cb for this option, call *
+ * it with the SCM value of the option that is passed in. If *
+ * there is no such callback function or value, do nothing. *
+ * *
+ * Args: option - the GNCOption *
+ * reset_changed - whether to reset the changed flag afterwards *
+ * Returns: void *
+\**********************************************************************/
void
-gnc_option_call_option_widget_changed_proc(GNCOption *option)
+gnc_option_call_option_widget_changed_proc (GNCOption *option,
+ gboolean reset_changed)
{
SCM cb, value;
@@ -815,6 +817,8 @@ gnc_option_call_option_widget_changed_proc(GNCOption *option)
scm_call_1(cb, value);
}
}
+ if (reset_changed)
+ option->changed = FALSE;
}
@@ -1847,9 +1851,7 @@ gnc_option_db_section_reset_widgets (GNCOptionSection *section)
option_node = option_node->next)
{
option = option_node->data;
-
gnc_option_set_ui_value (option, TRUE);
- gnc_option_set_changed (option, TRUE);
}
}
diff --git a/libgnucash/app-utils/option-util.h b/libgnucash/app-utils/option-util.h
index 40de7b8a4..ee963ab5f 100644
--- a/libgnucash/app-utils/option-util.h
+++ b/libgnucash/app-utils/option-util.h
@@ -130,7 +130,8 @@ gboolean gnc_option_get_color_info(GNCOption *option,
gdouble *blue,
gdouble *alpha);
-void gnc_option_call_option_widget_changed_proc (GNCOption *option);
+void gnc_option_call_option_widget_changed_proc (GNCOption *option,
+ gboolean reset_changed);
void gnc_option_set_default(GNCOption *option);
Summary of changes:
gnucash/gnome-utils/dialog-options.c | 2020 +++++++++++++++++-----------------
gnucash/gnome-utils/dialog-options.h | 54 +-
libgnucash/app-utils/option-util.c | 1091 +++++++++---------
libgnucash/app-utils/option-util.h | 351 +++---
4 files changed, 1729 insertions(+), 1787 deletions(-)
More information about the gnucash-changes
mailing list