]> Dogcows Code - chaz/homebank/blobdiff - src/ui-pref.c
import homebank-5.2.6
[chaz/homebank] / src / ui-pref.c
index d167a5811f284270cad34345facdba903d53dc72..7b927e2cdc7dd5a32f2eab88f4f48b9c3310aca3 100644 (file)
@@ -1,5 +1,5 @@
 /*  HomeBank -- Free, easy, personal accounting for everyone.
- *  Copyright (C) 1995-2017 Maxime DOYEN
+ *  Copyright (C) 1995-2019 Maxime DOYEN
  *
  *  This file is part of HomeBank.
  *
@@ -21,7 +21,7 @@
 #include "homebank.h"
 
 #include "ui-pref.h"
-#include "dsp_mainwindow.h"
+#include "dsp-mainwindow.h"
 #include "gtk-chart-colors.h"
 
 #include "ui-currency.h"
@@ -50,22 +50,17 @@ enum {
        LST_PREF_MAX
 };
 
-enum
-{
-  COLUMN_VISIBLE,
-  COLUMN_NAME,
-  COLUMN_ID,
-  NUM_COLUMNS
-};
 
 enum
 {
        PREF_GENERAL,
        PREF_INTERFACE,
-       PREF_COLUMNS,
-       PREF_DISPLAY,
+       PREF_LOCALE,    //old DISPLAY
+       PREF_TXN,               //old COLUMNS
        PREF_IMPORT,
        PREF_REPORT,
+       PREF_BACKUP,
+       PREF_FOLDERS,
        PREF_EURO,
        PREF_MAX
 };
@@ -74,10 +69,13 @@ enum
 static gchar *pref_iconname[PREF_MAX] = {
 "prf-general",
 "prf-interface",
+"prf-locale",
 "prf-columns",
-"prf-display",
+//"prf-display", 
 "prf-import",
 "prf-report",
+"prf-backup",
+"prf-folder",
 "prf-euro",                    // to be renamed
 //"prf_charts.svg"
 };
@@ -85,10 +83,12 @@ static gchar *pref_iconname[PREF_MAX] = {
 static gchar *pref_name[PREF_MAX]    = {
 N_("General"),
 N_("Interface"),
+N_("Locale"),
 N_("Transactions"),
-N_("Display format"),
 N_("Import/Export"),
 N_("Report"),
+N_("Backup"),
+N_("Folders"),
 N_("Euro minor")
 //
 };
@@ -130,6 +130,7 @@ gchar *CYA_IMPORT_OFXNAME[] = {
 N_("Ignore"),
 N_("Memo"),
 N_("Payee"),
+N_("Info"),
 NULL
 };
 
@@ -141,24 +142,20 @@ N_("Append to Payee"),
 NULL
 };
 
+gchar *CYA_IMPORT_CSVSEPARATOR[] = {
+N_("Tab"),
+N_("Comma"),
+N_("Semicolon"),
+N_("Space"),
+NULL
+};
+
+
 
 extern gchar *CYA_CHART_COLORSCHEME[];
 extern gchar *CYA_MONTHS[];
 
-typedef struct
-{
-       gshort          id;
-       gchar           *iso;
-       gchar           *name;
-       gdouble         value;
-       //gchar         *prefix_symbol;         /* max symbol is 3 digits in unicode */
-       //gchar         *suffix_symbol;         /* but mostly is 1 digit */
-       gchar           *symbol;
-       gboolean        sym_prefix;
-       gchar           *decimal_char;
-       gchar           *grouping_char;
-       gshort          frac_digits;
-} EuroParams;
+
 
 
 /*
@@ -205,22 +202,8 @@ static EuroParams euro_params[] =
 };
 
 
-GtkWidget *pref_list_create(void);
-GtkWidget *list_txn_colprefcreate(void);
-
-static void list_txn_colpref_get(GtkTreeView *treeview, gboolean *columns);
-
-
-
-
-
 /* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =*/
-typedef struct 
-{
-       gchar   *locale;
-       gchar   *name;
-       
-} LangName;
+
 
 static LangName languagenames[] =
 {
@@ -418,6 +401,9 @@ static LangName languagenames[] =
 };
 
 
+static GtkWidget *pref_list_create(void);
+
+
 static gint
 ui_language_combobox_compare_func (GtkTreeModel *model, GtkTreeIter  *a, GtkTreeIter  *b, gpointer      userdata)
 {
@@ -655,17 +641,17 @@ gboolean r;
 
        switch( type )
        {
-               case 1:
+               case PRF_PATH_WALLET:
                        path = &PREFS->path_hbfile;
                        entry = data->ST_path_hbfile;
                        title = _("Choose a default HomeBank files folder");
                        break;
-               case 2:
+               case PRF_PATH_IMPORT:
                        path = &PREFS->path_import;
                        entry = data->ST_path_import;
                        title = _("Choose a default import folder");
                        break;
-               case 3:
+               case PRF_PATH_EXPORT:
                        path = &PREFS->path_export;
                        entry = data->ST_path_export;
                        title = _("Choose a default export folder");
@@ -831,8 +817,26 @@ gboolean sensitive;
 
        sensitive = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_custom_colors));
 
+       gtk_widget_set_sensitive(data->LB_colors         , sensitive);
+       gtk_widget_set_sensitive(data->CY_colors         , sensitive);
+       gtk_widget_set_sensitive(data->LB_exp_color      , sensitive);
        gtk_widget_set_sensitive(data->GR_colors         , sensitive);
+}
 
+
+static void defpref_backuptoggle(GtkWidget *widget, gpointer user_data)
+{
+struct defpref_data *data;
+gboolean sensitive;
+
+       DB( g_print("\n[ui-pref] backup toggle\n") );
+
+       data = g_object_get_data(G_OBJECT(gtk_widget_get_ancestor(widget, GTK_TYPE_WINDOW)), "inst_data");
+
+       sensitive = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_bak_is_automatic));
+       gtk_widget_set_sensitive(data->LB_bak_max_num_copies, sensitive);
+       gtk_widget_set_sensitive(data->NB_bak_max_num_copies, sensitive);
+       gtk_widget_set_sensitive(data->GR_bak_freq          , sensitive);
 }
 
 
@@ -930,99 +934,92 @@ GdkRGBA rgba;
 
        DB( g_print("\n[ui-pref] set\n") );
 
+       // general
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_show_splash), PREFS->showsplash);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_load_last), PREFS->loadlast);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_append_scheduled), PREFS->appendscheduled);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_do_update_currency), PREFS->do_update_currency);
+       hbtk_combo_box_set_active_id(GTK_COMBO_BOX_TEXT(data->CY_daterange_wal), PREFS->date_range_wal);
+       gtk_spin_button_set_value(GTK_SPIN_BUTTON(data->NB_fiscyearday), PREFS->fisc_year_day );
+       gtk_combo_box_set_active(GTK_COMBO_BOX(data->CY_fiscyearmonth), PREFS->fisc_year_month - 1);
+
+       // files/backup
+       gtk_entry_set_text(GTK_ENTRY(data->ST_path_hbfile), PREFS->path_hbfile);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_bak_is_automatic), PREFS->bak_is_automatic);
+       gtk_spin_button_set_value(GTK_SPIN_BUTTON(data->NB_bak_max_num_copies), PREFS->bak_max_num_copies);
+
+       // interface
        if(PREFS->language != NULL)
                gtk_combo_box_set_active_id(GTK_COMBO_BOX(data->CY_language), PREFS->language);
        else
                gtk_combo_box_set_active (GTK_COMBO_BOX(data->CY_language), 0);
-
        gtk_combo_box_set_active(GTK_COMBO_BOX(data->CY_toolbar), PREFS->toolbar_style);
        //gtk_spin_button_set_value(GTK_SPIN_BUTTON(data->NB_image_size), PREFS->image_size);
 
-
-
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_custom_colors), PREFS->custom_colors);
-
        gdk_rgba_parse(&rgba, PREFS->color_exp);
        gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(data->CP_exp_color), &rgba);
-
        gdk_rgba_parse(&rgba, PREFS->color_inc);
        gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(data->CP_inc_color), &rgba);
-
        gdk_rgba_parse(&rgba, PREFS->color_warn);
        gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(data->CP_warn_color), &rgba);
-
        //gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_ruleshint), PREFS->rules_hint);
        gtk_combo_box_set_active(GTK_COMBO_BOX(data->CY_gridlines), PREFS->grid_lines);
 
-       gtk_spin_button_set_value(GTK_SPIN_BUTTON(data->NB_fiscyearday), PREFS->fisc_year_day );
-       gtk_combo_box_set_active(GTK_COMBO_BOX(data->CY_fiscyearmonth), PREFS->fisc_year_month - 1);
-       
-       gtk_entry_set_text(GTK_ENTRY(data->ST_path_hbfile), PREFS->path_hbfile);
-       gtk_entry_set_text(GTK_ENTRY(data->ST_path_import), PREFS->path_import);
-       gtk_entry_set_text(GTK_ENTRY(data->ST_path_export), PREFS->path_export);
-       //gtk_entry_set_text(GTK_ENTRY(data->ST_path_navigator), PREFS->path_navigator);
-
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_load_last), PREFS->loadlast);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_append_scheduled), PREFS->appendscheduled);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_do_update_currency), PREFS->do_update_currency);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_show_splash), PREFS->showsplash);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_herit_date), PREFS->heritdate);
+       // transactions
+       hbtk_combo_box_set_active_id(GTK_COMBO_BOX_TEXT(data->CY_daterange_txn), PREFS->date_range_txn);
+       gtk_spin_button_set_value(GTK_SPIN_BUTTON(data->ST_datefuture_nbdays), PREFS->date_future_nbdays);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_hide_reconciled), PREFS->hidereconciled);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_show_remind), PREFS->showremind);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_herit_date), PREFS->heritdate);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_memoacp), PREFS->txn_memoacp);
+       gtk_spin_button_set_value(GTK_SPIN_BUTTON(data->ST_memoacp_days), PREFS->txn_memoacp_days);
 
-       /* display */
+       // display format
        gtk_entry_set_text(GTK_ENTRY(data->ST_datefmt), PREFS->date_format);
-
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_unitismile), PREFS->vehicle_unit_ismile);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_unitisgal), PREFS->vehicle_unit_isgal);
 
-       gtk_combo_box_set_active(GTK_COMBO_BOX(data->CY_daterange_wal), PREFS->date_range_wal);
-       gtk_combo_box_set_active(GTK_COMBO_BOX(data->CY_daterange_txn), PREFS->date_range_txn);
-       gtk_spin_button_set_value(GTK_SPIN_BUTTON(data->ST_datefuture_nbdays), PREFS->date_future_nbdays);
-       gtk_combo_box_set_active(GTK_COMBO_BOX(data->CY_daterange_rep), PREFS->date_range_rep);
+       // import/export
+       gtk_combo_box_set_active(GTK_COMBO_BOX(data->CY_dtex_datefmt), PREFS->dtex_datefmt);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_dtex_ucfirst), PREFS->dtex_ucfirst);
+       gtk_combo_box_set_active(GTK_COMBO_BOX(data->CY_dtex_ofxname), PREFS->dtex_ofxname);
+       gtk_combo_box_set_active(GTK_COMBO_BOX(data->CY_dtex_ofxmemo), PREFS->dtex_ofxmemo);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_dtex_qifmemo), PREFS->dtex_qifmemo);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_dtex_qifswap), PREFS->dtex_qifswap);
+       gtk_entry_set_text(GTK_ENTRY(data->ST_path_import), PREFS->path_import);
+       gtk_entry_set_text(GTK_ENTRY(data->ST_path_export), PREFS->path_export);
+       gtk_combo_box_set_active(GTK_COMBO_BOX(data->CY_dtex_csvsep), PREFS->dtex_csvsep);
+
+       // report
+       hbtk_combo_box_set_active_id(GTK_COMBO_BOX_TEXT(data->CY_daterange_rep), PREFS->date_range_rep);
+       gtk_combo_box_set_active(GTK_COMBO_BOX(data->CY_color_scheme), PREFS->report_color_scheme);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_stat_byamount), PREFS->stat_byamount);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_stat_showrate), PREFS->stat_showrate);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_stat_showdetail), PREFS->stat_showdetail);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_budg_showdetail), PREFS->budg_showdetail);
 
        /* euro */
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_euro_enable), PREFS->euro_active);
        //gtk_combo_box_set_active(GTK_COMBO_BOX(data->CY_euro_preset), PREFS->euro_country);
        data->country = PREFS->euro_country;
        defpref_eurosetcurrency(data->window, data->country);
-
        gtk_spin_button_set_value(GTK_SPIN_BUTTON(data->NB_euro_value), PREFS->euro_value);
-
        ui_gtk_entry_set_text(data->ST_euro_symbol, PREFS->minor_cur.symbol);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_euro_isprefix), PREFS->minor_cur.sym_prefix);
        ui_gtk_entry_set_text(data->ST_euro_decimalchar, PREFS->minor_cur.decimal_char);
        ui_gtk_entry_set_text(data->ST_euro_groupingchar, PREFS->minor_cur.grouping_char);
        gtk_spin_button_set_value(GTK_SPIN_BUTTON(data->NB_euro_fracdigits), PREFS->minor_cur.frac_digits);
 
-
        //gtk_entry_set_text(GTK_ENTRY(data->ST_euro_symbol), PREFS->euro_symbol);
        //gtk_spin_button_set_value(GTK_SPIN_BUTTON(data->NB_euro_nbdec), PREFS->euro_nbdec);
        //gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_euro_thsep), PREFS->euro_thsep);
-
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_stat_byamount), PREFS->stat_byamount);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_stat_showrate), PREFS->stat_showrate);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_stat_showdetail), PREFS->stat_showdetail);
-
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_budg_showdetail), PREFS->budg_showdetail);
-
-       gtk_combo_box_set_active(GTK_COMBO_BOX(data->CY_color_scheme), PREFS->report_color_scheme);
-
-       /* import */
-       gtk_combo_box_set_active(GTK_COMBO_BOX(data->CY_dtex_datefmt), PREFS->dtex_datefmt);
-       gtk_combo_box_set_active(GTK_COMBO_BOX(data->CY_dtex_ofxname), PREFS->dtex_ofxname);
-       gtk_combo_box_set_active(GTK_COMBO_BOX(data->CY_dtex_ofxmemo), PREFS->dtex_ofxmemo);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_dtex_qifmemo), PREFS->dtex_qifmemo);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_dtex_qifswap), PREFS->dtex_qifswap);
-
-
 }
 
 
 /*
 ** get :: fill PREFS structure from widgets
 */
-
 #define RGBA_TO_INT(x) (int)(x*255)
 
 static gchar *gdk_rgba_to_hex(GdkRGBA *rgba)
@@ -1038,6 +1035,21 @@ const gchar *lang;
 
        DB( g_print("\n[ui-pref] get\n") );
 
+       // general
+       PREFS->showsplash  = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_show_splash));
+       PREFS->loadlast  = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_load_last));
+       PREFS->appendscheduled  = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_append_scheduled));
+       PREFS->do_update_currency  = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_do_update_currency));
+       PREFS->date_range_wal = hbtk_combo_box_get_active_id(GTK_COMBO_BOX_TEXT(data->CY_daterange_wal));
+       PREFS->fisc_year_day = gtk_spin_button_get_value(GTK_SPIN_BUTTON(data->NB_fiscyearday));
+       PREFS->fisc_year_month = 1 + gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_fiscyearmonth));
+
+       // files/backup
+       ui_gtk_entry_replace_text(data->ST_path_hbfile, &PREFS->path_hbfile);
+
+       PREFS->bak_is_automatic  = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_bak_is_automatic));
+       PREFS->bak_max_num_copies = gtk_spin_button_get_value(GTK_SPIN_BUTTON(data->NB_bak_max_num_copies));
+
        g_free(PREFS->language);
        PREFS->language = NULL;
        lang = gtk_combo_box_get_active_id(GTK_COMBO_BOX(data->CY_language));
@@ -1050,94 +1062,72 @@ const gchar *lang;
        //PREFS->image_size = gtk_spin_button_get_value(GTK_SPIN_BUTTON(data->NB_image_size));
 
        PREFS->custom_colors = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_custom_colors));
-
        gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(data->CP_exp_color), &rgba);
        g_free(PREFS->color_exp);
        PREFS->color_exp = gdk_rgba_to_hex(&rgba);
-
        gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(data->CP_inc_color), &rgba);
        g_free(PREFS->color_inc);
        PREFS->color_inc = gdk_rgba_to_hex(&rgba);
-
        gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(data->CP_warn_color), &rgba);
        g_free(PREFS->color_warn);
        PREFS->color_warn = gdk_rgba_to_hex(&rgba);
-
        //PREFS->rules_hint = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_ruleshint));
        PREFS->grid_lines = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_gridlines));
+       //list_txn_colpref_get(GTK_TREE_VIEW(data->LV_opecolumns), PREFS->lst_ope_columns);
 
-       PREFS->fisc_year_day = gtk_spin_button_get_value(GTK_SPIN_BUTTON(data->NB_fiscyearday));
-       PREFS->fisc_year_month = 1 + gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_fiscyearmonth));
-
-       list_txn_colpref_get(GTK_TREE_VIEW(data->LV_opecolumns), PREFS->lst_ope_columns);
-
-       g_free(PREFS->path_hbfile);
-       PREFS->path_hbfile = g_strdup(gtk_entry_get_text(GTK_ENTRY(data->ST_path_hbfile)));
-
-       ui_gtk_entry_replace_text(data->ST_path_import, &PREFS->path_import);
-
-       ui_gtk_entry_replace_text(data->ST_path_export, &PREFS->path_export);
-
-       PREFS->loadlast  = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_load_last));
-       PREFS->appendscheduled  = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_append_scheduled));
-       PREFS->do_update_currency  = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_do_update_currency));
-               
-       PREFS->showsplash  = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_show_splash));
-       PREFS->heritdate = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_herit_date));
+       // transaction 
+       PREFS->date_range_txn = hbtk_combo_box_get_active_id(GTK_COMBO_BOX_TEXT(data->CY_daterange_txn));
+       PREFS->date_future_nbdays  = gtk_spin_button_get_value(GTK_SPIN_BUTTON(data->ST_datefuture_nbdays));
        PREFS->hidereconciled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_hide_reconciled));
        PREFS->showremind = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_show_remind));
+       PREFS->heritdate = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_herit_date));
+       PREFS->txn_memoacp = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_memoacp));
+       PREFS->txn_memoacp_days = gtk_spin_button_get_value(GTK_SPIN_BUTTON(data->ST_memoacp_days));
 
-       //g_free(PREFS->path_navigator);
-       //PREFS->path_navigator = g_strdup(gtk_entry_get_text(GTK_ENTRY(data->ST_path_navigator)));
-
+       // display format
        g_free(PREFS->date_format);
        PREFS->date_format = g_strdup(gtk_entry_get_text(GTK_ENTRY(data->ST_datefmt)));
-
        PREFS->vehicle_unit_ismile = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_unitismile));
        PREFS->vehicle_unit_isgal = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_unitisgal));
 
-       PREFS->date_range_wal = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_daterange_wal));
-       PREFS->date_range_txn = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_daterange_txn));
-       PREFS->date_future_nbdays  = gtk_spin_button_get_value(GTK_SPIN_BUTTON(data->ST_datefuture_nbdays));
-       PREFS->date_range_rep = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_daterange_rep));
+       // import/export
+       PREFS->dtex_datefmt = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_dtex_datefmt));
+       PREFS->dtex_ucfirst = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_dtex_ucfirst));
+       PREFS->dtex_ofxname = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_dtex_ofxname));
+       PREFS->dtex_ofxmemo = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_dtex_ofxmemo));
+       PREFS->dtex_qifmemo = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_dtex_qifmemo));
+       PREFS->dtex_qifswap = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_dtex_qifswap));
+       ui_gtk_entry_replace_text(data->ST_path_import, &PREFS->path_import);
+       ui_gtk_entry_replace_text(data->ST_path_export, &PREFS->path_export);
+       PREFS->dtex_csvsep = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_dtex_csvsep)); 
 
-       PREFS->euro_active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_euro_enable));
+       // report
+       PREFS->date_range_rep = hbtk_combo_box_get_active_id(GTK_COMBO_BOX_TEXT(data->CY_daterange_rep));
+       PREFS->report_color_scheme = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_color_scheme));
+       PREFS->stat_byamount   = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_stat_byamount));
+       PREFS->stat_showrate   = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_stat_showrate));
+       PREFS->stat_showdetail = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_stat_showdetail));
+       PREFS->budg_showdetail = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_budg_showdetail));
 
+       // euro minor
+       PREFS->euro_active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_euro_enable));
        PREFS->euro_country = data->country;
        PREFS->euro_value = gtk_spin_button_get_value(GTK_SPIN_BUTTON(data->NB_euro_value));
        //strcpy(PREFS->euro_symbol, gtk_entry_get_text(GTK_ENTRY(data->ST_euro_symbol)));
        //PREFS->euro_nbdec = gtk_spin_button_get_value(GTK_SPIN_BUTTON(data->NB_euro_nbdec));
        //PREFS->euro_thsep = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_euro_thsep));
-
        ui_gtk_entry_replace_text(data->ST_euro_symbol, &PREFS->minor_cur.symbol);
        PREFS->minor_cur.sym_prefix = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_euro_isprefix));
        ui_gtk_entry_replace_text(data->ST_euro_decimalchar, &PREFS->minor_cur.decimal_char);
        ui_gtk_entry_replace_text(data->ST_euro_groupingchar, &PREFS->minor_cur.grouping_char);
        PREFS->minor_cur.frac_digits = gtk_spin_button_get_value(GTK_SPIN_BUTTON(data->NB_euro_fracdigits));
-
-       PREFS->stat_byamount   = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_stat_byamount));
-       PREFS->stat_showrate   = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_stat_showrate));
-       PREFS->stat_showdetail = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_stat_showdetail));
-
-       PREFS->budg_showdetail = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_budg_showdetail));
-
-       PREFS->report_color_scheme = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_color_scheme));
-
-       /* import */
-       PREFS->dtex_datefmt = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_dtex_datefmt));
-       PREFS->dtex_ofxname = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_dtex_ofxname));
-       PREFS->dtex_ofxmemo = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_dtex_ofxmemo));
-       PREFS->dtex_qifmemo = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_dtex_qifmemo));
-       PREFS->dtex_qifswap = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_dtex_qifswap));
-
        //PREFS->chart_legend = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_chartlegend));
-
 }
 
 
 static GtkWidget *defpref_page_import (struct defpref_data *data)
 {
-GtkWidget *content_grid, *group_grid, *hbox, *label, *widget;
+GtkWidget *content_grid, *group_grid, *label, *widget;
 gint crow, row;
 
        content_grid = gtk_grid_new();
@@ -1151,7 +1141,7 @@ gint crow, row;
        gtk_grid_set_column_spacing (GTK_GRID (group_grid), SPACING_MEDIUM);
        gtk_grid_attach (GTK_GRID (content_grid), group_grid, 0, crow++, 1, 1);
        
-       label = make_label_group(_("Date options"));
+       label = make_label_group(_("General options"));
        gtk_grid_attach (GTK_GRID (group_grid), label, 0, 0, 3, 1);
        
        row = 1;
@@ -1163,6 +1153,11 @@ gint crow, row;
        //gtk_grid_attach (GTK_GRID (group_grid), data->CY_option[FILTER_DATE], 1, 2, row, row+1);
        gtk_grid_attach (GTK_GRID (group_grid), widget, 2, row, 1, 1);
 
+       row++;
+       widget = gtk_check_button_new_with_mnemonic (_("Sentence _case memo/payee"));
+       data->CM_dtex_ucfirst = widget;
+       gtk_grid_attach (GTK_GRID (group_grid), widget, 1, row, 2, 1);
+       
 
        // group :: OFX/QFX options
     group_grid = gtk_grid_new ();
@@ -1174,7 +1169,7 @@ gint crow, row;
        gtk_grid_attach (GTK_GRID (group_grid), label, 0, 0, 3, 1);
        
        row = 1;
-       label = make_label_widget(_("_Name field:"));
+       label = make_label_widget(_("OFX _Name:"));
        //----------------------------------------- l, r, t, b
        gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
        widget = make_cycle(label, CYA_IMPORT_OFXNAME);
@@ -1183,7 +1178,7 @@ gint crow, row;
        gtk_grid_attach (GTK_GRID (group_grid), widget, 2, row, 1, 1);
 
        row++;
-       label = make_label_widget(_("_Memo field:"));
+       label = make_label_widget(_("OFX _Memo:"));
        //----------------------------------------- l, r, t, b
        gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
        widget = make_cycle(label, CYA_IMPORT_OFXMEMO);
@@ -1201,62 +1196,33 @@ gint crow, row;
        gtk_grid_attach (GTK_GRID (group_grid), label, 0, 0, 3, 1);
        
        row = 1;
-       label = make_label_widget(_("Memos:"));
-       gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
-       widget = gtk_check_button_new_with_mnemonic (_("_Import"));
+       widget = gtk_check_button_new_with_mnemonic (_("_Import memos"));
        data->CM_dtex_qifmemo = widget;
-       gtk_grid_attach (GTK_GRID (group_grid), widget, 2, row, 1, 1);
-       widget = gtk_check_button_new_with_mnemonic (_("_Swap with payees"));
+       gtk_grid_attach (GTK_GRID (group_grid), widget, 1, row, 1, 1);
+       widget = gtk_check_button_new_with_mnemonic (_("_Swap memos with payees"));
        data->CM_dtex_qifswap = widget;
-       gtk_grid_attach (GTK_GRID (group_grid), widget, 3, row, 1, 1);
-
+       gtk_grid_attach (GTK_GRID (group_grid), widget, 2, row, 1, 1);
 
-       // group :: Files folder
+       // group :: other options
     group_grid = gtk_grid_new ();
        gtk_grid_set_row_spacing (GTK_GRID (group_grid), SPACING_SMALL);
        gtk_grid_set_column_spacing (GTK_GRID (group_grid), SPACING_MEDIUM);
        gtk_grid_attach (GTK_GRID (content_grid), group_grid, 0, crow++, 1, 1);
        
-       label = make_label_group(_("Files folder"));
+       label = make_label_group(_("CSV options"));
        gtk_grid_attach (GTK_GRID (group_grid), label, 0, 0, 3, 1);
-       
-       row = 1;
-       label = make_label_widget(_("_Import:"));
-       //----------------------------------------- l, r, t, b
-       gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
 
-       hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-       gtk_widget_set_hexpand (hbox, TRUE);
-       gtk_grid_attach (GTK_GRID (group_grid), hbox, 2, row, 1, 1);
-
-       widget = make_string(label);
-       data->ST_path_import = widget;
-       gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET(widget)), GTK_STYLE_CLASS_LINKED);
-       gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
-
-       //widget = gtk_button_new_with_label("...");
-       widget = gtk_button_new_from_icon_name(ICONNAME_FOLDER, GTK_ICON_SIZE_BUTTON);
-       data->BT_path_import = widget;
-       gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
+       row = 1;
+       label = make_label(_("(transaction import only)"), 0.0, 0.5);
+       gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 2, 1);
 
        row++;
-       label = make_label_widget(_("_Export:"));
+       label = make_label_widget(_("Separator:"));
        //----------------------------------------- l, r, t, b
        gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
-
-       hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-       gtk_widget_set_hexpand (hbox, TRUE);
-       gtk_grid_attach (GTK_GRID (group_grid), hbox, 2, row, 1, 1);
-
-       widget = make_string(label);
-       data->ST_path_export = widget;
-       gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET(widget)), GTK_STYLE_CLASS_LINKED);
-       gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
-
-       //widget = gtk_button_new_with_label("...");
-       widget = gtk_button_new_from_icon_name(ICONNAME_FOLDER, GTK_ICON_SIZE_BUTTON);
-       data->BT_path_export = widget;
-       gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
+       widget = make_cycle(label, CYA_IMPORT_CSVSEPARATOR);
+       data->CY_dtex_csvsep = widget;
+       gtk_grid_attach (GTK_GRID (group_grid), widget, 2, row, 1, 1);
 
        return content_grid;
 }
@@ -1315,10 +1281,10 @@ gint crow, row;
        gtk_grid_attach (GTK_GRID (group_grid), label, 0, 0, 3, 1);
        
        row = 1;
-       label = make_label_widget(_("Date _range:"));
+       label = make_label_widget(_("_Range:"));
        //----------------------------------------- l, r, t, b
        gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
-       widget = make_daterange(label, FALSE);
+       widget = make_daterange(label, DATE_RANGE_CUSTOM_HIDE);
        data->CY_daterange_rep = widget;
        //gtk_grid_attach (GTK_GRID (group_grid), data->CY_option[FILTER_DATE], 1, 2, row, row+1);
        gtk_grid_attach (GTK_GRID (group_grid), widget, 2, row, 1, 1);
@@ -1523,7 +1489,7 @@ gint crow, row;
 
 static GtkWidget *defpref_page_display (struct defpref_data *data)
 {
-GtkWidget *content_grid, *group_grid, *label, *widget, *expander;
+GtkWidget *content_grid, *group_grid, *label, *widget, *expander, *hbox;
 gint crow, row;
 
        content_grid = gtk_grid_new();
@@ -1531,30 +1497,40 @@ gint crow, row;
        gtk_orientable_set_orientation(GTK_ORIENTABLE(content_grid), GTK_ORIENTATION_VERTICAL);
 
        crow = 0;
-       // group :: Date options
+       // group :: General
     group_grid = gtk_grid_new ();
        gtk_grid_set_row_spacing (GTK_GRID (group_grid), SPACING_SMALL);
        gtk_grid_set_column_spacing (GTK_GRID (group_grid), SPACING_MEDIUM);
        gtk_grid_attach (GTK_GRID (content_grid), group_grid, 0, crow++, 1, 1);
        
-       label = make_label_group(_("Date"));
+       label = make_label_group(_("User interface"));
        gtk_grid_attach (GTK_GRID (group_grid), label, 0, 0, 3, 1);
 
        row = 1;
+       label = make_label(_("_Language:"), 0, 0.5);
+       gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
+       widget = ui_language_combobox_new(label);
+       data->CY_language = widget;
+       gtk_grid_attach (GTK_GRID (group_grid), widget, 2, row, 1, 1);
+
+       row++;
+       row++;
+       label = make_label(_("_Date display:"), 0, 0.5);
+       gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
        widget = make_label(NULL, 0, 0.5);
        data->LB_date = widget;
-       gtk_grid_attach (GTK_GRID (group_grid), widget, 1, row, 2, 1);
+       gtk_grid_attach (GTK_GRID (group_grid), widget, 2, row, 1, 1);
 
        row++;
        expander = gtk_expander_new_with_mnemonic(_("_Customize"));
-       gtk_grid_attach (GTK_GRID (group_grid), expander, 1, row, 1, 1);
+       gtk_grid_attach (GTK_GRID (group_grid), expander, 2, row, 1, 1);
 
     group_grid = gtk_grid_new ();
        gtk_grid_set_row_spacing (GTK_GRID (group_grid), SPACING_SMALL);
        gtk_grid_set_column_spacing (GTK_GRID (group_grid), SPACING_MEDIUM);
        gtk_container_add (GTK_CONTAINER (expander), group_grid);
 
-       row = 1;
+       row++;
        label = make_label_widget(_("_Format:"));
        //----------------------------------------- l, r, t, b
        gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
@@ -1581,7 +1557,7 @@ gint crow, row;
 "%m month as a decimal number [01,12]. \n"
 "%p locale's appropriate date representation. \n"
 "%y year without century as a decimal number [00,99]. \n"
-"%Y year with century as a decimal number. \n")
+"%Y year with century as a decimal number.")
 );
 
        row++;
@@ -1589,6 +1565,34 @@ gint crow, row;
        gtk_label_set_markup (GTK_LABEL(widget), "<small><a href=\"http://man7.org/linux/man-pages/man3/strftime.3.html\">online reference</a></small>");
        gtk_grid_attach (GTK_GRID (group_grid), widget, 2, row, 1, 1);
 
+
+
+
+       // group :: Fiscal year
+    group_grid = gtk_grid_new ();
+       gtk_grid_set_row_spacing (GTK_GRID (group_grid), SPACING_SMALL);
+       gtk_grid_set_column_spacing (GTK_GRID (group_grid), SPACING_MEDIUM);
+       gtk_grid_attach (GTK_GRID (content_grid), group_grid, 0, crow++, 1, 1);
+
+       label = make_label_group(_("Fiscal year"));
+       gtk_grid_attach (GTK_GRID (group_grid), label, 0, 0, 3, 1);
+
+       row = 1;
+       //TRANSLATORS: (fiscal year) starts on
+       label = make_label_widget(_("Starts _on:"));
+       gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
+
+       hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, SPACING_SMALL);
+       gtk_grid_attach (GTK_GRID (group_grid), hbox, 2, row, 1, 1);
+       widget = make_numeric (label, 1, 28);
+       data->NB_fiscyearday = widget;
+       gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
+       widget = make_cycle (NULL, CYA_MONTHS);
+       data->CY_fiscyearmonth = widget;
+       gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
+
+
+
        // group :: Measurement units
     group_grid = gtk_grid_new ();
        gtk_grid_set_row_spacing (GTK_GRID (group_grid), SPACING_SMALL);
@@ -1614,7 +1618,7 @@ gint crow, row;
 
 static GtkWidget *defpref_page_transactions (struct defpref_data *data)
 {
-GtkWidget *content_grid, *group_grid, *sw, *label, *widget;
+GtkWidget *content_grid, *group_grid, *label, *widget;
 gint crow, row;
 
        content_grid = gtk_grid_new();
@@ -1632,15 +1636,15 @@ gint crow, row;
        gtk_grid_attach (GTK_GRID (group_grid), label, 0, 0, 3, 1);
 
        row = 1;
-       label = make_label_widget(_("Date _range:"));
+       label = make_label(_("_Range:"), 0, 0.5);
        //----------------------------------------- l, r, t, b
        gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
-       widget = make_daterange(label, FALSE);
+       widget = make_daterange(label, DATE_RANGE_CUSTOM_HIDE);
        data->CY_daterange_txn = widget;
        gtk_grid_attach (GTK_GRID (group_grid), widget, 2, row, 1, 1);
 
        row++;
-       label = make_label_widget(_("_Show:"));
+       label = make_label(_("_Show future:"), 0, 0.5);
        //----------------------------------------- l, r, t, b
        gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
        widget = make_numeric(NULL, 0, 366);
@@ -1649,18 +1653,18 @@ gint crow, row;
        gtk_grid_attach (GTK_GRID (group_grid), widget, 2, row, 1, 1);
 
        //TRANSLATORS: there is a spinner on the left of this label, and so you have 0....x days in advance the current date
-       label = make_label(_("days in advance the current date"), 0, 0.5);
+       label = make_label(_("days ahead"), 0, 0.5);
        gtk_grid_attach (GTK_GRID (group_grid), label, 3, row, 1, 1);
 
        row++;
        widget = gtk_check_button_new_with_mnemonic (_("Hide reconciled transactions"));
        data->CM_hide_reconciled = widget;
-       gtk_grid_attach (GTK_GRID (group_grid), widget, 2, row, 2, 1);
+       gtk_grid_attach (GTK_GRID (group_grid), widget, 1, row, 3, 1);
 
        row++;
        widget = gtk_check_button_new_with_mnemonic (_("Always show remind transactions"));
        data->CM_show_remind = widget;
-       gtk_grid_attach (GTK_GRID (group_grid), widget, 2, row, 2, 1);
+       gtk_grid_attach (GTK_GRID (group_grid), widget, 1, row, 3, 1);
 
        // group :: Multiple add
     group_grid = gtk_grid_new ();
@@ -1676,7 +1680,29 @@ gint crow, row;
        data->CM_herit_date = widget;
        gtk_grid_attach (GTK_GRID (group_grid), widget, 1, row, 2, 1);
 
+       // group :: Memo autocomplete
+    group_grid = gtk_grid_new ();
+       gtk_grid_set_row_spacing (GTK_GRID (group_grid), SPACING_SMALL);
+       gtk_grid_set_column_spacing (GTK_GRID (group_grid), SPACING_MEDIUM);
+       gtk_grid_attach (GTK_GRID (content_grid), group_grid, 0, crow++, 1, 1);
+       
+       label = make_label_group(_("Memo autocomplete"));
+       gtk_grid_attach (GTK_GRID (group_grid), label, 0, 0, 3, 1);
+
+       row = 1;
+       widget = gtk_check_button_new_with_mnemonic (_("Active"));
+       data->CM_memoacp = widget;
+       gtk_grid_attach (GTK_GRID (group_grid), widget, 1, row, 2, 1);
+
+       row++;
+       widget = make_numeric(NULL, 0, 1460);
+       data->ST_memoacp_days = widget;
+       gtk_grid_attach (GTK_GRID (group_grid), widget, 2, row, 1, 1);
+       label = make_label(_("rolling days"), 0, 0.5);
+       gtk_grid_attach (GTK_GRID (group_grid), label, 3, row, 1, 1);
+
        // group :: Column list
+       /*
     group_grid = gtk_grid_new ();
        gtk_grid_set_row_spacing (GTK_GRID (group_grid), SPACING_SMALL);
        gtk_grid_set_column_spacing (GTK_GRID (group_grid), SPACING_MEDIUM);
@@ -1696,6 +1722,7 @@ gint crow, row;
        gtk_widget_set_vexpand (sw, TRUE);
        gtk_grid_attach (GTK_GRID (group_grid), sw, 1, row, 2, 1);
        gtk_widget_set_tooltip_text(widget, _("Drag & drop to change the order"));
+       */
 
        return content_grid;
 }
@@ -1722,24 +1749,23 @@ gint crow, row;
        gtk_grid_attach (GTK_GRID (group_grid), label, 0, 0, 3, 1);
 
        row = 1;
-       label = make_label_widget(_("_Language:"));
-       gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
-       widget = ui_language_combobox_new(label);
-       data->CY_language = widget;
-       gtk_grid_attach (GTK_GRID (group_grid), widget, 2, row, 1, 1);
-       
-       row++;
-       label = make_label_widget(_("_Toolbar:"));
+       label = make_label(_("_Toolbar:"), 0, 0.5);
        gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
        widget = make_cycle(label, CYA_TOOLBAR_STYLE);
        data->CY_toolbar = widget;
        gtk_grid_attach (GTK_GRID (group_grid), widget, 2, row, 1, 1);
 
 
+
+
+
+
+
+
        row++;
        //widget = gtk_check_button_new_with_mnemonic (_("Enable rows in alternating colors"));
        //data->CM_ruleshint = widget;
-       label = make_label_widget(_("_Grid line:"));
+       label = make_label(_("_Grid line:"), 0, 0.5);
        gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
        widget = make_cycle(label, CYA_GRID_LINES);
        data->CY_gridlines = widget;
@@ -1757,16 +1783,11 @@ gint crow, row;
        row = 1;
        widget = gtk_check_button_new_with_mnemonic (_("Uses custom colors"));
        data->CM_custom_colors = widget;
-       gtk_grid_attach (GTK_GRID (group_grid), widget, 2, row, 1, 1);
-
-    group_grid = gtk_grid_new ();
-       data->GR_colors = group_grid;
-       gtk_grid_set_row_spacing (GTK_GRID (group_grid), SPACING_SMALL);
-       gtk_grid_set_column_spacing (GTK_GRID (group_grid), SPACING_MEDIUM);
-       gtk_grid_attach (GTK_GRID (content_grid), group_grid, 0, crow++, 1, 1);
+       gtk_grid_attach (GTK_GRID (group_grid), widget, 1, row, 2, 1);
 
        row++;
-       label = make_label_widget(_("_Preset:"));
+       label = make_label(_("_Preset:"), 0, 0.5);
+       data->LB_colors = label;
        //----------------------------------------- l, r, t, b
        gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
        widget = make_cycle(label, CYA_TANGO_COLORS);
@@ -1775,10 +1796,12 @@ gint crow, row;
        gtk_grid_attach (GTK_GRID (group_grid), widget, 2, row, 1, 1);
 
        row++;
-       label = make_label_widget(_("_Expense:"));
+       label = make_label(_("_Expense:"), 0, 0.5);
+       data->LB_exp_color = label;
        //----------------------------------------- l, r, t, b
        gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, SPACING_SMALL);
+       data->GR_colors = hbox;
        gtk_grid_attach (GTK_GRID (group_grid), hbox, 2, row, 1, 1);
        
        widget = gtk_color_button_new ();
@@ -1803,7 +1826,7 @@ gint crow, row;
 }
 
 
-static GtkWidget *defpref_page_general (struct defpref_data *data)
+static GtkWidget *defpref_page_filebackup (struct defpref_data *data)
 {
 GtkWidget *content_grid, *group_grid, *hbox, *label, *widget;
 gint crow, row;
@@ -1813,73 +1836,81 @@ gint crow, row;
        gtk_orientable_set_orientation(GTK_ORIENTABLE(content_grid), GTK_ORIENTATION_VERTICAL);
 
        crow = 0;
-       // group :: Program start
+       // group :: Backup
     group_grid = gtk_grid_new ();
        gtk_grid_set_row_spacing (GTK_GRID (group_grid), SPACING_SMALL);
        gtk_grid_set_column_spacing (GTK_GRID (group_grid), SPACING_MEDIUM);
        gtk_grid_attach (GTK_GRID (content_grid), group_grid, 0, crow++, 1, 1);
        
-       label = make_label_group(_("Program start"));
+       label = make_label_group(_("Backup"));
        gtk_grid_attach (GTK_GRID (group_grid), label, 0, 0, 3, 1);
 
        row = 1;
-       widget = gtk_check_button_new_with_mnemonic (_("Show splash screen"));
-       data->CM_show_splash = widget;
+       widget = gtk_check_button_new_with_mnemonic (_("_Enable automatic backups"));
+       data->CM_bak_is_automatic = widget;
        gtk_grid_attach (GTK_GRID (group_grid), widget, 1, row, 2, 1);
 
        row++;
-       widget = gtk_check_button_new_with_mnemonic (_("Load last opened file"));
-       data->CM_load_last = widget;
-       gtk_grid_attach (GTK_GRID (group_grid), widget, 1, row, 2, 1);
+       label = make_label_widget(_("_Number of backups to keep:"));
+       data->LB_bak_max_num_copies = label;
+       gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
+       widget = make_numeric (label, 1, 99);
+       data->NB_bak_max_num_copies = widget;
+       gtk_grid_attach (GTK_GRID (group_grid), widget, 2, row, 1, 1);
 
        row++;
-       widget = gtk_check_button_new_with_mnemonic (_("Post pending scheduled transactions"));
-       data->CM_append_scheduled = widget;
-       gtk_grid_attach (GTK_GRID (group_grid), widget, 1, row, 2, 1);
+       hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, SPACING_SMALL);
+       data->GR_bak_freq = hbox;
+       //gtk_widget_set_hexpand (hbox, TRUE);
+       gtk_grid_attach (GTK_GRID (group_grid), hbox, 1, row, 2, 1);
 
-       row++;
-       widget = gtk_check_button_new_with_mnemonic (_("Update currencies online"));
-       data->CM_do_update_currency = widget;
-       gtk_grid_attach (GTK_GRID (group_grid), widget, 1, row, 2, 1);
+               widget = gtk_image_new_from_icon_name (ICONNAME_INFO, GTK_ICON_SIZE_BUTTON);
+               gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
+               label = make_label_widget(_("Backup frequency is once a day"));
+               gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 
-       // group :: Fiscal year
-    group_grid = gtk_grid_new ();
-       gtk_grid_set_row_spacing (GTK_GRID (group_grid), SPACING_SMALL);
-       gtk_grid_set_column_spacing (GTK_GRID (group_grid), SPACING_MEDIUM);
-       gtk_grid_attach (GTK_GRID (content_grid), group_grid, 0, crow++, 1, 1);
 
-       label = make_label_group(_("Fiscal year"));
-       gtk_grid_attach (GTK_GRID (group_grid), label, 0, 0, 3, 1);
+       return content_grid;
+}
 
-       row = 1;
-       //TRANSLATORS: (fiscal year) starts on
-       label = make_label_widget(_("Starts _on:"));
-       gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
 
-       hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, SPACING_SMALL);
-       gtk_grid_attach (GTK_GRID (group_grid), hbox, 2, row, 1, 1);
-       widget = make_numeric (label, 1, 28);
-       data->NB_fiscyearday = widget;
-       gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
-       widget = make_cycle (NULL, CYA_MONTHS);
-       data->CY_fiscyearmonth = widget;
-       gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
+static GtkWidget *defpref_page_folders (struct defpref_data *data)
+{
+GtkWidget *content_grid, *group_grid, *hbox, *label, *widget;
+gint crow, row;
 
-       // group :: Main window reports
+       content_grid = gtk_grid_new();
+       gtk_grid_set_row_spacing (GTK_GRID (content_grid), SPACING_LARGE);
+       gtk_orientable_set_orientation(GTK_ORIENTABLE(content_grid), GTK_ORIENTATION_VERTICAL);
+
+       crow = 0;
+       // group :: Files folder
     group_grid = gtk_grid_new ();
        gtk_grid_set_row_spacing (GTK_GRID (group_grid), SPACING_SMALL);
        gtk_grid_set_column_spacing (GTK_GRID (group_grid), SPACING_MEDIUM);
        gtk_grid_attach (GTK_GRID (content_grid), group_grid, 0, crow++, 1, 1);
        
-       label = make_label_group(_("Main window reports"));
+       label = make_label_group(_("HomeBank files"));
        gtk_grid_attach (GTK_GRID (group_grid), label, 0, 0, 3, 1);
 
        row = 1;
-       label = make_label_widget(_("Date _range:"));
+       label = make_label_widget(_("_Wallets:"));
        gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
-       widget = make_daterange(label, FALSE);
-       data->CY_daterange_wal = widget;
-       gtk_grid_attach (GTK_GRID (group_grid), widget, 2, row, 1, 1);
+
+       hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+       gtk_widget_set_hexpand (hbox, TRUE);
+       gtk_grid_attach (GTK_GRID (group_grid), hbox, 2, row, 1, 1);
+
+       widget = make_string(label);
+       data->ST_path_hbfile = widget;
+       gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET(widget)), GTK_STYLE_CLASS_LINKED);
+       gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
+
+       //widget = gtk_button_new_with_label("...");
+       widget = gtk_button_new_from_icon_name(ICONNAME_FOLDER, GTK_ICON_SIZE_BUTTON);
+       data->BT_path_hbfile = widget;
+       gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
+
 
        // group :: Files folder
     group_grid = gtk_grid_new ();
@@ -1887,11 +1918,12 @@ gint crow, row;
        gtk_grid_set_column_spacing (GTK_GRID (group_grid), SPACING_MEDIUM);
        gtk_grid_attach (GTK_GRID (content_grid), group_grid, 0, crow++, 1, 1);
        
-       label = make_label_group(_("Files folder"));
+       label = make_label_group(_("Exchange files"));
        gtk_grid_attach (GTK_GRID (group_grid), label, 0, 0, 3, 1);
-
+       
        row = 1;
-       label = make_label_widget(_("_Default:"));
+       label = make_label_widget(_("_Import:"));
+       //----------------------------------------- l, r, t, b
        gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
 
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
@@ -1899,18 +1931,100 @@ gint crow, row;
        gtk_grid_attach (GTK_GRID (group_grid), hbox, 2, row, 1, 1);
 
        widget = make_string(label);
-       data->ST_path_hbfile = widget;
+       data->ST_path_import = widget;
        gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET(widget)), GTK_STYLE_CLASS_LINKED);
        gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
 
        //widget = gtk_button_new_with_label("...");
        widget = gtk_button_new_from_icon_name(ICONNAME_FOLDER, GTK_ICON_SIZE_BUTTON);
-       data->BT_path_hbfile = widget;
+       data->BT_path_import = widget;
+       gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
+
+       row++;
+       label = make_label_widget(_("_Export:"));
+       //----------------------------------------- l, r, t, b
+       gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
+
+       hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+       gtk_widget_set_hexpand (hbox, TRUE);
+       gtk_grid_attach (GTK_GRID (group_grid), hbox, 2, row, 1, 1);
+
+       widget = make_string(label);
+       data->ST_path_export = widget;
+       gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET(widget)), GTK_STYLE_CLASS_LINKED);
+       gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
+
+       //widget = gtk_button_new_with_label("...");
+       widget = gtk_button_new_from_icon_name(ICONNAME_FOLDER, GTK_ICON_SIZE_BUTTON);
+       data->BT_path_export = widget;
        gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
 
+
+
+       return content_grid;
+}
+
+
+static GtkWidget *defpref_page_general (struct defpref_data *data)
+{
+GtkWidget *content_grid, *group_grid, *label, *widget;
+gint crow, row;
+
+       content_grid = gtk_grid_new();
+       gtk_grid_set_row_spacing (GTK_GRID (content_grid), SPACING_LARGE);
+       gtk_orientable_set_orientation(GTK_ORIENTABLE(content_grid), GTK_ORIENTATION_VERTICAL);
+
+       crow = 0;
+       // group :: Program start
+    group_grid = gtk_grid_new ();
+       gtk_grid_set_row_spacing (GTK_GRID (group_grid), SPACING_SMALL);
+       gtk_grid_set_column_spacing (GTK_GRID (group_grid), SPACING_MEDIUM);
+       gtk_grid_attach (GTK_GRID (content_grid), group_grid, 0, crow++, 1, 1);
+       
+       label = make_label_group(_("Program start"));
+       gtk_grid_attach (GTK_GRID (group_grid), label, 0, 0, 3, 1);
+
+       row = 1;
+       widget = gtk_check_button_new_with_mnemonic (_("Show splash screen"));
+       data->CM_show_splash = widget;
+       gtk_grid_attach (GTK_GRID (group_grid), widget, 1, row, 2, 1);
+
+       row++;
+       widget = gtk_check_button_new_with_mnemonic (_("Load last opened file"));
+       data->CM_load_last = widget;
+       gtk_grid_attach (GTK_GRID (group_grid), widget, 1, row, 2, 1);
+
+       row++;
+       widget = gtk_check_button_new_with_mnemonic (_("Post pending scheduled transactions"));
+       data->CM_append_scheduled = widget;
+       gtk_grid_attach (GTK_GRID (group_grid), widget, 1, row, 2, 1);
+
+       row++;
+       widget = gtk_check_button_new_with_mnemonic (_("Update currencies online"));
+       data->CM_do_update_currency = widget;
+       gtk_grid_attach (GTK_GRID (group_grid), widget, 1, row, 2, 1);
+
+
+       // group :: Main window reports
+    group_grid = gtk_grid_new ();
+       gtk_grid_set_row_spacing (GTK_GRID (group_grid), SPACING_SMALL);
+       gtk_grid_set_column_spacing (GTK_GRID (group_grid), SPACING_MEDIUM);
+       gtk_grid_attach (GTK_GRID (content_grid), group_grid, 0, crow++, 1, 1);
+       
+       label = make_label_group(_("Main window reports"));
+       gtk_grid_attach (GTK_GRID (group_grid), label, 0, 0, 3, 1);
+
+       row = 1;
+       label = make_label(_("_Range:"), 0, 0.5);
+       gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
+       widget = make_daterange(label, DATE_RANGE_CUSTOM_HIDE);
+       data->CY_daterange_wal = widget;
+       gtk_grid_attach (GTK_GRID (group_grid), widget, 2, row, 1, 1);
+
        return content_grid;
 }
 
+
 static void defpref_selection(GtkTreeSelection *treeselection, gpointer user_data)
 {
 struct defpref_data *data;
@@ -1986,19 +2100,19 @@ GtkTreeModel *model;
 /*
 ** add an empty new account to our temp GList and treeview
 */
-static void defpref_clear(GtkWidget *widget, gpointer user_data)
+static void defpref_reset(GtkWidget *widget, gpointer user_data)
 {
 struct defpref_data *data;
 gint result;
 
        data = g_object_get_data(G_OBJECT(gtk_widget_get_ancestor(widget, GTK_TYPE_WINDOW)), "inst_data");
-       DB( g_print("\n(defpref_clear) (data=%p)\n", data) );
+       DB( g_print("\n(defpref_reset) (data=%p)\n", data) );
 
        result = ui_dialog_msg_confirm_alert(
                GTK_WINDOW(data->window),
-               _("Reset all preferences"),
-               _("Do you really want to reset all\npreferences to default values?"),
-           _("Reset")
+               _("Reset All Preferences"),
+               _("Do you really want to reset\nall preferences to default\nvalues?"),
+           _("_Reset")
                );
        if( result == GTK_RESPONSE_OK )
        {
@@ -2019,6 +2133,8 @@ GtkWidget *hbox, *vbox, *sw, *widget, *notebook, *page, *ebox, *image, *label;
       window = gtk_dialog_new_with_buttons (_("Preferences"),
                                GTK_WINDOW(GLOBALS->mainwindow),
                                0,
+                               _("_Reset"),
+                               55,
                                _("_Cancel"),
                                GTK_RESPONSE_REJECT,
                                _("_OK"),
@@ -2054,11 +2170,7 @@ GtkWidget *hbox, *vbox, *sw, *widget, *notebook, *page, *ebox, *image, *label;
        data.LV_page = widget;
        gtk_container_add (GTK_CONTAINER (sw), widget);
 
-       // clear button
-       data.BT_clear = gtk_button_new_with_mnemonic(_("_Reset"));
-       gtk_box_pack_start (GTK_BOX (vbox), data.BT_clear, FALSE, TRUE, 0);
 
-       
        //right part : notebook
        vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, SPACING_MEDIUM);
        gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
@@ -2116,12 +2228,16 @@ GtkWidget *hbox, *vbox, *sw, *widget, *notebook, *page, *ebox, *image, *label;
     gtk_box_pack_start (GTK_BOX (vbox), notebook, TRUE, TRUE, 0);
 
 /*
-"general",
-"interface",
-"display",
-"help",
-"euro",
-"report"
+       PREF_GENERAL,
+       PREF_INTERFACE,
+       PREF_LOCALE,    //old DISPLAY
+       PREF_TXN,               //old COLUMNS
+       PREF_IMPORT,
+       PREF_REPORT,
+       PREF_BACKUP,
+       PREF_FOLDERS,
+       PREF_EURO,
+       PREF_MAX
 */
 
        //general
@@ -2132,12 +2248,12 @@ GtkWidget *hbox, *vbox, *sw, *widget, *notebook, *page, *ebox, *image, *label;
        page = defpref_page_interface(&data);
        gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, NULL);
 
-       //columns
-       page = defpref_page_transactions(&data);
+       //locale
+       page = defpref_page_display(&data);
        gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, NULL);
 
-       //display
-       page = defpref_page_display(&data);
+       //transaction
+       page = defpref_page_transactions(&data);
        gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, NULL);
 
        //import
@@ -2148,6 +2264,14 @@ GtkWidget *hbox, *vbox, *sw, *widget, *notebook, *page, *ebox, *image, *label;
        page = defpref_page_reports(&data);
        gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, NULL);
 
+       //backup
+       page = defpref_page_filebackup(&data);
+       gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, NULL);
+
+       //folders
+       page = defpref_page_folders(&data);
+       gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, NULL);
+
        //euro
        page = defpref_page_euro(&data);
        gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, NULL);
@@ -2159,12 +2283,13 @@ GtkWidget *hbox, *vbox, *sw, *widget, *notebook, *page, *ebox, *image, *label;
        //connect all our signals
        g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
 
-       g_signal_connect (G_OBJECT (data.BT_clear), "clicked", G_CALLBACK (defpref_clear), NULL);
+       g_signal_connect (data.CM_bak_is_automatic, "toggled", G_CALLBACK (defpref_backuptoggle), NULL);
+
        
        //path selector
-       g_signal_connect (data.BT_path_hbfile, "pressed", G_CALLBACK (defpref_pathselect), GINT_TO_POINTER(1));
-       g_signal_connect (data.BT_path_import, "pressed", G_CALLBACK (defpref_pathselect), GINT_TO_POINTER(2));
-       g_signal_connect (data.BT_path_export, "pressed", G_CALLBACK (defpref_pathselect), GINT_TO_POINTER(3));
+       g_signal_connect (data.BT_path_hbfile, "pressed", G_CALLBACK (defpref_pathselect), GINT_TO_POINTER(PRF_PATH_WALLET));
+       g_signal_connect (data.BT_path_import, "pressed", G_CALLBACK (defpref_pathselect), GINT_TO_POINTER(PRF_PATH_IMPORT));
+       g_signal_connect (data.BT_path_export, "pressed", G_CALLBACK (defpref_pathselect), GINT_TO_POINTER(PRF_PATH_EXPORT));
 
        g_signal_connect (data.CM_custom_colors, "toggled", G_CALLBACK (defpref_colortoggle), NULL);
     g_signal_connect (data.CY_colors, "changed", G_CALLBACK (defpref_colorpreset), NULL);
@@ -2245,6 +2370,10 @@ GtkWidget *hbox, *vbox, *sw, *widget, *notebook, *page, *ebox, *image, *label;
 
                                g_free(old_lang);
                                break;
+
+                       case 55:
+                               defpref_reset (window, NULL);
+                               break;
                }
        
 
@@ -2258,7 +2387,7 @@ GtkWidget *hbox, *vbox, *sw, *widget, *notebook, *page, *ebox, *image, *label;
 // -------------------------------
 
 
-GtkWidget *pref_list_create(void)
+static GtkWidget *pref_list_create(void)
 {
 GtkListStore *store;
 GtkWidget *view;
@@ -2313,7 +2442,7 @@ gint i;
 
 /* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =*/
 
-
+/*
 extern gchar *list_txn_column_label[];
 
 
@@ -2327,17 +2456,17 @@ GtkTreeIter  iter;
 GtkTreePath *path = gtk_tree_path_new_from_string (path_str);
 gboolean fixed;
 
-       /* get toggled iter */
+       // get toggled iter 
        gtk_tree_model_get_iter (model, &iter, path);
        gtk_tree_model_get (model, &iter, COLUMN_VISIBLE, &fixed, -1);
 
-       /* do something with the value */
+       // do something with the value
        fixed ^= 1;
 
-       /* set new value */
+       // set new value
        gtk_list_store_set (GTK_LIST_STORE (model), &iter, COLUMN_VISIBLE, fixed, -1);
 
-       /* clean up */
+       // clean up
        gtk_tree_path_free (path);
 }
 
@@ -2351,7 +2480,6 @@ gboolean visible;
 gint i, id;
 
        DB( g_print("[lst_txn-colpref] store column order \n") );
-
        
        model = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview));
        valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &iter);
@@ -2367,13 +2495,10 @@ gint i, id;
                // start at index 2 (status, date always displayed
                columns[i+2] = visible == TRUE ? id : -id;
 
-                /* Make iter point to the next row in the list store */
+                // Make iter point to the next row in the list store
                valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &iter);
                i++;
        }
-
-
-
 }
 
 
@@ -2389,7 +2514,7 @@ gint i;
        DB( g_print("[lst_txn-colpref] create\n") );
 
 
-       /* create list store */
+       // create list store
        store = gtk_list_store_new(
                3,
                G_TYPE_BOOLEAN,
@@ -2397,7 +2522,7 @@ gint i;
                G_TYPE_UINT
                );
 
-       /* populate */
+       // populate
        for(i=0 ; i < NUM_LST_DSPOPE-1; i++ )   //-1 cause account column avoid
        {
        gint id;
@@ -2408,7 +2533,7 @@ gint i;
                if(i <= LST_DSPOPE_DATE) // status, date always displayed
                        continue;
 
-               //[i-1] here because lst_ope_columns[] do not store LST_DSPOPE_DATAS
+               //[i-1] here because lst_ope_columns[] do not store MODEL_TXN_POINTER
                id = ABS(PREFS->lst_ope_columns[i-1]);  
                if(id == 0) id = i;      //if we pass here, new column or weird into pref file
                visible = (PREFS->lst_ope_columns[i-1] > 0) ? TRUE : FALSE;
@@ -2454,4 +2579,5 @@ gint i;
 
        return(view);
 }
+*/
 
This page took 0.058292 seconds and 4 git commands to generate.