IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Gnc-Prefs: migrate GtkCheckbutton widgets (and associated preferences) - last batch

Browse Source 
All GtkCheckButtons now use the new preferences backend
so drop the GtkCheckButton-Gconf wiring as well.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23239 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Geert Janssens 2013-10-07 14:13:11 +00:00
parent e174893d25
commit 2291ef5249
36 changed files with 161 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/business/business-gnome/dialog-invoice.c
View File

@ -38,6 +38,7 @@
#include "gnc-ui.h" #include "gnc-ui.h"
#include "gnc-gconf-utils.h" #include "gnc-gconf-utils.h"
#include "gnc-gui-query.h" #include "gnc-gui-query.h"
#include "gnc-prefs.h"
#include "gnc-ui-util.h" #include "gnc-ui-util.h"
#include "gnc-date-edit.h" #include "gnc-date-edit.h"
#include "gnc-amount-edit.h" #include "gnc-amount-edit.h"
@ -85,7 +86,9 @@
#define DIALOG_NEW_INVOICE_CM_CLASS "dialog-new-invoice" #define DIALOG_NEW_INVOICE_CM_CLASS "dialog-new-invoice"
#define DIALOG_VIEW_INVOICE_CM_CLASS "dialog-view-invoice" #define DIALOG_VIEW_INVOICE_CM_CLASS "dialog-view-invoice"
#define GNC_PREFS_GROUP_SEARCH "dialogs.business.invoice_search" #define GNC_PREFS_GROUP_SEARCH "dialogs.business.invoice_search"
#define GNC_PREF_NOTIFY_WHEN_DUE "notify_when_due"
#define GNC_PREF_ACCUM_SPLITS "accumulate_splits"
#define LAST_POSTED_TO_ACCT "last-posted-to-acct" #define LAST_POSTED_TO_ACCT "last-posted-to-acct"
@ -726,7 +729,7 @@ gnc_dialog_post_invoice(InvoiceWindow *iw, char *message,
iw->book); iw->book);
/* Get the default for the accumulate option */ /* Get the default for the accumulate option */
*accumulate = gnc_gconf_get_bool(GCONF_SECTION_INVOICE, "accumulate_splits", NULL); *accumulate = gnc_prefs_get_bool(GNC_PREFS_GROUP_INVOICE, GNC_PREF_ACCUM_SPLITS);
if (!gnc_dialog_dates_acct_question_parented (iw_get_window(iw), message, ddue_label, if (!gnc_dialog_dates_acct_question_parented (iw_get_window(iw), message, ddue_label,
post_label, acct_label, question_label, TRUE, TRUE, post_label, acct_label, question_label, TRUE, TRUE,
@ -2185,7 +2188,7 @@ gnc_invoice_create_page (InvoiceWindow *iw, gpointer page)
GncEntryLedger *entry_ledger = NULL; GncEntryLedger *entry_ledger = NULL;
GncOwnerType owner_type; GncOwnerType owner_type;
GncEntryLedgerType ledger_type; GncEntryLedgerType ledger_type;
const gchar *gconf_section = NULL; const gchar *prefs_group = NULL;
gboolean is_credit_note = FALSE; gboolean is_credit_note = FALSE;
invoice = gncInvoiceLookup (iw->book, &iw->invoice_guid); invoice = gncInvoiceLookup (iw->book, &iw->invoice_guid);
@ -2292,17 +2295,17 @@ gnc_invoice_create_page (InvoiceWindow *iw, gpointer page)
case GNC_OWNER_CUSTOMER: case GNC_OWNER_CUSTOMER:
ledger_type = is_credit_note ? GNCENTRY_CUST_CREDIT_NOTE_VIEWER ledger_type = is_credit_note ? GNCENTRY_CUST_CREDIT_NOTE_VIEWER
: GNCENTRY_INVOICE_VIEWER; : GNCENTRY_INVOICE_VIEWER;
gconf_section = GCONF_SECTION_INVOICE; prefs_group = GNC_PREFS_GROUP_INVOICE;
break; break;
case GNC_OWNER_VENDOR: case GNC_OWNER_VENDOR:
ledger_type = is_credit_note ? GNCENTRY_VEND_CREDIT_NOTE_VIEWER ledger_type = is_credit_note ? GNCENTRY_VEND_CREDIT_NOTE_VIEWER
: GNCENTRY_BILL_VIEWER; : GNCENTRY_BILL_VIEWER;
gconf_section = GCONF_SECTION_BILL; prefs_group = GNC_PREFS_GROUP_BILL;
break; break;
case GNC_OWNER_EMPLOYEE: case GNC_OWNER_EMPLOYEE:
ledger_type = is_credit_note ? GNCENTRY_EMPL_CREDIT_NOTE_VIEWER ledger_type = is_credit_note ? GNCENTRY_EMPL_CREDIT_NOTE_VIEWER
: GNCENTRY_EXPVOUCHER_VIEWER; : GNCENTRY_EXPVOUCHER_VIEWER;
gconf_section = GCONF_SECTION_BILL; prefs_group = GNC_PREFS_GROUP_BILL;
break; break;
default: default:
g_warning ("Invalid owner type"); g_warning ("Invalid owner type");
@ -2319,8 +2322,8 @@ gnc_invoice_create_page (InvoiceWindow *iw, gpointer page)
/* Set the entry_ledger's invoice */ /* Set the entry_ledger's invoice */
gnc_entry_ledger_set_default_invoice (entry_ledger, invoice); gnc_entry_ledger_set_default_invoice (entry_ledger, invoice);
/* Set the gconf section */ /* Set the preferences group */
gnc_entry_ledger_set_gconf_section (entry_ledger, gconf_section); gnc_entry_ledger_set_prefs_group (entry_ledger, prefs_group);
/* Setup initial values */ /* Setup initial values */
iw->component_id = iw->component_id =
@ -3222,7 +3225,7 @@ gnc_invoice_remind_bills_due (void)
void void
gnc_invoice_remind_bills_due_cb (void) gnc_invoice_remind_bills_due_cb (void)
{ {
if (!gnc_gconf_get_bool(GCONF_SECTION_BILL, "notify_when_due", NULL)) if (!gnc_prefs_get_bool(GNC_PREFS_GROUP_BILL, GNC_PREF_NOTIFY_WHEN_DUE))
return; return;
gnc_invoice_remind_bills_due(); gnc_invoice_remind_bills_due();

3
src/business/business-gnome/dialog-invoice.h
View File

@ -49,6 +49,9 @@ typedef enum
#define GCONF_SECTION_INVOICE "dialogs/business/invoice" #define GCONF_SECTION_INVOICE "dialogs/business/invoice"
#define GCONF_SECTION_BILL "dialogs/business/bill" #define GCONF_SECTION_BILL "dialogs/business/bill"
#define GCONF_SECTION_VOUCHER "dialogs/business/voucher" #define GCONF_SECTION_VOUCHER "dialogs/business/voucher"
#define GNC_PREFS_GROUP_INVOICE "dialogs.business.invoice"
#define GNC_PREFS_GROUP_BILL "dialogs.business.bill"
#define GNC_PREFS_GROUP_VOUCHER "dialogs.business.voucher"
/* Create and edit an invoice */ /* Create and edit an invoice */

3
src/business/business-gnome/gnc-plugin-page-invoice.c
View File

@ -38,6 +38,7 @@
#include "gnc-gnome-utils.h" #include "gnc-gnome-utils.h"
#include "gnc-icons.h" #include "gnc-icons.h"
#include "gnucash-sheet.h" #include "gnucash-sheet.h"
#include "gnc-prefs.h"
#include "gnc-ui-util.h" #include "gnc-ui-util.h"
#include "gnc-window.h" #include "gnc-window.h"
@ -377,7 +378,7 @@ gnc_plugin_page_invoice_init (GncPluginPageInvoice *plugin_page)
/* Init parent declared variables */ /* Init parent declared variables */
parent = GNC_PLUGIN_PAGE(plugin_page); parent = GNC_PLUGIN_PAGE(plugin_page);
use_new = gnc_gconf_get_bool(GCONF_SECTION_INVOICE, KEY_USE_NEW, NULL); use_new = gnc_prefs_get_bool (GNC_PREFS_GROUP_INVOICE, GNC_PREF_USE_NEW);
g_object_set(G_OBJECT(plugin_page), g_object_set(G_OBJECT(plugin_page),
"page-name", _("Invoice"), "page-name", _("Invoice"),
"page-uri", "default:", "page-uri", "default:",

10
src/business/business-gnome/gtkbuilder/business-prefs.glade
View File

@ -44,7 +44,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="gconf/dialogs/business/bill/tax_included"> <object class="GtkCheckButton" id="pref/dialogs.business.bill/tax_included">
<property name="label" translatable="yes">Ta_x included</property> <property name="label" translatable="yes">Ta_x included</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
@ -109,7 +109,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="gconf/dialogs/business/bill/notify_when_due"> <object class="GtkCheckButton" id="pref/dialogs.business.bill/notify_when_due">
<property name="label" translatable="yes">_Notify when due</property> <property name="label" translatable="yes">_Notify when due</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
@ -160,7 +160,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="gconf/dialogs/business/invoice/tax_included"> <object class="GtkCheckButton" id="pref/dialogs.business.invoice/tax_included">
<property name="label" translatable="yes">_Tax included</property> <property name="label" translatable="yes">_Tax included</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
@ -182,7 +182,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="gconf/dialogs/business/invoice/accumulate_splits"> <object class="GtkCheckButton" id="pref/dialogs.business.invoice/accumulate_splits">
<property name="label" translatable="yes">_Accumulate splits on post</property> <property name="label" translatable="yes">_Accumulate splits on post</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
@ -204,7 +204,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="gconf/dialogs/business/invoice/use_new_window"> <object class="GtkCheckButton" id="pref/dialogs.business.invoice/use_new_window">
<property name="label" translatable="yes">_Open in new window</property> <property name="label" translatable="yes">_Open in new window</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>

6
src/business/business-ledger/gncEntryLedger.c
View File

@ -289,7 +289,7 @@ GncEntryLedger * gnc_entry_ledger_new (QofBook *book, GncEntryLedgerType type)
ledger->type = type; ledger->type = type;
ledger->book = book; ledger->book = book;
ledger->traverse_to_new = TRUE; ledger->traverse_to_new = TRUE;
ledger->gconf_section = NULL; ledger->prefs_group = NULL;
/* Orders and Invoices are "invoices" for lookups */ /* Orders and Invoices are "invoices" for lookups */
switch (type) switch (type)
@ -956,12 +956,12 @@ gnc_entry_ledger_get_query (GncEntryLedger *ledger)
} }
void void
gnc_entry_ledger_set_gconf_section (GncEntryLedger *ledger, const gchar *string) gnc_entry_ledger_set_prefs_group (GncEntryLedger *ledger, const gchar *string)
{ {
if (!ledger) if (!ledger)
return; return;
ledger->gconf_section = string; ledger->prefs_group = string;
} }
void gnc_entry_ledger_move_current_entry_updown (GncEntryLedger *ledger, void gnc_entry_ledger_move_current_entry_updown (GncEntryLedger *ledger,

2
src/business/business-ledger/gncEntryLedger.h
View File

@ -156,6 +156,6 @@ void gnc_entry_ledger_move_current_entry_updown (GncEntryLedger *ledger,
QofQuery * gnc_entry_ledger_get_query (GncEntryLedger *ledger); QofQuery * gnc_entry_ledger_get_query (GncEntryLedger *ledger);
void gnc_entry_ledger_set_gconf_section (GncEntryLedger *ledger, const gchar *string); void gnc_entry_ledger_set_prefs_group (GncEntryLedger *ledger, const gchar *string);
#endif /* GNC_ENTRY_LEDGER_H */ #endif /* GNC_ENTRY_LEDGER_H */

7
src/business/business-ledger/gncEntryLedgerLoad.c
View File

@ -30,7 +30,7 @@
#include "account-quickfill.h" #include "account-quickfill.h"
#include "combocell.h" #include "combocell.h"
#include "gnc-component-manager.h" #include "gnc-component-manager.h"
#include "gnc-gconf-utils.h" #include "gnc-prefs.h"
#include "gnc-ui-util.h" #include "gnc-ui-util.h"
#include "recncell.h" #include "recncell.h"
@ -42,6 +42,7 @@
#include "quickfillcell.h" #include "quickfillcell.h"
#include "app-utils/gnc-entry-quickfill.h" #include "app-utils/gnc-entry-quickfill.h"
#define GNC_PREF_TAX_INCL "tax_included"
/* XXX: This should go elsewhere */ /* XXX: This should go elsewhere */
const char * gnc_entry_ledger_type_string_getter (char flag) const char * gnc_entry_ledger_type_string_getter (char flag)
@ -398,9 +399,9 @@ void gnc_entry_ledger_load (GncEntryLedger *ledger, GList *entry_list)
taxincluded = FALSE; taxincluded = FALSE;
break; break;
case GNC_TAXINCLUDED_USEGLOBAL: case GNC_TAXINCLUDED_USEGLOBAL:
if (ledger->gconf_section) if (ledger->prefs_group)
{ {
taxincluded = gnc_gconf_get_bool(ledger->gconf_section, "tax_included", NULL); taxincluded = gnc_prefs_get_bool (ledger->prefs_group, GNC_PREF_TAX_INCL);
} }
else else
{ {

2
src/business/business-ledger/gncEntryLedgerP.h
View File

@ -54,7 +54,7 @@ struct GncEntryLedger_s
gboolean is_cust_doc; /* is this document customer or vendor related ? */ gboolean is_cust_doc; /* is this document customer or vendor related ? */
gboolean is_credit_note; /* is this an invoice (or a bill)? */ gboolean is_credit_note; /* is this an invoice (or a bill)? */
const gchar * gconf_section; const gchar * prefs_group;
}; };
GncEntry * gnc_entry_ledger_get_entry (GncEntryLedger *ledger, GncEntry * gnc_entry_ledger_get_entry (GncEntryLedger *ledger,

83
src/gnome-utils/dialog-preferences.c
View File

@ -752,78 +752,6 @@ gnc_prefs_connect_radio_button_gconf (GtkRadioButton *button)
/****************************************************************************/ /****************************************************************************/
/** The user clicked on a check button. Update gconf. Check button
* choices are stored as a boolean
*
* @internal
*
* @param button A pointer to the check button that was clicked.
*
* @param user_data Unused.
*/
static void
gnc_prefs_check_button_user_cb_gconf (GtkCheckButton *button,
gpointer user_data)
{
const gchar *name;
gboolean active;
g_return_if_fail(GTK_IS_CHECK_BUTTON(button));
name = gtk_buildable_get_name(GTK_BUILDABLE(button)) + PREFIX_LEN;
active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
DEBUG("Checkbox %s now %sactive", name, active ? "" : "in");
gnc_gconf_set_bool(name, NULL, active, NULL);
}
/** A check button choice was updated in gconf. Update the user
* visible dialog.
*
* @internal
*
* @param button A pointer to the check button that changed.
*
* @param active The new state of the check button.
*/
static void
gnc_prefs_check_button_gconf_cb_gconf (GtkCheckButton *button,
gboolean active)
{
g_return_if_fail(GTK_IS_CHECK_BUTTON(button));
ENTER("button %p, active %d", button, active);
g_signal_handlers_block_by_func(G_OBJECT(button),
G_CALLBACK(gnc_prefs_check_button_user_cb_gconf), NULL);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active);
g_signal_handlers_unblock_by_func(G_OBJECT(button),
G_CALLBACK(gnc_prefs_check_button_user_cb_gconf), NULL);
LEAVE(" ");
}
/** Connect a check button widget to the user callback function. Set
* the starting state of the button from its value in gconf.
*
* @internal
*
* @param button A pointer to the check button that should be
* connected.
*/
static void
gnc_prefs_connect_check_button_gconf (GtkCheckButton *button)
{
const gchar *name;
gboolean active;
name = gtk_buildable_get_name(GTK_BUILDABLE(button)) + PREFIX_LEN;
active = gnc_gconf_get_bool(name, NULL, NULL);
DEBUG(" Checkbox %s initially %sactive", name, active ? "" : "in");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active);
g_signal_connect(G_OBJECT(button), "toggled",
G_CALLBACK(gnc_prefs_check_button_user_cb_gconf), NULL);
}
/****************************************************************************/
/** The user updated a spin button. Update gconf. Spin button /** The user updated a spin button. Update gconf. Spin button
* choices are stored as a float. * choices are stored as a float.
* *
@ -1454,11 +1382,6 @@ gnc_prefs_connect_one_gconf (const gchar *name,
DEBUG(" %s - radio button", name); DEBUG(" %s - radio button", name);
gnc_prefs_connect_radio_button_gconf(GTK_RADIO_BUTTON(widget)); gnc_prefs_connect_radio_button_gconf(GTK_RADIO_BUTTON(widget));
} }
else if (GTK_IS_CHECK_BUTTON(widget))
{
DEBUG(" %s - check button", name);
gnc_prefs_connect_check_button_gconf(GTK_CHECK_BUTTON(widget));
}
else if (GTK_IS_SPIN_BUTTON(widget)) else if (GTK_IS_SPIN_BUTTON(widget))
{ {
DEBUG(" %s - spin button", name); DEBUG(" %s - spin button", name);
@ -1790,12 +1713,6 @@ gnc_preferences_gconf_changed (GConfClient *client,
DEBUG("widget %p - radio button", widget); DEBUG("widget %p - radio button", widget);
gnc_prefs_radio_button_gconf_cb_gconf(GTK_RADIO_BUTTON(widget)); gnc_prefs_radio_button_gconf_cb_gconf(GTK_RADIO_BUTTON(widget));
} }
else if (GTK_IS_CHECK_BUTTON(widget))
{
DEBUG("widget %p - check button", widget);
gnc_prefs_check_button_gconf_cb_gconf(GTK_CHECK_BUTTON(widget),
gconf_value_get_bool(entry->value));
}
else if (GTK_IS_SPIN_BUTTON(widget)) else if (GTK_IS_SPIN_BUTTON(widget))
{ {
DEBUG("widget %p - spin button", widget); DEBUG("widget %p - spin button", widget);

4
src/gnome-utils/dialog-utils.c
View File

@ -161,7 +161,7 @@ gnc_restore_window_size(const char *group, GtkWindow *window)
g_return_if_fail(group != NULL); g_return_if_fail(group != NULL);
g_return_if_fail(window != NULL); g_return_if_fail(window != NULL);
if (!gnc_gconf_get_bool(GCONF_GENERAL, KEY_SAVE_GEOMETRY, NULL)) if (gnc_prefs_get_bool(GNC_PREFS_GROUP_GENERAL, GNC_PREF_SAVE_GEOMETRY))
return; return;
geometry = gnc_prefs_get_value (group, GNC_PREF_LAST_GEOMETRY); geometry = gnc_prefs_get_value (group, GNC_PREF_LAST_GEOMETRY);
@ -219,7 +219,7 @@ gnc_save_window_size(const char *group, GtkWindow *window)
g_return_if_fail(group != NULL); g_return_if_fail(group != NULL);
g_return_if_fail(window != NULL); g_return_if_fail(window != NULL);
if (!gnc_gconf_get_bool(GCONF_GENERAL, KEY_SAVE_GEOMETRY, NULL)) if (gnc_prefs_get_bool(GNC_PREFS_GROUP_GENERAL, GNC_PREF_SAVE_GEOMETRY))
return; return;
gtk_window_get_position(GTK_WINDOW(window), &wpos[0], &wpos[1]); gtk_window_get_position(GTK_WINDOW(window), &wpos[0], &wpos[1]);

19
src/gnome-utils/gnc-main-window.c
View File

@ -93,8 +93,8 @@ enum
#define PLUGIN_PAGE_CLOSE_BUTTON "close-button" #define PLUGIN_PAGE_CLOSE_BUTTON "close-button"
#define PLUGIN_PAGE_TAB_LABEL "label" #define PLUGIN_PAGE_TAB_LABEL "label"
#define KEY_SHOW_CLOSE_BUTTON "tab_close_buttons" #define GNC_PREF_SHOW_CLOSE_BUTTON "tab_close_buttons"
#define KEY_TAB_NEXT_RECENT "tab_next_recent" #define GNC_PREF_TAB_NEXT_RECENT "tab_next_recent"
#define KEY_TAB_POSITION "tab_position" #define KEY_TAB_POSITION "tab_position"
#define KEY_TAB_WIDTH "tab_width" #define KEY_TAB_WIDTH "tab_width"
#define GNC_PREF_TAB_COLOR "show_account_color_tabs" #define GNC_PREF_TAB_COLOR "show_account_color_tabs"
@ -1889,12 +1889,12 @@ gnc_main_window_update_tab_close_one_page (GncPluginPage *page,
* @param user_data Unused. * @param user_data Unused.
*/ */
static void static void
gnc_main_window_update_tab_close (GConfEntry *entry, gpointer user_data) gnc_main_window_update_tab_close (gpointer prefs, gchar *pref, gpointer user_data)
{ {
gboolean new_value; gboolean new_value;
ENTER(" "); ENTER(" ");
new_value = gconf_value_get_bool(entry->value); new_value = gnc_prefs_get_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_SHOW_CLOSE_BUTTON);
gnc_main_window_foreach_page( gnc_main_window_foreach_page(
gnc_main_window_update_tab_close_one_page, gnc_main_window_update_tab_close_one_page,
&new_value); &new_value);
@ -2431,9 +2431,10 @@ gnc_main_window_class_init (GncMainWindowClass *klass)
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
G_TYPE_OBJECT); G_TYPE_OBJECT);
gnc_gconf_general_register_cb (KEY_SHOW_CLOSE_BUTTON, gnc_prefs_register_cb (GNC_PREFS_GROUP_GENERAL,
gnc_main_window_update_tab_close, GNC_PREF_SHOW_CLOSE_BUTTON,
NULL); gnc_main_window_update_tab_close,
NULL);
gnc_gconf_general_register_cb (KEY_TAB_WIDTH, gnc_gconf_general_register_cb (KEY_TAB_WIDTH,
gnc_main_window_update_tab_width, gnc_main_window_update_tab_width,
NULL); NULL);
@ -2712,7 +2713,7 @@ gnc_main_window_disconnect (GncMainWindow *window,
/* Switch to the last recently used page */ /* Switch to the last recently used page */
notebook = GTK_NOTEBOOK (priv->notebook); notebook = GTK_NOTEBOOK (priv->notebook);
if (gnc_gconf_get_bool(GCONF_GENERAL, KEY_TAB_NEXT_RECENT, NULL)) if (gnc_prefs_get_bool(GNC_PREFS_GROUP_GENERAL, GNC_PREF_TAB_NEXT_RECENT))
{ {
new_page = g_list_nth_data (priv->usage_order, 0); new_page = g_list_nth_data (priv->usage_order, 0);
if (new_page) if (new_page)
@ -2904,7 +2905,7 @@ gnc_main_window_open_page (GncMainWindow *window,
requisition.height + 2); requisition.height + 2);
gtk_button_set_alignment(GTK_BUTTON(close_button), 0.5, 0.5); gtk_button_set_alignment(GTK_BUTTON(close_button), 0.5, 0.5);
gtk_container_add(GTK_CONTAINER(close_button), close_image); gtk_container_add(GTK_CONTAINER(close_button), close_image);
if (gnc_gconf_get_bool(GCONF_GENERAL, KEY_SHOW_CLOSE_BUTTON, NULL)) if (gnc_prefs_get_bool(GNC_PREFS_GROUP_GENERAL, GNC_PREF_SHOW_CLOSE_BUTTON))
gtk_widget_show (close_button); gtk_widget_show (close_button);
else else
gtk_widget_hide (close_button); gtk_widget_hide (close_button);

8
src/gnome-utils/gtkbuilder/dialog-preferences.glade
View File

@ -3278,7 +3278,7 @@ many months before the current month:</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="gconf/general/report/use_new_window"> <object class="GtkCheckButton" id="pref/general.report/use_new_window">
<property name="label" translatable="yes">Report opens in a new _window</property> <property name="label" translatable="yes">Report opens in a new _window</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
@ -3539,7 +3539,7 @@ many months before the current month:</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="gconf/general/save_window_geometry"> <object class="GtkCheckButton" id="pref/general/save_window_geometry">
<property name="label" translatable="yes">_Save window size and position</property> <property name="label" translatable="yes">_Save window size and position</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
@ -3560,7 +3560,7 @@ many months before the current month:</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="gconf/general/tab_next_recent"> <object class="GtkCheckButton" id="pref/general/tab_next_recent">
<property name="label" translatable="yes">Bring the most _recent tab to the front</property> <property name="label" translatable="yes">Bring the most _recent tab to the front</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
@ -3790,7 +3790,7 @@ many months before the current month:</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="gconf/general/tab_close_buttons"> <object class="GtkCheckButton" id="pref/general/tab_close_buttons">
<property name="label" translatable="yes">Show close button on _notebook tabs</property> <property name="label" translatable="yes">Show close button on _notebook tabs</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>

9
src/gnome/dialog-commodities.c
View File

@ -33,16 +33,17 @@
#include "gnc-component-manager.h" #include "gnc-component-manager.h"
#include "qof.h" #include "qof.h"
#include "gnc-tree-view-commodity.h" #include "gnc-tree-view-commodity.h"
#include "gnc-prefs.h"
#include "gnc-ui.h" #include "gnc-ui.h"
#include "gnc-ui-util.h" #include "gnc-ui-util.h"
#include "gnc-gconf-utils.h"
#include "gnc-gnome-utils.h" #include "gnc-gnome-utils.h"
#include "gnc-session.h" #include "gnc-session.h"
#define DIALOG_COMMODITIES_CM_CLASS "dialog-commodities" #define DIALOG_COMMODITIES_CM_CLASS "dialog-commodities"
#define GCONF_SECTION "dialogs/edit_commodities" #define GCONF_SECTION "dialogs/edit_commodities"
#define GNC_PREFS_GROUP "dialogs.edit_commodities" #define GNC_PREFS_GROUP "dialogs.edit_commodities"
#define GNC_PREF_INCL_ISO "include_iso"
/* This static indicates the debugging module that this .o belongs to. */ /* This static indicates the debugging module that this .o belongs to. */
/* static short module = MOD_GUI; */ /* static short module = MOD_GUI; */
@ -319,7 +320,7 @@ gnc_commodities_dialog_create (GtkWidget * parent, CommoditiesDialog *cd)
cd->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Securities Dialog")); cd->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Securities Dialog"));
cd->session = gnc_get_current_session(); cd->session = gnc_get_current_session();
cd->book = qof_session_get_book(cd->session); cd->book = qof_session_get_book(cd->session);
cd->show_currencies = gnc_gconf_get_bool(GCONF_SECTION, "include_iso", NULL); cd->show_currencies = gnc_prefs_get_bool(GNC_PREFS_GROUP, GNC_PREF_INCL_ISO);
gtk_builder_connect_signals(builder, cd); gtk_builder_connect_signals(builder, cd);
@ -367,7 +368,7 @@ close_handler (gpointer user_data)
gnc_save_window_size(GNC_PREFS_GROUP, GTK_WINDOW(cd->dialog)); gnc_save_window_size(GNC_PREFS_GROUP, GTK_WINDOW(cd->dialog));
gnc_gconf_set_bool(GCONF_SECTION, "include_iso", cd->show_currencies, NULL); gnc_prefs_set_bool(GNC_PREFS_GROUP, GNC_PREF_INCL_ISO, cd->show_currencies);
gtk_widget_destroy(cd->dialog); gtk_widget_destroy(cd->dialog);
} }

32
src/gnome/dialog-sx-editor.c
View File

@ -60,6 +60,7 @@
#include "gnc-ledger-display.h" #include "gnc-ledger-display.h"
#include "gnc-plugin-page.h" #include "gnc-plugin-page.h"
#include "gnc-plugin-page-register.h" #include "gnc-plugin-page-register.h"
#include "gnc-prefs.h"
#include "gnc-ui.h" #include "gnc-ui.h"
#include "gnc-ui-util.h" #include "gnc-ui-util.h"
#include "gnucash-sheet.h" #include "gnucash-sheet.h"
@ -145,7 +146,6 @@ struct _GncSxEditorDialog
static void schedXact_editor_create_freq_sel( GncSxEditorDialog *sxed ); static void schedXact_editor_create_freq_sel( GncSxEditorDialog *sxed );
static void schedXact_editor_create_ledger( GncSxEditorDialog *sxed ); static void schedXact_editor_create_ledger( GncSxEditorDialog *sxed );
static void schedXact_editor_populate( GncSxEditorDialog * ); static void schedXact_editor_populate( GncSxEditorDialog * );
static void gnc_sxed_record_size( GncSxEditorDialog *sxed );
static void endgroup_rb_toggled_cb( GtkButton *b, gpointer d ); static void endgroup_rb_toggled_cb( GtkButton *b, gpointer d );
static void set_endgroup_toggle_states( GncSxEditorDialog *sxed, EndType t ); static void set_endgroup_toggle_states( GncSxEditorDialog *sxed, EndType t );
static void advance_toggled_cb( GtkButton *b, GncSxEditorDialog *sxed ); static void advance_toggled_cb( GtkButton *b, GncSxEditorDialog *sxed );
@ -180,7 +180,7 @@ sxed_close_handler(gpointer user_data)
GncSxEditorDialog *sxed = user_data; GncSxEditorDialog *sxed = user_data;
gnc_sxed_reg_check_close(sxed); gnc_sxed_reg_check_close(sxed);
gnc_sxed_record_size(sxed); gnc_save_window_size( GNC_PREFS_GROUP_SXED, GTK_WINDOW(sxed->dialog) );
gtk_widget_destroy(sxed->dialog); gtk_widget_destroy(sxed->dialog);
/* The data will be cleaned up in the destroy handler. */ /* The data will be cleaned up in the destroy handler. */
} }
@ -1267,14 +1267,6 @@ gnc_ui_scheduled_xaction_editor_dialog_create (SchedXaction *sx,
} }
static
void
gnc_sxed_record_size( GncSxEditorDialog *sxed )
{
gnc_save_window_size( GNC_PREFS_GROUP_SXED, GTK_WINDOW(sxed->dialog) );
}
static static
void void
schedXact_editor_create_freq_sel( GncSxEditorDialog *sxed ) schedXact_editor_create_freq_sel( GncSxEditorDialog *sxed )
@ -1416,9 +1408,9 @@ schedXact_editor_populate( GncSxEditorDialog *sxed )
if ( sxed->newsxP ) if ( sxed->newsxP )
{ {
autoCreateState = autoCreateState =
gnc_gconf_get_bool( SXED_GCONF_SECTION, KEY_CREATE_AUTO, NULL ); gnc_prefs_get_bool (GNC_PREFS_GROUP_SXED, GNC_PREF_CREATE_AUTO);
notifyState = notifyState =
gnc_gconf_get_bool( SXED_GCONF_SECTION, KEY_NOTIFY, NULL ); gnc_prefs_get_bool (GNC_PREFS_GROUP_SXED, GNC_PREF_NOTIFY);
} }
else else
{ {
@ -1668,23 +1660,19 @@ sxed_excal_update_adapt_cb(GtkObject *o, gpointer ud)
void void
on_sx_check_toggled_cb (GtkWidget *togglebutton, on_sx_check_toggled_cb (GtkWidget *togglebutton, gpointer user_data)
gpointer user_data)
{ {
GtkWidget *widget_create, *widget_notify; GtkWidget *widget_notify;
gboolean active; // , notify;
GHashTable *table; GHashTable *table;
PINFO("Togglebutton is %p and user_data is %p", togglebutton, user_data); PINFO("Togglebutton is %p and user_data is %p", togglebutton, user_data);
PINFO("Togglebutton builder name is %s", gtk_buildable_get_name(GTK_BUILDABLE(togglebutton))); PINFO("Togglebutton builder name is %s", gtk_buildable_get_name(GTK_BUILDABLE(togglebutton)));
/* We need to use the hash table to find the required widget to activate. */ /* We need to use the hash table to find the required widget to activate. */
table = g_object_get_data(G_OBJECT(user_data), "widget_hash"); table = g_object_get_data(G_OBJECT(user_data), "prefs_widget_hash");
widget_create = g_hash_table_lookup(table, "gconf/dialogs/scheduled_trans/transaction_editor/create_auto"); widget_notify = g_hash_table_lookup(table, "pref/" GNC_PREFS_GROUP_SXED "/" GNC_PREF_NOTIFY);
widget_notify = g_hash_table_lookup(table, "gconf/dialogs/scheduled_trans/transaction_editor/notify");
active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget_create)); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(togglebutton)))
if (active)
gtk_widget_set_sensitive(widget_notify, TRUE); gtk_widget_set_sensitive(widget_notify, TRUE);
else else
gtk_widget_set_sensitive(widget_notify, FALSE); gtk_widget_set_sensitive(widget_notify, FALSE);
@ -1797,7 +1785,7 @@ gnc_ui_sx_initialize (void)
gnc_hook_add_dangler(HOOK_BOOK_OPENED, gnc_hook_add_dangler(HOOK_BOOK_OPENED,
(GFunc)gnc_sx_sxsincelast_book_opened, NULL); (GFunc)gnc_sx_sxsincelast_book_opened, NULL);
/* Add page to preferences page for Sheduled Transactions */ /* Add page to preferences page for Scheduled Transactions */
/* The parameters are; glade file, items to add from glade file - last being the dialog, preference tab name */ /* The parameters are; glade file, items to add from glade file - last being the dialog, preference tab name */
gnc_preferences_add_page ("dialog-sx.glade", gnc_preferences_add_page ("dialog-sx.glade",
"create_days_adj,remind_days_adj,sx_prefs", "create_days_adj,remind_days_adj,sx_prefs",

4
src/gnome/dialog-sx-editor.h
View File

@ -29,11 +29,11 @@
#define DIALOG_SCHEDXACTION_EDITOR_CM_CLASS "dialog-scheduledtransaction-editor" #define DIALOG_SCHEDXACTION_EDITOR_CM_CLASS "dialog-scheduledtransaction-editor"
#define SXED_GCONF_SECTION "dialogs/scheduled_trans/transaction_editor" #define SXED_GCONF_SECTION "dialogs/scheduled_trans/transaction_editor"
#define KEY_CREATE_AUTO "create_auto"
#define KEY_NOTIFY "notify"
#define KEY_CREATE_DAYS "create_days" #define KEY_CREATE_DAYS "create_days"
#define KEY_REMIND_DAYS "remind_days" #define KEY_REMIND_DAYS "remind_days"
#define GNC_PREFS_GROUP_SXED "dialogs.sxs.transaction_editor" #define GNC_PREFS_GROUP_SXED "dialogs.sxs.transaction_editor"
#define GNC_PREF_CREATE_AUTO "create_auto"
#define GNC_PREF_NOTIFY "notify"
typedef struct _GncSxEditorDialog GncSxEditorDialog; typedef struct _GncSxEditorDialog GncSxEditorDialog;

32
src/gnome/dialog-sx-editor2.c
View File

@ -60,6 +60,7 @@
#include "gnc-ledger-display.h" #include "gnc-ledger-display.h"
#include "gnc-plugin-page.h" #include "gnc-plugin-page.h"
#include "gnc-plugin-page-register2.h" #include "gnc-plugin-page-register2.h"
#include "gnc-prefs.h"
#include "gnc-ui.h" #include "gnc-ui.h"
#include "gnc-ui-util.h" #include "gnc-ui-util.h"
#include "gnc-tree-model-split-reg.h" #include "gnc-tree-model-split-reg.h"
@ -144,7 +145,6 @@ struct _GncSxEditorDialog2
static void schedXact_editor_create_freq_sel (GncSxEditorDialog2 *sxed); static void schedXact_editor_create_freq_sel (GncSxEditorDialog2 *sxed);
static void schedXact_editor_create_ledger (GncSxEditorDialog2 *sxed); static void schedXact_editor_create_ledger (GncSxEditorDialog2 *sxed);
static void schedXact_editor_populate (GncSxEditorDialog2 *); static void schedXact_editor_populate (GncSxEditorDialog2 *);
static void gnc_sxed_record_size (GncSxEditorDialog2 *sxed);
static void endgroup_rb_toggled_cb (GtkButton *b, gpointer d); static void endgroup_rb_toggled_cb (GtkButton *b, gpointer d);
static void set_endgroup_toggle_states (GncSxEditorDialog2 *sxed, EndType t); static void set_endgroup_toggle_states (GncSxEditorDialog2 *sxed, EndType t);
static void advance_toggled_cb (GtkButton *b, GncSxEditorDialog2 *sxed); static void advance_toggled_cb (GtkButton *b, GncSxEditorDialog2 *sxed);
@ -179,7 +179,7 @@ sxed_close_handler(gpointer user_data)
GncSxEditorDialog2 *sxed = user_data; GncSxEditorDialog2 *sxed = user_data;
gnc_sxed_reg_check_close(sxed); gnc_sxed_reg_check_close(sxed);
gnc_sxed_record_size(sxed); gnc_save_window_size( GNC_PREFS_GROUP_SXED, GTK_WINDOW(sxed->dialog) );
gtk_widget_destroy(sxed->dialog); gtk_widget_destroy(sxed->dialog);
/* The data will be cleaned up in the destroy handler. */ /* The data will be cleaned up in the destroy handler. */
} }
@ -1229,7 +1229,7 @@ gnc_ui_scheduled_xaction_editor_dialog_create2 (SchedXaction *sx,
/* Allow resize */ /* Allow resize */
gtk_window_set_resizable (GTK_WINDOW (sxed->dialog), TRUE); gtk_window_set_resizable (GTK_WINDOW (sxed->dialog), TRUE);
gnc_restore_window_size (SXED_GCONF_SECTION, GTK_WINDOW (sxed->dialog)); gnc_restore_window_size (GNC_PREFS_GROUP_SXED, GTK_WINDOW (sxed->dialog));
/* create the frequency-selection widget and example [dense-]calendar. */ /* create the frequency-selection widget and example [dense-]calendar. */
schedXact_editor_create_freq_sel (sxed); schedXact_editor_create_freq_sel (sxed);
@ -1259,14 +1259,6 @@ gnc_ui_scheduled_xaction_editor_dialog_create2 (SchedXaction *sx,
} }
static
void
gnc_sxed_record_size (GncSxEditorDialog2 *sxed)
{
gnc_save_window_size (SXED_GCONF_SECTION, GTK_WINDOW (sxed->dialog));
}
static static
void void
schedXact_editor_create_freq_sel (GncSxEditorDialog2 *sxed) schedXact_editor_create_freq_sel (GncSxEditorDialog2 *sxed)
@ -1408,9 +1400,9 @@ schedXact_editor_populate (GncSxEditorDialog2 *sxed)
if (sxed->newsxP) if (sxed->newsxP)
{ {
autoCreateState = autoCreateState =
gnc_gconf_get_bool (SXED_GCONF_SECTION, KEY_CREATE_AUTO, NULL); gnc_prefs_get_bool (GNC_PREFS_GROUP_SXED, GNC_PREF_CREATE_AUTO);
notifyState = notifyState =
gnc_gconf_get_bool (SXED_GCONF_SECTION, KEY_NOTIFY, NULL); gnc_prefs_get_bool (GNC_PREFS_GROUP_SXED, GNC_PREF_NOTIFY);
} }
else else
{ {
@ -1661,23 +1653,19 @@ sxed_excal_update_adapt_cb (GtkObject *o, gpointer ud)
static void static void
on_sx_check_toggled_cb (GtkWidget *togglebutton, on_sx_check_toggled_cb (GtkWidget *togglebutton, gpointer user_data)
gpointer user_data)
{ {
GtkWidget *widget_create, *widget_notify; GtkWidget *widget_notify;
gboolean active; // , notify;
GHashTable *table; GHashTable *table;
PINFO("Togglebutton is %p and user_data is %p", togglebutton, user_data); PINFO("Togglebutton is %p and user_data is %p", togglebutton, user_data);
PINFO("Togglebutton builder name is %s", gtk_buildable_get_name (GTK_BUILDABLE (togglebutton))); PINFO("Togglebutton builder name is %s", gtk_buildable_get_name (GTK_BUILDABLE (togglebutton)));
/* We need to use the hash table to find the required widget to activate. */ /* We need to use the hash table to find the required widget to activate. */
table = g_object_get_data (G_OBJECT (user_data), "widget_hash"); table = g_object_get_data(G_OBJECT(user_data), "prefs_widget_hash");
widget_create = g_hash_table_lookup (table, "gconf/dialogs/scheduled_trans/transaction_editor/create_auto"); widget_notify = g_hash_table_lookup(table, "pref/" GNC_PREFS_GROUP_SXED "/" GNC_PREF_NOTIFY);
widget_notify = g_hash_table_lookup (table, "gconf/dialogs/scheduled_trans/transaction_editor/notify");
active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget_create)); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(togglebutton)))
if (active)
gtk_widget_set_sensitive (widget_notify, TRUE); gtk_widget_set_sensitive (widget_notify, TRUE);
else else
gtk_widget_set_sensitive (widget_notify, FALSE); gtk_widget_set_sensitive (widget_notify, FALSE);

5
src/gnome/dialog-sx-editor2.h
View File

@ -29,10 +29,11 @@
#define DIALOG_SCHEDXACTION2_EDITOR_CM_CLASS "dialog-scheduledtransaction-editor" #define DIALOG_SCHEDXACTION2_EDITOR_CM_CLASS "dialog-scheduledtransaction-editor"
#define SXED_GCONF_SECTION "dialogs/scheduled_trans/transaction_editor" #define SXED_GCONF_SECTION "dialogs/scheduled_trans/transaction_editor"
#define KEY_CREATE_AUTO "create_auto"
#define KEY_NOTIFY "notify"
#define KEY_CREATE_DAYS "create_days" #define KEY_CREATE_DAYS "create_days"
#define KEY_REMIND_DAYS "remind_days" #define KEY_REMIND_DAYS "remind_days"
#define GNC_PREFS_GROUP_SXED "dialogs.sxs.transaction_editor"
#define GNC_PREF_CREATE_AUTO "create_auto"
#define GNC_PREF_NOTIFY "notify"
typedef struct _GncSxEditorDialog2 GncSxEditorDialog2; typedef struct _GncSxEditorDialog2 GncSxEditorDialog2;

5
src/gnome/dialog-sx-from-trans.c
View File

@ -37,6 +37,7 @@
#include "gnc-engine.h" #include "gnc-engine.h"
#include "engine-helpers.h" #include "engine-helpers.h"
#include "gnc-gconf-utils.h" #include "gnc-gconf-utils.h"
#include "gnc-prefs.h"
#include "gnc-ui-util.h" #include "gnc-ui-util.h"
#include "gnc-ui.h" #include "gnc-ui.h"
#include "qof.h" #include "qof.h"
@ -498,9 +499,9 @@ sxftd_compute_sx(SXFromTransInfo *sxfti)
gint daysInAdvance; gint daysInAdvance;
autoCreateState = autoCreateState =
gnc_gconf_get_bool( SXED_GCONF_SECTION, KEY_CREATE_AUTO, NULL ); gnc_prefs_get_bool (GNC_PREFS_GROUP_SXED, GNC_PREF_CREATE_AUTO);
notifyState = notifyState =
gnc_gconf_get_bool( SXED_GCONF_SECTION, KEY_NOTIFY, NULL ); gnc_prefs_get_bool (GNC_PREFS_GROUP_SXED, GNC_PREF_NOTIFY);
xaccSchedXactionSetAutoCreate( sx, xaccSchedXactionSetAutoCreate( sx,
autoCreateState, autoCreateState,
(autoCreateState & notifyState) ); (autoCreateState & notifyState) );

9
src/gnome/dialog-sx-since-last-run.c
View File

@ -41,6 +41,7 @@
#include "gnc-sx-instance-model.h" #include "gnc-sx-instance-model.h"
#include "dialog-sx-since-last-run.h" #include "dialog-sx-since-last-run.h"
#include "gnc-prefs.h"
#include "gnc-ui-util.h" #include "gnc-ui-util.h"
#include "Query.h" #include "Query.h"
#include "qof.h" #include "qof.h"
@ -50,7 +51,6 @@
/*################## Added for Reg2 #################*/ /*################## Added for Reg2 #################*/
#include "gnc-main-window.h" #include "gnc-main-window.h"
#include "gnc-component-manager.h" #include "gnc-component-manager.h"
#include "gnc-gconf-utils.h"
#include "gnc-gui-query.h" #include "gnc-gui-query.h"
#include "gnc-session.h" #include "gnc-session.h"
@ -60,8 +60,9 @@
G_GNUC_UNUSED static QofLogModule log_module = GNC_MOD_GUI_SX; G_GNUC_UNUSED static QofLogModule log_module = GNC_MOD_GUI_SX;
#define DIALOG_SX_SINCE_LAST_RUN_CM_CLASS "dialog-sx-since-last-run" #define DIALOG_SX_SINCE_LAST_RUN_CM_CLASS "dialog-sx-since-last-run"
#define GCONF_SECTION "dialogs/scheduled_trans/since_last_run"
#define GNC_PREFS_GROUP "dialogs.sxs.since_last_run" #define GNC_PREFS_GROUP "dialogs.sxs.since_last_run"
#define GNC_PREF_SHOW_AT_FOPEN "show_at_file_open"
struct _GncSxSinceLastRunDialog struct _GncSxSinceLastRunDialog
{ {
@ -799,7 +800,7 @@ gnc_sx_sxsincelast_book_opened(void)
GncSxInstanceModel *inst_model; GncSxInstanceModel *inst_model;
GncSxSummary summary; GncSxSummary summary;
if (!gnc_gconf_get_bool(GCONF_SECTION, "show_at_file_open", NULL)) if (!gnc_prefs_get_bool (GNC_PREFS_GROUP, GNC_PREF_SHOW_AT_FOPEN))
return; return;
inst_model = gnc_sx_get_current_instances(); inst_model = gnc_sx_get_current_instances();

5
src/gnome/dialog-tax-info.c
View File

@ -37,6 +37,7 @@
#include "gnc-ui-util.h" #include "gnc-ui-util.h"
#include "dialog-utils.h" #include "dialog-utils.h"
#include "gnc-gconf-utils.h" #include "gnc-gconf-utils.h"
#include "gnc-prefs.h"
#include "gnc-tree-view-account.h" #include "gnc-tree-view-account.h"
#include "gnc-component-manager.h" #include "gnc-component-manager.h"
#include "gnc-session.h" #include "gnc-session.h"
@ -1462,7 +1463,7 @@ gnc_tax_info_dialog_create (GtkWidget * parent, TaxInfoDialog *ti_dialog)
ti_dialog->paned = GTK_WIDGET(gtk_builder_get_object (builder, "paned")); ti_dialog->paned = GTK_WIDGET(gtk_builder_get_object (builder, "paned"));
if (gnc_gconf_get_bool(GCONF_GENERAL, KEY_SAVE_GEOMETRY, NULL)) if (gnc_prefs_get_bool(GNC_PREFS_GROUP_GENERAL, GNC_PREF_SAVE_GEOMETRY))
{ {
gint position = gnc_gconf_get_int(GCONF_SECTION, PANED_POSITION, NULL); gint position = gnc_gconf_get_int(GCONF_SECTION, PANED_POSITION, NULL);
gtk_paned_set_position(GTK_PANED(ti_dialog->paned), position); gtk_paned_set_position(GTK_PANED(ti_dialog->paned), position);
@ -1475,7 +1476,7 @@ close_handler (gpointer user_data)
{ {
TaxInfoDialog *ti_dialog = user_data; TaxInfoDialog *ti_dialog = user_data;
if (gnc_gconf_get_bool(GCONF_GENERAL, KEY_SAVE_GEOMETRY, NULL)) if (gnc_prefs_get_bool(GNC_PREFS_GROUP_GENERAL, GNC_PREF_SAVE_GEOMETRY))
{ {
gnc_gconf_set_int(GCONF_SECTION, PANED_POSITION, gnc_gconf_set_int(GCONF_SECTION, PANED_POSITION,
gtk_paned_get_position(GTK_PANED(ti_dialog->paned)), NULL); gtk_paned_get_position(GTK_PANED(ti_dialog->paned)), NULL);

7
src/gnome/gtkbuilder/dialog-sx.glade
View File

@ -150,7 +150,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="gconf/dialogs/scheduled_trans/since_last_run/show_at_file_open"> <object class="GtkCheckButton" id="pref/dialogs.sxs.since_last_run/show_at_file_open">
<property name="label" translatable="yes">_Run when data file opened</property> <property name="label" translatable="yes">_Run when data file opened</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
@ -170,7 +170,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="gconf/dialogs/scheduled_trans/transaction_editor/create_auto"> <object class="GtkCheckButton" id="pref/dialogs.sxs.transaction_editor/create_auto">
<property name="label" translatable="yes">_Auto-create new transactions</property> <property name="label" translatable="yes">_Auto-create new transactions</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
@ -328,7 +328,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="gconf/dialogs/scheduled_trans/transaction_editor/notify"> <object class="GtkCheckButton" id="pref/dialogs.sxs.transaction_editor/notify">
<property name="label" translatable="yes">_Notify before transactions are created </property> <property name="label" translatable="yes">_Notify before transactions are created </property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property> <property name="sensitive">False</property>
@ -338,7 +338,6 @@
<property name="use_action_appearance">False</property> <property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<signal name="toggled" handler="on_sx_check_toggled_cb" swapped="no"/>
</object> </object>
<packing> <packing>
<property name="right_attach">4</property> <property name="right_attach">4</property>

4
src/import-export/aqbanking/dialog-ab.glade
View File

@ -815,7 +815,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="gconf/dialogs/import/hbci/close_on_finish"> <object class="GtkCheckButton" id="pref/dialogs.import.hbci/close_on_finish">
<property name="label" translatable="yes">_Close log window when finished</property> <property name="label" translatable="yes">_Close log window when finished</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
@ -834,7 +834,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="gconf/dialogs/import/hbci/remember_pin"> <object class="GtkCheckButton" id="pref/dialogs.import.hbci/remember_pin">
<property name="label" translatable="yes">Remember _PIN</property> <property name="label" translatable="yes">Remember _PIN</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>

4
src/import-export/aqbanking/gnc-ab-utils.c
View File

@ -38,9 +38,9 @@
#include "dialog-ab-trans.h" #include "dialog-ab-trans.h"
#include "gnc-ab-kvp.h" #include "gnc-ab-kvp.h"
#include "gnc-ab-utils.h" #include "gnc-ab-utils.h"
#include "gnc-gconf-utils.h"
#include "gnc-glib-utils.h" #include "gnc-glib-utils.h"
#include "gnc-gwen-gui.h" #include "gnc-gwen-gui.h"
#include "gnc-prefs.h"
#include "gnc-ui.h" #include "gnc-ui.h"
#include "import-account-matcher.h" #include "import-account-matcher.h"
#include "import-main-matcher.h" #include "import-main-matcher.h"
@ -93,7 +93,7 @@ gnc_GWEN_Init(void)
GWEN_Init(); GWEN_Init();
/* Initialize gwen logging */ /* Initialize gwen logging */
if (gnc_gconf_get_bool(GCONF_SECTION_AQBANKING, KEY_VERBOSE_DEBUG, NULL)) if (gnc_prefs_get_bool(GNC_PREFS_GROUP_AQBANKING, GNC_PREF_VERBOSE_DEBUG))
{ {
if (!gwen_logging) if (!gwen_logging)
{ {

2
src/import-export/aqbanking/gnc-ab-utils.h
View File

@ -75,7 +75,7 @@ G_BEGIN_DECLS
#define KEY_FORMAT_SWIFT940 "format_swift_mt940" #define KEY_FORMAT_SWIFT940 "format_swift_mt940"
#define KEY_FORMAT_SWIFT942 "format_swift_mt942" #define KEY_FORMAT_SWIFT942 "format_swift_mt942"
#define KEY_FORMAT_DTAUS "format_dtaus" #define KEY_FORMAT_DTAUS "format_dtaus"
#define KEY_VERBOSE_DEBUG "verbose_debug" #define GNC_PREF_VERBOSE_DEBUG "verbose_debug"
typedef struct _GncABImExContextImport GncABImExContextImport; typedef struct _GncABImExContextImport GncABImExContextImport;

50
src/import-export/aqbanking/gnc-gwen-gui.c
View File

@ -38,9 +38,9 @@
#include "dialog-utils.h" #include "dialog-utils.h"
#include "gnc-ab-utils.h" #include "gnc-ab-utils.h"
#include "gnc-component-manager.h" #include "gnc-component-manager.h"
#include "gnc-gconf-utils.h"
#include "gnc-gwen-gui.h" #include "gnc-gwen-gui.h"
#include "gnc-session.h" #include "gnc-session.h"
#include "gnc-prefs.h"
#include "gnc-ui.h" #include "gnc-ui.h"
#include "gnc-plugin-aqbanking.h" #include "gnc-plugin-aqbanking.h"
#include "md5.h" #include "md5.h"
@ -57,8 +57,8 @@
#define GWEN_GUI_CM_CLASS "dialog-hbcilog" #define GWEN_GUI_CM_CLASS "dialog-hbcilog"
#define GNC_PREFS_GROUP_CONNECTION GNC_PREFS_GROUP_AQBANKING ".connection_dialog" #define GNC_PREFS_GROUP_CONNECTION GNC_PREFS_GROUP_AQBANKING ".connection_dialog"
#define KEY_CLOSE_ON_FINISH "close_on_finish" #define GNC_PREF_CLOSE_ON_FINISH "close_on_finish"
#define KEY_REMEMBER_PIN "remember_pin" #define GNC_PREF_REMEMBER_PIN "remember_pin"
#ifdef USING_GWENHYWFAR_GTK2_GUI #ifdef USING_GWENHYWFAR_GTK2_GUI
# include <gwen-gui-gtk2/gtk2_gui.h> # include <gwen-gui-gtk2/gtk2_gui.h>
@ -103,15 +103,14 @@ void gnc_GWEN_Gui_shutdown(void)
void void
gnc_GWEN_Gui_set_close_flag(gboolean close_when_finished) gnc_GWEN_Gui_set_close_flag(gboolean close_when_finished)
{ {
gnc_gconf_set_bool( gnc_prefs_set_bool(
GCONF_SECTION_AQBANKING, KEY_CLOSE_ON_FINISH, GNC_PREFS_GROUP_AQBANKING, GNC_PREF_CLOSE_ON_FINISH,
close_when_finished, close_when_finished);
NULL);
} }
gboolean gboolean
gnc_GWEN_Gui_get_close_flag() gnc_GWEN_Gui_get_close_flag()
{ {
return gnc_gconf_get_bool(GCONF_SECTION_AQBANKING, KEY_CLOSE_ON_FINISH, NULL); return gnc_prefs_get_bool (GNC_PREFS_GROUP_AQBANKING, GNC_PREF_CLOSE_ON_FINISH);
} }
gboolean gboolean
@ -392,10 +391,9 @@ gnc_GWEN_Gui_shutdown(void)
void void
gnc_GWEN_Gui_set_close_flag(gboolean close_when_finished) gnc_GWEN_Gui_set_close_flag(gboolean close_when_finished)
{ {
gnc_gconf_set_bool( gnc_prefs_set_bool(
GCONF_SECTION_AQBANKING, KEY_CLOSE_ON_FINISH, GNC_PREFS_GROUP_AQBANKING, GNC_PREF_CLOSE_ON_FINISH,
close_when_finished, close_when_finished);
NULL);
if (full_gui) if (full_gui)
{ {
@ -412,7 +410,7 @@ gnc_GWEN_Gui_set_close_flag(gboolean close_when_finished)
gboolean gboolean
gnc_GWEN_Gui_get_close_flag() gnc_GWEN_Gui_get_close_flag()
{ {
return gnc_gconf_get_bool(GCONF_SECTION_AQBANKING, KEY_CLOSE_ON_FINISH, NULL); return gnc_prefs_get_bool (GNC_PREFS_GROUP_AQBANKING, GNC_PREF_CLOSE_ON_FINISH);
} }
gboolean gboolean
@ -433,7 +431,7 @@ gnc_GWEN_Gui_show_dialog()
} }
gtk_toggle_button_set_active( gtk_toggle_button_set_active(
GTK_TOGGLE_BUTTON(gui->close_checkbutton), GTK_TOGGLE_BUTTON(gui->close_checkbutton),
gnc_gconf_get_bool(GCONF_SECTION_AQBANKING, KEY_CLOSE_ON_FINISH, NULL)); gnc_prefs_get_bool (GNC_PREFS_GROUP_AQBANKING, GNC_PREF_CLOSE_ON_FINISH));
show_dialog(gui, FALSE); show_dialog(gui, FALSE);
@ -547,7 +545,7 @@ setup_dialog(GncGWENGui *gui)
gtk_toggle_button_set_active( gtk_toggle_button_set_active(
GTK_TOGGLE_BUTTON(gui->close_checkbutton), GTK_TOGGLE_BUTTON(gui->close_checkbutton),
gnc_gconf_get_bool(GCONF_SECTION_AQBANKING, KEY_CLOSE_ON_FINISH, NULL)); gnc_prefs_get_bool (GNC_PREFS_GROUP_AQBANKING, GNC_PREF_CLOSE_ON_FINISH));
component_id = gnc_register_gui_component(GWEN_GUI_CM_CLASS, NULL, component_id = gnc_register_gui_component(GWEN_GUI_CM_CLASS, NULL,
cm_close_handler, gui); cm_close_handler, gui);
@ -620,8 +618,8 @@ reset_dialog(GncGWENGui *gui)
gui->state = INIT; gui->state = INIT;
gui->min_loglevel = GWEN_LoggerLevel_Verbous; gui->min_loglevel = GWEN_LoggerLevel_Verbous;
cache_passwords = gnc_gconf_get_bool(GCONF_SECTION_AQBANKING, cache_passwords = gnc_prefs_get_bool(GNC_PREFS_GROUP_AQBANKING,
KEY_REMEMBER_PIN, NULL); GNC_PREF_REMEMBER_PIN);
enable_password_cache(gui, cache_passwords); enable_password_cache(gui, cache_passwords);
if (!gui->accepted_certs) if (!gui->accepted_certs)
@ -719,10 +717,9 @@ hide_dialog(GncGWENGui *gui)
gnc_plugin_aqbanking_set_logwindow_visible(FALSE); gnc_plugin_aqbanking_set_logwindow_visible(FALSE);
/* Remember whether the dialog is to be closed when finished */ /* Remember whether the dialog is to be closed when finished */
gnc_gconf_set_bool( gnc_prefs_set_bool(
GCONF_SECTION_AQBANKING, KEY_CLOSE_ON_FINISH, GNC_PREFS_GROUP_AQBANKING, GNC_PREF_CLOSE_ON_FINISH,
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gui->close_checkbutton)), gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gui->close_checkbutton)));
NULL);
/* Remember size and position of the dialog */ /* Remember size and position of the dialog */
gnc_save_window_size(GNC_PREFS_GROUP_CONNECTION, GTK_WINDOW(gui->dialog)); gnc_save_window_size(GNC_PREFS_GROUP_CONNECTION, GTK_WINDOW(gui->dialog));
@ -1060,8 +1057,8 @@ get_input(GncGWENGui *gui, guint32 flags, const gchar *title, const gchar *text,
remember_pin = gtk_toggle_button_get_active( remember_pin = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(remember_pin_checkbutton)); GTK_TOGGLE_BUTTON(remember_pin_checkbutton));
enable_password_cache(gui, remember_pin); enable_password_cache(gui, remember_pin);
gnc_gconf_set_bool(GCONF_SECTION_AQBANKING, KEY_REMEMBER_PIN, gnc_prefs_set_bool(GNC_PREFS_GROUP_AQBANKING, GNC_PREF_REMEMBER_PIN,
remember_pin, NULL); remember_pin);
} }
internal_input = gtk_entry_get_text(GTK_ENTRY(input_entry)); internal_input = gtk_entry_get_text(GTK_ENTRY(input_entry));
@ -1618,10 +1615,9 @@ ggg_close_toggled_cb(GtkToggleButton *button, gpointer user_data)
ENTER("gui=%p", gui); ENTER("gui=%p", gui);
gnc_gconf_set_bool( gnc_prefs_set_bool(
GCONF_SECTION_AQBANKING, KEY_CLOSE_ON_FINISH, GNC_PREFS_GROUP_AQBANKING, GNC_PREF_CLOSE_ON_FINISH,
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)), gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
NULL);
LEAVE(" "); LEAVE(" ");
} }

10
src/import-export/csv-export/assistant-csv-export.c
View File

@ -35,6 +35,7 @@
#include "gnc-component-manager.h" #include "gnc-component-manager.h"
#include "gnc-date-edit.h" #include "gnc-date-edit.h"
#include "gnc-gconf-utils.h" #include "gnc-gconf-utils.h"
#include "gnc-prefs.h"
#include "gnc-tree-view-account.h" #include "gnc-tree-view-account.h"
#include "dialog-utils.h" #include "dialog-utils.h"
#include "Query.h" #include "Query.h"
@ -747,8 +748,11 @@ csv_export_assistant_summary_page_prepare (GtkAssistant *assistant,
gchar *text, *mtext; gchar *text, *mtext;
/* Save the Window size, paned position and directory */ /* Save the Window size, paned position and directory */
gnc_gconf_set_int(GCONF_SECTION, PANED_POSITION, if (gnc_prefs_get_bool(GNC_PREFS_GROUP_GENERAL, GNC_PREF_SAVE_GEOMETRY))
gtk_paned_get_position(GTK_PANED(info->csva.paned)), NULL); {
gnc_gconf_set_int(GCONF_SECTION, PANED_POSITION,
gtk_paned_get_position(GTK_PANED(info->csva.paned)), NULL);
}
gnc_set_default_directory(GNC_PREFS_GROUP, info->starting_dir); gnc_set_default_directory(GNC_PREFS_GROUP, info->starting_dir);
if (info->failed) if (info->failed)
@ -1008,7 +1012,7 @@ csv_export_assistant_create (CsvExportInfo *info)
info->csva.paned = GTK_WIDGET(gtk_builder_get_object (builder, "paned")); info->csva.paned = GTK_WIDGET(gtk_builder_get_object (builder, "paned"));
if (gnc_gconf_get_bool(GCONF_SECTION, KEY_SAVE_GEOMETRY, NULL)) if (gnc_prefs_get_bool(GNC_PREFS_GROUP_GENERAL, GNC_PREF_SAVE_GEOMETRY))
{ {
gint position = gnc_gconf_get_int(GCONF_SECTION, PANED_POSITION, NULL); gint position = gnc_gconf_get_int(GCONF_SECTION, PANED_POSITION, NULL);
gtk_paned_set_position(GTK_PANED(info->csva.paned), position); gtk_paned_set_position(GTK_PANED(info->csva.paned), position);

8
src/import-export/dialog-import.glade
View File

@ -13,7 +13,7 @@
<property name="n_rows">10</property> <property name="n_rows">10</property>
<property name="n_columns">4</property> <property name="n_columns">4</property>
<child> <child>
<object class="GtkCheckButton" id="gconf/dialogs/import/generic_matcher/enable_skip"> <object class="GtkCheckButton" id="pref/dialogs.import.generic/enable_skip">
<property name="label" translatable="yes">Enable skip transaction action</property> <property name="label" translatable="yes">Enable skip transaction action</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
@ -35,7 +35,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="gconf/dialogs/import/generic_matcher/enable_update"> <object class="GtkCheckButton" id="pref/dialogs.import.generic/enable_update">
<property name="label" translatable="yes">Enable update match action</property> <property name="label" translatable="yes">Enable update match action</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
@ -248,7 +248,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="gconf/dialogs/import/generic_matcher/use_bayes"> <object class="GtkCheckButton" id="pref/dialogs.import.generic/use_bayes">
<property name="label" translatable="yes">Use _bayesian matching</property> <property name="label" translatable="yes">Use _bayesian matching</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
@ -270,7 +270,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="gconf/dialogs/import/generic_matcher/auto_create_commodity"> <object class="GtkCheckButton" id="pref/dialogs.import.generic/auto_create_commodity">
<property name="label" translatable="yes">Automatically create new commodities</property> <property name="label" translatable="yes">Automatically create new commodities</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>

8
src/import-export/import-backend.c
View File

@ -35,17 +35,15 @@
#include <errno.h> #include <errno.h>
#include "gnc-gconf-utils.h"
#include "import-backend.h" #include "import-backend.h"
#include "import-utilities.h" #include "import-utilities.h"
#include "Account.h" #include "Account.h"
#include "Query.h" #include "Query.h"
#include "gnc-engine.h" #include "gnc-engine.h"
#include "engine-helpers.h" #include "engine-helpers.h"
#include "gnc-prefs.h"
#include "gnc-ui-util.h" #include "gnc-ui-util.h"
#define GCONF_SECTION "dialogs/import/generic_matcher"
#define BAYES_OPTION "use_bayes"
/********************************************************************\ /********************************************************************\
* Constants * * Constants *
@ -477,7 +475,7 @@ matchmap_find_destination (GncImportMatchMap *matchmap, GNCImportTransInfo *info
(xaccSplitGetAccount (xaccSplitGetAccount
(gnc_import_TransInfo_get_fsplit (info)))); (gnc_import_TransInfo_get_fsplit (info))));
useBayes = gnc_gconf_get_bool(GCONF_SECTION, BAYES_OPTION, NULL); useBayes = gnc_prefs_get_bool (GNC_PREFS_GROUP_IMPORT, GNC_PREF_USE_BAYES);
if (useBayes) if (useBayes)
{ {
/* get the tokens for this transaction* */ /* get the tokens for this transaction* */
@ -548,7 +546,7 @@ matchmap_store_destination (GncImportMatchMap *matchmap,
(gnc_import_TransInfo_get_fsplit (trans_info)))); (gnc_import_TransInfo_get_fsplit (trans_info))));
/* see what matching system we are currently using */ /* see what matching system we are currently using */
useBayes = gnc_gconf_get_bool(GCONF_SECTION, BAYES_OPTION, NULL); useBayes = gnc_prefs_get_bool (GNC_PREFS_GROUP_IMPORT, GNC_PREF_USE_BAYES);
if (useBayes) if (useBayes)
{ {
/* tokenize this transaction */ /* tokenize this transaction */

5
src/import-export/import-settings.c
View File

@ -30,6 +30,7 @@
#include "import-settings.h" #include "import-settings.h"
#include "gnc-gconf-utils.h" #include "gnc-gconf-utils.h"
#include "gnc-prefs.h"
/********************************************************************\ /********************************************************************\
* Default values for user prefs (or values for unimplemented prefs.* * Default values for user prefs (or values for unimplemented prefs.*
@ -83,9 +84,9 @@ gnc_import_Settings_new (void)
settings->action_skip_enabled = settings->action_skip_enabled =
gnc_gconf_get_bool(GCONF_IMPORT_SECTION, "enable_skip", NULL); gnc_prefs_get_bool (GNC_PREFS_GROUP_IMPORT, GNC_PREF_ENABLE_SKIP);
settings->action_update_enabled = settings->action_update_enabled =
gnc_gconf_get_bool(GCONF_IMPORT_SECTION, "enable_update", NULL); gnc_prefs_get_bool (GNC_PREFS_GROUP_IMPORT, GNC_PREF_ENABLE_UPDATE);
settings->action_add_enabled = DEFAULT_ACTION_ADD_ENABLED; settings->action_add_enabled = DEFAULT_ACTION_ADD_ENABLED;
settings->action_clear_enabled = DEFAULT_ACTION_CLEAR_ENABLED; settings->action_clear_enabled = DEFAULT_ACTION_CLEAR_ENABLED;
settings->clear_threshold = settings->clear_threshold =

5
src/import-export/import-settings.h
View File

@ -28,15 +28,14 @@
#ifndef GNC_GEN_SETTINGS_H #ifndef GNC_GEN_SETTINGS_H
#define GNC_GEN_SETTINGS_H #define GNC_GEN_SETTINGS_H
#include "import-utilities.h"
typedef struct _genimportsettings GNCImportSettings; typedef struct _genimportsettings GNCImportSettings;
/************************************************************************ /************************************************************************
* Getter/Setter Functions for the Data Types. * Getter/Setter Functions for the Data Types.
************************************************************************/ ************************************************************************/
/** The GConf section of the importer */
#define GCONF_IMPORT_SECTION "dialogs/import/generic_matcher"
/** Allocates a new GNCImportSettings object, and initialize it with /** Allocates a new GNCImportSettings object, and initialize it with
* the appropriate user prefs. * the appropriate user prefs.

9
src/import-export/import-utilities.h
View File

@ -25,6 +25,15 @@
#ifndef IMPORT_UTILITIES_H #ifndef IMPORT_UTILITIES_H
#define IMPORT_UTILITIES_H #define IMPORT_UTILITIES_H
/** The GConf section of the importer */
#define GCONF_IMPORT_SECTION "dialogs/import/generic_matcher"
#define GNC_PREFS_GROUP_IMPORT "dialogs.import.generic"
#define GNC_PREF_ENABLE_SKIP "enable_skip"
#define GNC_PREF_ENABLE_UPDATE "enable_update"
#define GNC_PREF_USE_BAYES "use_bayes"
#include "Account.h" #include "Account.h"
/** @name Setter-getters /** @name Setter-getters

7
src/import-export/ofx/gnc-ofx-import.c
View File

@ -46,7 +46,7 @@
#include "gnc-engine.h" #include "gnc-engine.h"
#include "gnc-ui-util.h" #include "gnc-ui-util.h"
#include "gnc-glib-utils.h" #include "gnc-glib-utils.h"
#include "gnc-gconf-utils.h" #include "gnc-prefs.h"
#include "gnome-utils/gnc-ui.h" #include "gnome-utils/gnc-ui.h"
#include "gnome-utils/dialog-account.h" #include "gnome-utils/dialog-account.h"
#include "dialog-utils.h" #include "dialog-utils.h"
@ -54,6 +54,7 @@
#include "gnc-ofx-kvp.h" #include "gnc-ofx-kvp.h"
#define GNC_PREFS_GROUP "dialogs.import.ofx" #define GNC_PREFS_GROUP "dialogs.import.ofx"
#define GNC_PREF_AUTO_COMMODITY "auto_create_commodity"
static QofLogModule log_module = GNC_MOD_IMPORT; static QofLogModule log_module = GNC_MOD_IMPORT;
@ -953,9 +954,9 @@ void gnc_file_ofx_import (void)
/* Create the Generic transaction importer GUI. */ /* Create the Generic transaction importer GUI. */
gnc_ofx_importer_gui = gnc_gen_trans_list_new(NULL, NULL, FALSE, 42); gnc_ofx_importer_gui = gnc_gen_trans_list_new(NULL, NULL, FALSE, 42);
/* Look up the needed gconf options */ /* Look up the needed preferences */
auto_create_commodity = auto_create_commodity =
gnc_gconf_get_bool(GCONF_IMPORT_SECTION, "auto_create_commodity", NULL); gnc_prefs_get_bool (GNC_PREFS_GROUP_IMPORT, GNC_PREF_AUTO_COMMODITY);
/* Initialize libofx */ /* Initialize libofx */

18
src/import-export/qif-import/assistant-qif-import.c
View File

@ -52,6 +52,7 @@
#include "gnc-gtk-utils.h" #include "gnc-gtk-utils.h"
#include "gnc-main-window.h" #include "gnc-main-window.h"
#include "gnc-plugin-page-account-tree.h" #include "gnc-plugin-page-account-tree.h"
#include "gnc-prefs.h"
#include "gnc-ui.h" #include "gnc-ui.h"
#include "guile-mappings.h" #include "guile-mappings.h"
@ -59,8 +60,8 @@
#define ASSISTANT_QIF_IMPORT_CM_CLASS "assistant-qif-import" #define ASSISTANT_QIF_IMPORT_CM_CLASS "assistant-qif-import"
#define GCONF_SECTION "dialogs/import/qif" #define GCONF_SECTION "dialogs/import/qif"
#define GNC_PREFS_GROUP "dialogs.import.qif" #define GNC_PREFS_GROUP "dialogs.import.qif"
#define GCONF_NAME_SHOW_DOC "show_doc" #define GNC_PREF_SHOW_DOC "show_doc"
#define GCONF_NAME_DEFAULT_TRANSACTION_STATUS "default_status" #define GCONF_NAME_DEFAULT_TRANSACTION_STATUS "default_status"
#define PREV_ROW "prev_row" #define PREV_ROW "prev_row"
@ -1379,18 +1380,7 @@ get_preferences(QIFImportWindow *wind)
/* Get the user's preference for showing documentation pages. */ /* Get the user's preference for showing documentation pages. */
wind->show_doc_pages = wind->show_doc_pages =
gnc_gconf_get_bool(GCONF_SECTION, GCONF_NAME_SHOW_DOC, &err); gnc_prefs_get_bool (GNC_PREFS_GROUP, GNC_PREF_SHOW_DOC);
if (err != NULL)
{
g_warning("QIF import: gnc_gconf_get_bool error: %s", err->message);
g_error_free(err);
/* Show documentation pages by default. */
g_warning("QIF import: Couldn't get %s setting from gconf.",
GCONF_NAME_SHOW_DOC);
g_warning("QIF import: Documentation pages will be shown by default.");
wind->show_doc_pages = TRUE;
}
/* Clear / Reconcile transaction if not specified in QIF file. */ /* Clear / Reconcile transaction if not specified in QIF file. */
status_pref = gnc_gconf_get_string( status_pref = gnc_gconf_get_string(

2
src/import-export/qif-import/dialog-account-picker.glade
View File

@ -26,7 +26,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="gconf/dialogs/import/qif/show_doc"> <object class="GtkCheckButton" id="pref/dialogs.import.qif/show_doc">
<property name="label" translatable="yes">_Show documentation</property> <property name="label" translatable="yes">_Show documentation</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>

5
src/register/register-gnome/table-gnome.c
View File

@ -49,6 +49,7 @@
#include "table-allgui.h" #include "table-allgui.h"
#include "table-gnome.h" #include "table-gnome.h"
#include "gnc-gconf-utils.h" #include "gnc-gconf-utils.h"
#include "gnc-prefs.h"
#include "gnc-engine.h" #include "gnc-engine.h"
#include "gnc-ledger-display.h" #include "gnc-ledger-display.h"
@ -82,7 +83,7 @@ gnc_table_save_state (Table *table, gchar * gconf_key)
if (table->ui_data == NULL) if (table->ui_data == NULL)
return; return;
if (!gnc_gconf_get_bool(GCONF_GENERAL, KEY_SAVE_GEOMETRY, NULL)) if (gnc_prefs_get_bool(GNC_PREFS_GROUP_GENERAL, GNC_PREF_SAVE_GEOMETRY))
return; return;
sheet = GNUCASH_SHEET (table->ui_data); sheet = GNUCASH_SHEET (table->ui_data);
@ -193,7 +194,7 @@ gnc_table_init_gui (GtkWidget *widget, gchar * gconf_key)
widths = gnc_header_widths_new (); widths = gnc_header_widths_new ();
if (gnc_gconf_get_bool(GCONF_GENERAL, KEY_SAVE_GEOMETRY, NULL)) if (gnc_prefs_get_bool(GNC_PREFS_GROUP_GENERAL, GNC_PREF_SAVE_GEOMETRY))
{ {
node = gnc_table_layout_get_cells (table->layout); node = gnc_table_layout_get_cells (table->layout);
for (; node; node = node->next) for (; node; node = node->next)

3
src/report/report-gnome/gnc-plugin-page-report.c
View File

@ -60,6 +60,7 @@
#include "gnc-plugin.h" #include "gnc-plugin.h"
#include "gnc-plugin-page-report.h" #include "gnc-plugin-page-report.h"
#include "gnc-plugin-file-history.h" #include "gnc-plugin-file-history.h"
#include "gnc-prefs.h"
#include "gnc-report.h" #include "gnc-report.h"
#include "gnc-session.h" #include "gnc-session.h"
#include "gnc-ui-util.h" #include "gnc-ui-util.h"
@ -1137,7 +1138,7 @@ gnc_plugin_page_report_constr_init(GncPluginPageReport *plugin_page, gint report
/* Init parent declared variables */ /* Init parent declared variables */
parent = GNC_PLUGIN_PAGE(plugin_page); parent = GNC_PLUGIN_PAGE(plugin_page);
use_new = gnc_gconf_get_bool(GCONF_GENERAL_REPORT, KEY_USE_NEW, NULL); use_new = gnc_prefs_get_bool (GNC_PREFS_GROUP_GENERAL_REPORT, GNC_PREF_USE_NEW);
name = gnc_report_name( priv->initial_report ); name = gnc_report_name( priv->initial_report );
g_object_set(G_OBJECT(plugin_page), g_object_set(G_OBJECT(plugin_page),
"page-name", name, "page-name", name,