Commit ef661aa5 authored by Maxime Doyen's avatar Maxime Doyen

5.1-rc

parent ec5c7a2e
2016-08-xx Maxime Doyen 2016-08-06 Maxime Doyen
Made 5.1 rc release. Made 5.1 rc release.
......
...@@ -4858,7 +4858,7 @@ CFLAGS="${CFLAGS} -Wall -Wmissing-prototypes" ...@@ -4858,7 +4858,7 @@ CFLAGS="${CFLAGS} -Wall -Wmissing-prototypes"
CFLAGS="${CFLAGS} -Wno-deprecated-declarations" CFLAGS="${CFLAGS} -Wno-deprecated-declarations"
# extended flags # extended flags
CFLAGS="${CFLAGS} -Wextra -Wno-unused-parameter" #CFLAGS="${CFLAGS} -Wextra -Wno-unused-parameter"
# profiling valgrind/gprof flags # profiling valgrind/gprof flags
#CFLAGS="${CFLAGS} -g -O0 -pg" #CFLAGS="${CFLAGS} -g -O0 -pg"
......
...@@ -195,6 +195,8 @@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ ...@@ -195,6 +195,8 @@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@ LIBS = @LIBS@
LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
LIBSOUP_LIBS = @LIBSOUP_LIBS@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
...@@ -261,6 +263,7 @@ pdfdir = @pdfdir@ ...@@ -261,6 +263,7 @@ pdfdir = @pdfdir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
psdir = @psdir@ psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@ srcdir = @srcdir@
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -697,7 +697,7 @@ gint result; ...@@ -697,7 +697,7 @@ gint result;
result = ui_dialog_msg_confirm_alert( result = ui_dialog_msg_confirm_alert(
GTK_WINDOW(data->window), GTK_WINDOW(data->window),
_("Are you sure you want to convert this account\nto Major euro currency?"), _("Are you sure you want to convert this account\nto Euro as Major currency?"),
msg, msg,
_("_Convert") _("_Convert")
); );
...@@ -730,10 +730,10 @@ gboolean usermode = TRUE; ...@@ -730,10 +730,10 @@ gboolean usermode = TRUE;
if(count == 0) if(count == 0)
txt = _("No transaction changed"); txt = _("No transaction changed");
else else
txt = _("transaction auto assigned: %d"); txt = _("transaction changed: %d");
ui_dialog_msg_infoerror(GTK_WINDOW(data->window), GTK_MESSAGE_INFO, ui_dialog_msg_infoerror(GTK_WINDOW(data->window), GTK_MESSAGE_INFO,
_("Auto assignment result"), _("Automatic assignment result"),
txt, txt,
count); count);
} }
...@@ -2154,7 +2154,7 @@ quick_search_icon_press_cb (GtkEntry *entry, ...@@ -2154,7 +2154,7 @@ quick_search_icon_press_cb (GtkEntry *entry,
static GtkActionEntry entries[] = { static GtkActionEntry entries[] = {
/* name, icon-name, label */ /* name, icon-name, label */
{ "AccountMenu" , NULL, N_("_Account"), NULL, NULL, NULL }, { "AccountMenu" , NULL, N_("A_ccount"), NULL, NULL, NULL },
{ "TxnMenu" , NULL, N_("Transacti_on"), NULL, NULL, NULL }, { "TxnMenu" , NULL, N_("Transacti_on"), NULL, NULL, NULL },
{ "TxnStatusMenu", NULL, N_("_Status"), NULL, NULL, NULL }, { "TxnStatusMenu", NULL, N_("_Status"), NULL, NULL, NULL },
{ "ToolsMenu" , NULL, N_("_Tools"), NULL, NULL, NULL }, { "ToolsMenu" , NULL, N_("_Tools"), NULL, NULL, NULL },
...@@ -2163,7 +2163,7 @@ static GtkActionEntry entries[] = { ...@@ -2163,7 +2163,7 @@ static GtkActionEntry entries[] = {
/* name, icon-name, label, accelerator, tooltip */ /* name, icon-name, label, accelerator, tooltip */
{ "Filter" , ICONNAME_HB_FILTER , N_("_Filter..."), NULL, N_("Open the list filter"), G_CALLBACK (register_panel_action_editfilter) }, { "Filter" , ICONNAME_HB_FILTER , N_("_Filter..."), NULL, N_("Open the list filter"), G_CALLBACK (register_panel_action_editfilter) },
{ "ConvToEuro" , NULL , N_("Convert to euro..."), NULL, N_("Convert this account to euro"), G_CALLBACK (register_panel_action_converttoeuro) }, { "ConvToEuro" , NULL , N_("Convert to Euro..."), NULL, N_("Convert this account to Euro currency"), G_CALLBACK (register_panel_action_converttoeuro) },
{ "Add" , ICONNAME_HB_OPE_ADD , N_("_Add..."), NULL, N_("Add a new transaction"), G_CALLBACK (register_panel_action_add) }, { "Add" , ICONNAME_HB_OPE_ADD , N_("_Add..."), NULL, N_("Add a new transaction"), G_CALLBACK (register_panel_action_add) },
{ "Inherit" , ICONNAME_HB_OPE_HERIT , N_("_Inherit..."), NULL, N_("Inherit from the active transaction"), G_CALLBACK (register_panel_action_inherit) }, { "Inherit" , ICONNAME_HB_OPE_HERIT , N_("_Inherit..."), NULL, N_("Inherit from the active transaction"), G_CALLBACK (register_panel_action_inherit) },
...@@ -2177,7 +2177,7 @@ static GtkActionEntry entries[] = { ...@@ -2177,7 +2177,7 @@ static GtkActionEntry entries[] = {
{ "Template" , ICONNAME_CONVERT , N_("Create template..."), NULL, N_("Create template"), G_CALLBACK (register_panel_action_createtemplate) }, { "Template" , ICONNAME_CONVERT , N_("Create template..."), NULL, N_("Create template"), G_CALLBACK (register_panel_action_createtemplate) },
{ "Delete" , ICONNAME_HB_OPE_DELETE , N_("_Delete..."), NULL, N_("Delete selected transaction(s)"), G_CALLBACK (register_panel_action_remove) }, { "Delete" , ICONNAME_HB_OPE_DELETE , N_("_Delete..."), NULL, N_("Delete selected transaction(s)"), G_CALLBACK (register_panel_action_remove) },
{ "Assign" , ICONNAME_HB_ASSIGN_RUN , N_("Auto. Assignments"), NULL, N_("Run auto assignments"), G_CALLBACK (register_panel_action_assign) }, { "Assign" , ICONNAME_HB_ASSIGN_RUN , N_("Auto. assignments"), NULL, N_("Run automatic assignments"), G_CALLBACK (register_panel_action_assign) },
{ "ExportQIF" , NULL , N_("Export QIF..."), NULL, N_("Export as QIF"), G_CALLBACK (register_panel_action_exportqif) }, { "ExportQIF" , NULL , N_("Export QIF..."), NULL, N_("Export as QIF"), G_CALLBACK (register_panel_action_exportqif) },
{ "ExportCSV" , NULL , N_("Export CSV..."), NULL, N_("Export as CSV"), G_CALLBACK (register_panel_action_exportcsv) }, { "ExportCSV" , NULL , N_("Export CSV..."), NULL, N_("Export as CSV"), G_CALLBACK (register_panel_action_exportcsv) },
...@@ -2427,12 +2427,12 @@ GError *error = NULL; ...@@ -2427,12 +2427,12 @@ GError *error = NULL;
data->CY_status = make_cycle(label, CYA_FLT_STATUS); data->CY_status = make_cycle(label, CYA_FLT_STATUS);
gtk_grid_attach (GTK_GRID(table), data->CY_status, 5, 0, 1, 1); gtk_grid_attach (GTK_GRID(table), data->CY_status, 5, 0, 1, 1);
widget = gtk_button_new_with_mnemonic (_("Reset _Filters")); widget = gtk_button_new_with_mnemonic (_("Reset _filters"));
data->BT_reset = widget; data->BT_reset = widget;
gtk_grid_attach (GTK_GRID(table), widget, 6, 0, 1, 1); gtk_grid_attach (GTK_GRID(table), widget, 6, 0, 1, 1);
//TRANSLATORS: this is for Euro specific users, a toggle to display in 'Minor' currency //TRANSLATORS: this is for Euro specific users, a toggle to display in 'Minor' currency
widget = gtk_check_button_new_with_mnemonic (_("_Minor currency")); widget = gtk_check_button_new_with_mnemonic (_("Euro _minor"));
data->CM_minor = widget; data->CM_minor = widget;
gtk_grid_attach (GTK_GRID(table), widget, 8, 0, 1, 1); gtk_grid_attach (GTK_GRID(table), widget, 8, 0, 1, 1);
......
...@@ -178,7 +178,7 @@ static GtkActionEntry entries[] = { ...@@ -178,7 +178,7 @@ static GtkActionEntry entries[] = {
{ "Properties" , ICONNAME_PROPERTIES , N_("Properties..."), NULL, N_("Configure the file"), G_CALLBACK (ui_mainwindow_action_properties) }, { "Properties" , ICONNAME_PROPERTIES , N_("Properties..."), NULL, N_("Configure the file"), G_CALLBACK (ui_mainwindow_action_properties) },
{ "Close" , ICONNAME_CLOSE , N_("_Close") , "<control>W", N_("Close the current file"), G_CALLBACK (ui_mainwindow_action_close) }, { "Close" , ICONNAME_CLOSE , N_("_Close") , "<control>W", N_("Close the current file"), G_CALLBACK (ui_mainwindow_action_close) },
{ "Quit" , ICONNAME_QUIT , N_("_Quit") , "<control>Q", N_("Quit homebank"), G_CALLBACK (ui_mainwindow_action_quit) }, { "Quit" , ICONNAME_QUIT , N_("_Quit") , "<control>Q", N_("Quit HomeBank"), G_CALLBACK (ui_mainwindow_action_quit) },
/* Exchange */ /* Exchange */
{ "ImportQIF" , ICONNAME_HB_FILE_IMPORT , N_("QIF file...") , NULL, N_("Open the import assistant"), G_CALLBACK (ui_mainwindow_action_import) }, { "ImportQIF" , ICONNAME_HB_FILE_IMPORT , N_("QIF file...") , NULL, N_("Open the import assistant"), G_CALLBACK (ui_mainwindow_action_import) },
...@@ -188,7 +188,7 @@ static GtkActionEntry entries[] = { ...@@ -188,7 +188,7 @@ static GtkActionEntry entries[] = {
{ "ExportQIF" , ICONNAME_HB_FILE_EXPORT , N_("Export QIF file...") , NULL, N_("Export all account in a QIF file"), G_CALLBACK (ui_mainwindow_action_export) }, { "ExportQIF" , ICONNAME_HB_FILE_EXPORT , N_("Export QIF file...") , NULL, N_("Export all account in a QIF file"), G_CALLBACK (ui_mainwindow_action_export) },
/* EditMenu */ /* EditMenu */
{ "Preferences", ICONNAME_PREFERENCES , N_("Preferences..."), NULL, N_("Configure homebank"), G_CALLBACK (ui_mainwindow_action_preferences) }, { "Preferences", ICONNAME_PREFERENCES , N_("Preferences..."), NULL, N_("Configure HomeBank"), G_CALLBACK (ui_mainwindow_action_preferences) },
/* ManageMenu */ /* ManageMenu */
{ "Currency" , ICONNAME_HB_CURRENCY , N_("Currencies...") , NULL, N_("Configure the currencies"), G_CALLBACK (ui_mainwindow_action_defcurrency) }, { "Currency" , ICONNAME_HB_CURRENCY , N_("Currencies...") , NULL, N_("Configure the currencies"), G_CALLBACK (ui_mainwindow_action_defcurrency) },
...@@ -234,7 +234,7 @@ static GtkToggleActionEntry toggle_entries[] = { ...@@ -234,7 +234,7 @@ static GtkToggleActionEntry toggle_entries[] = {
{ "Toolbar" , NULL , N_("_Toolbar") , NULL, NULL, G_CALLBACK (ui_mainwindow_action_toggle_toolbar), TRUE }, { "Toolbar" , NULL , N_("_Toolbar") , NULL, NULL, G_CALLBACK (ui_mainwindow_action_toggle_toolbar), TRUE },
{ "Spending" , NULL , N_("_Top spending") , NULL, NULL, G_CALLBACK (ui_mainwindow_action_toggle_topspending), TRUE }, { "Spending" , NULL , N_("_Top spending") , NULL, NULL, G_CALLBACK (ui_mainwindow_action_toggle_topspending), TRUE },
{ "Upcoming" , NULL , N_("_Scheduled list") , NULL, NULL, G_CALLBACK (ui_mainwindow_action_toggle_upcoming), TRUE }, { "Upcoming" , NULL , N_("_Scheduled list") , NULL, NULL, G_CALLBACK (ui_mainwindow_action_toggle_upcoming), TRUE },
{ "AsMinor" , NULL , N_("Minor currency"), "<control>M", NULL, G_CALLBACK (ui_mainwindow_action_toggle_minor), FALSE }, { "AsMinor" , NULL , N_("Euro minor"), "<control>M", NULL, G_CALLBACK (ui_mainwindow_action_toggle_minor), FALSE },
}; };
static guint n_toggle_entries = G_N_ELEMENTS (toggle_entries); static guint n_toggle_entries = G_N_ELEMENTS (toggle_entries);
...@@ -1749,6 +1749,9 @@ gint r; ...@@ -1749,6 +1749,9 @@ gint r;
if(PREFS->appendscheduled) if(PREFS->appendscheduled)
scheduled_post_all_pending(); scheduled_post_all_pending();
if(PREFS->do_update_currency)
ui_cur_manage_dialog_update_currencies(GTK_WINDOW(GLOBALS->mainwindow));
homebank_lastopenedfiles_save(); homebank_lastopenedfiles_save();
//todo: delete this after computing done at xml read //todo: delete this after computing done at xml read
...@@ -1838,7 +1841,7 @@ gint r = XML_UNSET; ...@@ -1838,7 +1841,7 @@ gint r = XML_UNSET;
} }
else else
{ {
gchar *msg = _("I/O error for file %s."); gchar *msg = _("I/O error for file '%s'.");
ui_dialog_msg_infoerror(GTK_WINDOW(data->window), GTK_MESSAGE_ERROR, ui_dialog_msg_infoerror(GTK_WINDOW(data->window), GTK_MESSAGE_ERROR,
_("File error"), _("File error"),
......
...@@ -976,7 +976,7 @@ const gchar *encoding; ...@@ -976,7 +976,7 @@ const gchar *encoding;
if( g_strv_length (str_array) != 3 ) if( g_strv_length (str_array) != 3 )
{ {
*error = _("invalid csv format"); *error = _("invalid CSV format");
retval = FALSE; retval = FALSE;
DB( g_print(" + error %s\n", *error) ); DB( g_print(" + error %s\n", *error) );
} }
......
...@@ -448,12 +448,12 @@ Currency *base; ...@@ -448,12 +448,12 @@ Currency *base;
Currency *item; Currency *item;
gint i; gint i;
//https://query.yahooapis.com/v1/public/yql //http://query.yahooapis.com/v1/public/yql
//?q=select * from yahoo.finance.xchange where pair in ("EURGBP","EURUSD") //?q=select * from yahoo.finance.xchange where pair in ("EURGBP","EURUSD")
//&env=store://datatables.org/alltableswithkeys //&env=store://datatables.org/alltableswithkeys
node = g_string_sized_new(1024); node = g_string_sized_new(1024);
g_string_append(node, "https://query.yahooapis.com/v1/public/yql"); g_string_append(node, "http://query.yahooapis.com/v1/public/yql");
g_string_append(node, "?q=select * from yahoo.finance.xchange where pair in ("); g_string_append(node, "?q=select * from yahoo.finance.xchange where pair in (");
base = da_cur_get (GLOBALS->kcur); base = da_cur_get (GLOBALS->kcur);
......
...@@ -63,7 +63,6 @@ static void homebank_pref_init_monetary(void) ...@@ -63,7 +63,6 @@ static void homebank_pref_init_monetary(void)
//LPWSTR wcBuffer = buffer; //LPWSTR wcBuffer = buffer;
LPSTR wcBuffer = buffer; LPSTR wcBuffer = buffer;
int iResult; int iResult;
gsize toto;
//https://msdn.microsoft.com/en-us/library/windows/desktop/dd464799%28v=vs.85%29.aspx //https://msdn.microsoft.com/en-us/library/windows/desktop/dd464799%28v=vs.85%29.aspx
...@@ -317,6 +316,7 @@ gint i; ...@@ -317,6 +316,7 @@ gint i;
PREFS->showsplash = TRUE; PREFS->showsplash = TRUE;
PREFS->loadlast = TRUE; PREFS->loadlast = TRUE;
PREFS->appendscheduled = FALSE; PREFS->appendscheduled = FALSE;
PREFS->do_update_currency = FALSE;
PREFS->heritdate = FALSE; PREFS->heritdate = FALSE;
PREFS->hidereconciled = FALSE; PREFS->hidereconciled = FALSE;
...@@ -666,6 +666,7 @@ GError *error = NULL; ...@@ -666,6 +666,7 @@ GError *error = NULL;
homebank_pref_get_boolean(keyfile, group, "ShowSplash", &PREFS->showsplash); homebank_pref_get_boolean(keyfile, group, "ShowSplash", &PREFS->showsplash);
homebank_pref_get_boolean(keyfile, group, "LoadLast", &PREFS->loadlast); homebank_pref_get_boolean(keyfile, group, "LoadLast", &PREFS->loadlast);
homebank_pref_get_boolean(keyfile, group, "AppendScheduled", &PREFS->appendscheduled); homebank_pref_get_boolean(keyfile, group, "AppendScheduled", &PREFS->appendscheduled);
homebank_pref_get_boolean(keyfile, group, "UpdateCurrency", &PREFS->do_update_currency);
homebank_pref_get_boolean(keyfile, group, "HeritDate", &PREFS->heritdate); homebank_pref_get_boolean(keyfile, group, "HeritDate", &PREFS->heritdate);
homebank_pref_get_boolean(keyfile, group, "HideReconciled", &PREFS->hidereconciled); homebank_pref_get_boolean(keyfile, group, "HideReconciled", &PREFS->hidereconciled);
...@@ -996,6 +997,7 @@ gsize length; ...@@ -996,6 +997,7 @@ gsize length;
g_key_file_set_boolean (keyfile, group, "ShowSplash", PREFS->showsplash); g_key_file_set_boolean (keyfile, group, "ShowSplash", PREFS->showsplash);
g_key_file_set_boolean (keyfile, group, "LoadLast", PREFS->loadlast); g_key_file_set_boolean (keyfile, group, "LoadLast", PREFS->loadlast);
g_key_file_set_boolean (keyfile, group, "AppendScheduled", PREFS->appendscheduled); g_key_file_set_boolean (keyfile, group, "AppendScheduled", PREFS->appendscheduled);
g_key_file_set_boolean (keyfile, group, "UpdateCurrency", PREFS->do_update_currency);
g_key_file_set_boolean (keyfile, group, "HeritDate", PREFS->heritdate); g_key_file_set_boolean (keyfile, group, "HeritDate", PREFS->heritdate);
g_key_file_set_boolean (keyfile, group, "HideReconciled", PREFS->hidereconciled); g_key_file_set_boolean (keyfile, group, "HideReconciled", PREFS->hidereconciled);
......
...@@ -57,6 +57,7 @@ struct Preferences ...@@ -57,6 +57,7 @@ struct Preferences
gboolean showsplash; gboolean showsplash;
gboolean loadlast; gboolean loadlast;
gboolean appendscheduled; gboolean appendscheduled;
gboolean do_update_currency;
gshort fisc_year_day; gshort fisc_year_day;
gshort fisc_year_month; gshort fisc_year_month;
gint date_range_wal; gint date_range_wal;
......
...@@ -850,7 +850,7 @@ GError *error = NULL; ...@@ -850,7 +850,7 @@ GError *error = NULL;
gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1); gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1);
row++; row++;
widget = gtk_check_button_new_with_mnemonic (_("_Minor currency")); widget = gtk_check_button_new_with_mnemonic (_("Euro _minor"));
data->CM_minor = widget; data->CM_minor = widget;
gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1); gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1);
......
...@@ -1109,7 +1109,7 @@ GError *error = NULL; ...@@ -1109,7 +1109,7 @@ GError *error = NULL;
gtk_grid_attach (GTK_GRID (table), data->CY_kind, 2, row, 1, 1); gtk_grid_attach (GTK_GRID (table), data->CY_kind, 2, row, 1, 1);
row++; row++;
widget = gtk_check_button_new_with_mnemonic (_("_Minor currency")); widget = gtk_check_button_new_with_mnemonic (_("Euro _minor"));
data->CM_minor = widget; data->CM_minor = widget;
gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1); gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1);
......
...@@ -1521,7 +1521,7 @@ GError *error = NULL; ...@@ -1521,7 +1521,7 @@ GError *error = NULL;
gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1); gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1);
row++; row++;
widget = gtk_check_button_new_with_mnemonic (_("_Minor currency")); widget = gtk_check_button_new_with_mnemonic (_("Euro _minor"));
data->CM_minor = widget; data->CM_minor = widget;
gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1); gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1);
......
...@@ -1376,7 +1376,7 @@ GError *error = NULL; ...@@ -1376,7 +1376,7 @@ GError *error = NULL;
gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1); gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1);
row++; row++;
label = make_label_widget(_("_Account:")); label = make_label_widget(_("A_ccount:"));
data->LB_acc = label; data->LB_acc = label;
gtk_grid_attach (GTK_GRID (table), label, 1, row, 1, 1); gtk_grid_attach (GTK_GRID (table), label, 1, row, 1, 1);
widget = ui_acc_comboboxentry_new(label); widget = ui_acc_comboboxentry_new(label);
...@@ -1417,7 +1417,7 @@ GError *error = NULL; ...@@ -1417,7 +1417,7 @@ GError *error = NULL;
gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1); gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1);
row++; row++;
widget = gtk_check_button_new_with_mnemonic (_("_Minor currency")); widget = gtk_check_button_new_with_mnemonic (_("Euro _minor"));
data->CM_minor = widget; data->CM_minor = widget;
gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1); gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1);
......
...@@ -732,7 +732,7 @@ GError *error = NULL; ...@@ -732,7 +732,7 @@ GError *error = NULL;
gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1); gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1);
row++; row++;
widget = gtk_check_button_new_with_mnemonic (_("_Minor currency")); widget = gtk_check_button_new_with_mnemonic (_("Euro _minor"));
data->CM_minor = widget; data->CM_minor = widget;
gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1); gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1);
......
...@@ -1376,7 +1376,7 @@ gint w, h, row; ...@@ -1376,7 +1376,7 @@ gint w, h, row;
gtk_grid_set_column_spacing (GTK_GRID (group_grid), SPACING_MEDIUM); gtk_grid_set_column_spacing (GTK_GRID (group_grid), SPACING_MEDIUM);
gtk_grid_attach (GTK_GRID (content_grid), group_grid, 0, 1, 1, 1); gtk_grid_attach (GTK_GRID (content_grid), group_grid, 0, 1, 1, 1);
label = make_label_group(_("Balance Limits")); label = make_label_group(_("Balance limits"));
gtk_grid_attach (GTK_GRID (group_grid), label, 0, 0, 3, 1); gtk_grid_attach (GTK_GRID (group_grid), label, 0, 0, 3, 1);
//TODO: warning/absolute minimum balance //TODO: warning/absolute minimum balance
......
...@@ -506,7 +506,7 @@ const gchar *encoding; ...@@ -506,7 +506,7 @@ const gchar *encoding;
{ {
ui_dialog_msg_infoerror(GTK_WINDOW(data->window), GTK_MESSAGE_ERROR, ui_dialog_msg_infoerror(GTK_WINDOW(data->window), GTK_MESSAGE_ERROR,
_("File format error"), _("File format error"),
_("The csv file must contains the exact numbers of column,\nseparated by a semi-colon, read the help for more details.") _("The CSV file must contains the exact numbers of column,\nseparated by a semi-colon, please see the help for more details.")
); );
} }
......
...@@ -1162,7 +1162,7 @@ gchar *error; ...@@ -1162,7 +1162,7 @@ gchar *error;
{ {
ui_dialog_msg_infoerror(GTK_WINDOW(data->window), GTK_MESSAGE_ERROR, ui_dialog_msg_infoerror(GTK_WINDOW(data->window), GTK_MESSAGE_ERROR,
_("File format error"), _("File format error"),
_("The csv file must contains the exact numbers of column,\nseparated by a semi-colon, please see the help for more details.") _("The CSV file must contains the exact numbers of column,\nseparated by a semi-colon, please see the help for more details.")
); );
} }
......
...@@ -769,7 +769,7 @@ GtkWidget *label, *widget, *expander; ...@@ -769,7 +769,7 @@ GtkWidget *label, *widget, *expander;
gint crow, row; gint crow, row;
dialog = gtk_dialog_new_with_buttons ( dialog = gtk_dialog_new_with_buttons (
_("Edit Currency"), _("Edit currency"),
GTK_WINDOW (parent), GTK_WINDOW (parent),
0, 0,
_("_Cancel"), _("_Cancel"),
...@@ -1140,50 +1140,62 @@ Currency4217 *curfmt = NULL; ...@@ -1140,50 +1140,62 @@ Currency4217 *curfmt = NULL;
/* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */ /* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */
static void gint ui_cur_manage_dialog_update_currencies(GtkWindow *parent)
ui_cur_manage_dialog_sync(GtkWidget *widget, gpointer user_data)
{ {
struct ui_cur_manage_dialog_data *data;
GError *error = NULL; GError *error = NULL;
gboolean retcode; gboolean retcode = FALSE;
DB( g_printf("\n(ui_cur_manage) add\n") );
data = g_object_get_data(G_OBJECT(gtk_widget_get_ancestor(widget, GTK_TYPE_WINDOW)), "inst_data"); DB( g_printf("\n(ui_cur_manage) update currencies\n") );
// do nothing if just the base currency
if(da_cur_length() <= 1)
return TRUE;
retcode = currency_sync_online(&error); retcode = currency_sync_online(&error);
DB( g_print("retcode: %d\n", retcode) ); DB( g_print("retcode: %d\n", retcode) );
if(retcode == TRUE) if(!retcode)
{
gtk_tree_view_columns_autosize (GTK_TREE_VIEW(data->LV_cur));
//todo: (or not) msg with changes
}
else
{ {
gchar *msg = _("Unknow error"); gchar *msg = _("Unknow error");
if( error ) if( error )
{
msg = error->message; msg = error->message;
}
g_warning("update online: '%s'", msg); g_warning("update online: '%s'", msg);
ui_dialog_msg_infoerror(GTK_WINDOW(data->window), GTK_MESSAGE_ERROR, ui_dialog_msg_infoerror(GTK_WINDOW(parent), GTK_MESSAGE_ERROR,
_("Update online error"), _("Update online error"),
msg, msg,
NULL NULL
); );
if( error ) if( error )
{
g_error_free (error); g_error_free (error);
}
} }
return retcode;
}
static void
ui_cur_manage_dialog_sync(GtkWidget *widget, gpointer user_data)
{
struct ui_cur_manage_dialog_data *data;
gboolean retcode;
DB( g_printf("\n(ui_cur_manage) sync online\n") );
data = g_object_get_data(G_OBJECT(gtk_widget_get_ancestor(widget, GTK_TYPE_WINDOW)), "inst_data");
retcode = ui_cur_manage_dialog_update_currencies(GTK_WINDOW(data->window));
if(retcode == TRUE)
{
gtk_tree_view_columns_autosize (GTK_TREE_VIEW(data->LV_cur));
//todo: (or not) msg with changes
}
} }
......
...@@ -112,6 +112,8 @@ void ui_cur_listview_remove_selected(GtkTreeView *treeview); ...@@ -112,6 +112,8 @@ void ui_cur_listview_remove_selected(GtkTreeView *treeview);
void ui_cur_listview_populate(GtkWidget *view); void ui_cur_listview_populate(GtkWidget *view);
GtkWidget *ui_cur_listview_new(gboolean withtoggle); GtkWidget *ui_cur_listview_new(gboolean withtoggle);
gint ui_cur_manage_dialog_update_currencies(GtkWindow *parent);
GtkWidget *ui_cur_manage_dialog (void); GtkWidget *ui_cur_manage_dialog (void);
Currency4217 *ui_cur_select_dialog_new(GtkWindow *parent, gint select_mode); Currency4217 *ui_cur_select_dialog_new(GtkWindow *parent, gint select_mode);
......
...@@ -534,12 +534,12 @@ gboolean retval; ...@@ -534,12 +534,12 @@ gboolean retval;
if( action == GTK_FILE_CHOOSER_ACTION_OPEN ) if( action == GTK_FILE_CHOOSER_ACTION_OPEN )
{ {
title = _("Open homebank file"); title = _("Open HomeBank file");
button = _("_Open"); button = _("_Open");
} }
else else
{ {
title = _("Save homebank file as"); title = _("Save HomeBank file as");
button = _("_Save"); button = _("_Save");
} }
......
...@@ -65,12 +65,12 @@ gchar *CYA_FLT_STATUS[] = { ...@@ -65,12 +65,12 @@ gchar *CYA_FLT_STATUS[] = {
}; };
gchar *CYA_FLT_RANGE[] = { gchar *CYA_FLT_RANGE[] = {
N_("This Month"), N_("This month"),
N_("Last Month"), N_("Last month"),
N_("This Quarter"), N_("This quarter"),
N_("Last Quarter"), N_("Last quarter"),