Merge branch 'master' into ext-perl

diff --cc configure.ac
Simple merge

diff --cc src/dsp-mainwindow.c
Simple merge

diff --cc src/hb-preferences.c
Simple merge

diff --cc src/hb-preferences.h
Simple merge

diff --cc src/hb-transaction.c
Simple merge

diff --cc src/homebank.c
Simple merge

diff --cc src/homebank.h
Simple merge

diff --cc src/ui-pref.c
index c9d435a72c622faefcb2dd4612bf09023002265f,7b927e2cdc7dd5a32f2eab88f4f48b9c3310aca3..322358e36cc30722e32a84d7445fb4894146159e
--- 1/src/ui-pref.c
--- 2/src/ui-pref.c
+++ b/src/ui-pref.c
@@@ -1067,8 -1075,8 +1077,8 @@@ const gchar *lang
        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);
  
 -      // transaction 
 +      // transaction
-       PREFS->date_range_txn = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_daterange_txn));
+       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));
@@@ -1091,9 -1099,10 +1101,10 @@@
        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->dtex_csvsep = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_dtex_csvsep));
  
        // report
-       PREFS->date_range_rep = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_daterange_rep));
+       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));
@@@ -1133,10 -1140,10 +1144,10 @@@ gint crow, row
        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 options"));
+       label = make_label_group(_("General options"));
        gtk_grid_attach (GTK_GRID (group_grid), label, 0, 0, 3, 1);
 -      
 +
        row = 1;
        label = make_label_widget(_("Date order:"));
        //----------------------------------------- l, r, t, b
@@@ -1146,6 -1153,11 +1157,11 @@@
        //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 ();
@@@ -1196,8 -1208,8 +1212,8 @@@
        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(_("Other options"));
+       label = make_label_group(_("CSV options"));
        gtk_grid_attach (GTK_GRID (group_grid), label, 0, 0, 3, 1);
  
        row = 1;
@@@ -2722,8 -2533,8 +2738,8 @@@ 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]);  
 +              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;
  

diff --cc src/ui-pref.h
index 1ceb45751cd09b7396ca45ea61cb360a7e89c098,2ea1703882dd775947a4ea17fe10fdc8f35c3588..524c6adef843340d674380e55f48df4b5faf1354
--- 1/src/ui-pref.h
--- 2/src/ui-pref.h
+++ b/src/ui-pref.h
@@@ -130,29 -130,14 +130,30 @@@ struct defpref_dat
        GtkWidget       *CM_dtex_qifmemo;
        GtkWidget       *CM_dtex_qifswap;
        GtkWidget       *CM_dtex_ucfirst;
- 
+       GtkWidget       *CY_dtex_csvsep;
+        
        gint            country;
  
 +      GtkWidget       *PI_plugin_columns;
  };
  
 +enum
 +{
 +      PREF_GENERAL,
 +      PREF_INTERFACE,
 +      PREF_LOCALE,    //old DISPLAY
 +      PREF_TXN,               //old COLUMNS
 +      PREF_IMPORT,
 +      PREF_REPORT,
 +      PREF_BACKUP,
 +      PREF_FOLDERS,
 +      PREF_EURO,
 +      PREF_PLUGINS,
 +      PREF_MAX
 +};
  
 -typedef struct 
 +
 +typedef struct
  {
        gchar   *locale;
        gchar   *name;