/* HomeBank -- Free, easy, personal accounting for everyone.
- * Copyright (C) 1995-2014 Maxime DOYEN
+ * Copyright (C) 1995-2016 Maxime DOYEN
*
* This file is part of HomeBank.
*
#include "ui-payee.h"
#include "ui-category.h"
#include "ui-filter.h"
+#include "ui-transaction.h"
/****************************************************************************/
/* Debug macros */
static GtkActionEntry entries[] = {
- { "List" , "hb-view-list" , N_("List") , NULL, N_("View results as list"), G_CALLBACK (ui_repdist_action_viewlist) },
- { "Bar" , "hb-view-bar" , N_("Bar") , NULL, N_("View results as bars"), G_CALLBACK (ui_repdist_action_viewbar) },
- { "Pie" , "hb-view-pie" , N_("Pie") , NULL, N_("View results as pies"), G_CALLBACK (ui_repdist_action_viewpie) },
+ { "List" , ICONNAME_HB_VIEW_LIST , N_("List") , NULL, N_("View results as list"), G_CALLBACK (ui_repdist_action_viewlist) },
+ { "Column" , ICONNAME_HB_VIEW_COLUMN , N_("Column") , NULL, N_("View results as column"), G_CALLBACK (ui_repdist_action_viewbar) },
+ { "Donut" , ICONNAME_HB_VIEW_DONUT , N_("Donut") , NULL, N_("View results as donut"), G_CALLBACK (ui_repdist_action_viewpie) },
- { "Filter" , "hb-filter" , N_("Filter") , NULL, N_("Edit the filter"), G_CALLBACK (ui_repdist_action_filter) },
- { "Refresh" , GTK_STOCK_REFRESH , N_("Refresh"), NULL, N_("Refresh results"), G_CALLBACK (ui_repdist_action_refresh) },
+ { "Filter" , ICONNAME_HB_FILTER , N_("Filter") , NULL, N_("Edit filter"), G_CALLBACK (ui_repdist_action_filter) },
+ { "Refresh" , ICONNAME_REFRESH , N_("Refresh"), NULL, N_("Refresh results"), G_CALLBACK (ui_repdist_action_refresh) },
- { "Export" , "hb-file-export", N_("Export") , NULL, N_("Export as CSV"), G_CALLBACK (ui_repdist_action_export) },
+ { "Export" , ICONNAME_HB_FILE_EXPORT , N_("Export") , NULL, N_("Export as CSV"), G_CALLBACK (ui_repdist_action_export) },
};
static guint n_entries = G_N_ELEMENTS (entries);
static GtkToggleActionEntry toggle_entries[] = {
- { "Detail", "hb-ope-show", /* name, stock id */
+ { "Detail", ICONNAME_HB_OPE_SHOW, /* name, icon-name */
N_("Detail"), NULL, /* label, accelerator */
N_("Toggle detail"), /* tooltip */
G_CALLBACK (ui_repdist_action_detail),
FALSE }, /* is_active */
- { "Legend", "hb-legend", /* name, stock id */
+ { "Legend", ICONNAME_HB_SHOW_LEGEND, /* name, icon-name */
N_("Legend"), NULL, /* label, accelerator */
N_("Toggle legend"), /* tooltip */
G_CALLBACK (ui_repdist_action_legend),
TRUE }, /* is_active */
- { "Rate", "hb-rate", /* name, stock id */
+ { "Rate", ICONNAME_HB_SHOW_RATE, /* name, icon-name */
N_("Rate"), NULL, /* label, accelerator */
N_("Toggle rate"), /* tooltip */
G_CALLBACK (ui_repdist_action_rate),
"<ui>"
" <toolbar name='ToolBar'>"
" <toolitem action='List'/>"
-" <toolitem action='Bar'/>"
-" <toolitem action='Pie'/>"
+" <toolitem action='Column'/>"
+" <toolitem action='Donut'/>"
" <separator/>"
" <toolitem action='Detail'/>"
" <toolitem action='Legend'/>"
//debug
//create_deffilter_window(data->filter, TRUE);
- if(ui_flt_manage_dialog_new(data->filter, TRUE) != GTK_RESPONSE_REJECT)
+ if(ui_flt_manage_dialog_new(data->window, data->filter, TRUE) != GTK_RESPONSE_REJECT)
{
ui_repdist_compute(data->window, NULL);
ui_repdist_update_daterange(data->window, NULL);
data = g_object_get_data(G_OBJECT(gtk_widget_get_ancestor(widget, GTK_TYPE_WINDOW)), "inst_data");
- data->filter->mindate = gtk_dateentry_get_date(GTK_DATE_ENTRY(data->PO_mindate));
- data->filter->maxdate = gtk_dateentry_get_date(GTK_DATE_ENTRY(data->PO_maxdate));
+ data->filter->mindate = gtk_date_entry_get_date(GTK_DATE_ENTRY(data->PO_mindate));
+ data->filter->maxdate = gtk_date_entry_get_date(GTK_DATE_ENTRY(data->PO_maxdate));
// set min/max date for both widget
- gtk_dateentry_set_maxdate(GTK_DATE_ENTRY(data->PO_mindate), data->filter->maxdate);
- gtk_dateentry_set_mindate(GTK_DATE_ENTRY(data->PO_maxdate), data->filter->mindate);
+ gtk_date_entry_set_maxdate(GTK_DATE_ENTRY(data->PO_mindate), data->filter->maxdate);
+ gtk_date_entry_set_mindate(GTK_DATE_ENTRY(data->PO_maxdate), data->filter->mindate);
g_signal_handler_block(data->CY_range, data->handler_id[HID_REPDIST_RANGE]);
gtk_combo_box_set_active(GTK_COMBO_BOX(data->CY_range), FLT_RANGE_OTHER);
if(range != FLT_RANGE_OTHER)
{
- filter_preset_daterange_set(data->filter, range);
+ filter_preset_daterange_set(data->filter, range, 0);
g_signal_handler_block(data->PO_mindate, data->handler_id[HID_REPDIST_MINDATE]);
g_signal_handler_block(data->PO_maxdate, data->handler_id[HID_REPDIST_MAXDATE]);
- gtk_dateentry_set_date(GTK_DATE_ENTRY(data->PO_mindate), data->filter->mindate);
- gtk_dateentry_set_date(GTK_DATE_ENTRY(data->PO_maxdate), data->filter->maxdate);
+ gtk_date_entry_set_date(GTK_DATE_ENTRY(data->PO_mindate), data->filter->mindate);
+ gtk_date_entry_set_date(GTK_DATE_ENTRY(data->PO_maxdate), data->filter->maxdate);
g_signal_handler_unblock(data->PO_mindate, data->handler_id[HID_REPDIST_MINDATE]);
g_signal_handler_unblock(data->PO_maxdate, data->handler_id[HID_REPDIST_MAXDATE]);
}
else
{
- if(ui_flt_manage_dialog_new(data->filter, TRUE) != GTK_RESPONSE_REJECT)
+ if(ui_flt_manage_dialog_new(data->window, data->filter, TRUE) != GTK_RESPONSE_REJECT)
{
ui_repdist_compute(data->window, NULL);
ui_repdist_update_daterange(widget, NULL);
gtk_tree_view_set_model(GTK_TREE_VIEW(data->LV_detail), NULL); /* Detach model from view */
/* fill in the model */
- list = g_list_first(GLOBALS->ope_list);
+ list = g_queue_peek_head_link(data->txn_queue);
while (list != NULL)
{
Transaction *ope = list->data;
- Account *acc;
- //DB( g_print(" get %s\n", ope->ope_Word) );
-
- acc = da_acc_get(ope->kacc);
- if(acc == NULL) goto next1;
- if((acc->flags & (AF_CLOSED|AF_NOREPORT))) goto next1;
-
- //filter here
- if( !(ope->flags & OF_REMIND) )
+ if(filter_test(data->filter, ope) == 1)
{
- if(filter_test(data->filter, ope) == 1)
- {
- guint i, pos = 0;
+ guint i, pos = 0;
- if( tmpfor != BY_REPDIST_TAG )
+ if( tmpfor != BY_REPDIST_TAG )
+ {
+ if( (tmpfor == BY_REPDIST_CATEGORY || tmpfor == BY_REPDIST_SUBCATEGORY) && ope->flags & OF_SPLIT )
{
- if( (tmpfor == BY_REPDIST_CATEGORY || tmpfor == BY_REPDIST_SUBCATEGORY) && ope->flags & OF_SPLIT )
+ guint nbsplit = da_splits_count(ope->splits);
+ Split *split;
+
+ for(i=0;i<nbsplit;i++)
{
- guint nbsplit = da_transaction_splits_count(ope);
- Split *split;
-
- for(i=0;i<nbsplit;i++)
+ split = ope->splits[i];
+ switch(tmpfor)
{
- split = ope->splits[i];
- switch(tmpfor)
- {
- case BY_REPDIST_CATEGORY:
- {
- Category *catentry = da_cat_get(split->kcat);
- if(catentry)
- pos = (catentry->flags & GF_SUB) ? catentry->parent : catentry->key;
- }
- break;
- case BY_REPDIST_SUBCATEGORY:
- pos = split->kcat;
- break;
- }
-
- if( pos == active )
- {
-
- gtk_list_store_append (GTK_LIST_STORE(model), &iter);
- gtk_list_store_set (GTK_LIST_STORE(model), &iter,
- LST_DSPOPE_DATAS, ope,
- -1);
-
+ case BY_REPDIST_CATEGORY:
+ {
+ Category *catentry = da_cat_get(split->kcat);
+ if(catentry)
+ pos = (catentry->flags & GF_SUB) ? catentry->parent : catentry->key;
+ }
+ break;
+ case BY_REPDIST_SUBCATEGORY:
+ pos = split->kcat;
break;
- }
-
}
- }
- else
- {
- pos = ui_repdist_result_get_pos(tmpfor, data->filter->mindate, ope);
+
if( pos == active )
{
gtk_list_store_set (GTK_LIST_STORE(model), &iter,
LST_DSPOPE_DATAS, ope,
-1);
-
+
+ break;
}
- }
+ }
}
else
- /* the TAG process is particular */
{
- if(ope->tags != NULL)
+ pos = ui_repdist_result_get_pos(tmpfor, data->filter->mindate, ope);
+ if( pos == active )
{
- guint32 *tptr = ope->tags;
- while(*tptr)
- {
- pos = *tptr - 1;
+ gtk_list_store_append (GTK_LIST_STORE(model), &iter);
+ gtk_list_store_set (GTK_LIST_STORE(model), &iter,
+ LST_DSPOPE_DATAS, ope,
+ -1);
- DB( g_print(" -> storing tag %d %.2f\n", pos, ope->amount) );
+ }
+ }
- if( pos == active )
- {
- gtk_list_store_append (GTK_LIST_STORE(model), &iter);
- gtk_list_store_set (GTK_LIST_STORE(model), &iter,
- LST_DSPOPE_DATAS, ope,
- -1);
+ }
+ else
+ /* the TAG process is particular */
+ {
+ if(ope->tags != NULL)
+ {
+ guint32 *tptr = ope->tags;
- }
+ while(*tptr)
+ {
+ pos = *tptr - 1;
+
+ DB( g_print(" -> storing tag %d %.2f\n", pos, ope->amount) );
+
+ if( pos == active )
+ {
+ gtk_list_store_append (GTK_LIST_STORE(model), &iter);
+ gtk_list_store_set (GTK_LIST_STORE(model), &iter,
+ LST_DSPOPE_DATAS, ope,
+ -1);
- tptr++;
}
+ tptr++;
}
+
}
+ }
- }
}
-next1:
+
list = g_list_next(list);
}
gtk_tree_view_set_model(GTK_TREE_VIEW(data->LV_detail), model);
g_object_unref(model);
+ gtk_tree_view_columns_autosize( GTK_TREE_VIEW(data->LV_detail) );
+
}
}
/* update bar chart */
DB( g_print(" set bar to %d %s\n\n", column, _(CYA_KIND2[tmpkind])) );
if( tmpkind == 0 )
- gtk_chart_set_dualdatas(GTK_CHART(data->RE_chart), model, LST_REPDIST_EXPENSE, LST_REPDIST_INCOME, title);
+ gtk_chart_set_dualdatas(GTK_CHART(data->RE_chart), model, LST_REPDIST_EXPENSE, LST_REPDIST_INCOME, title, NULL);
else
- gtk_chart_set_datas(GTK_CHART(data->RE_chart), model, column, title);
+ gtk_chart_set_datas(GTK_CHART(data->RE_chart), model, column, title, NULL);
/* show xval for month/year and no by amount display */
//minor = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_minor));
- /*
- hb_label_set_colvaluecurr(GTK_LABEL(data->TX_total[0]), data->total_expense, GLOBALS->kcur);
- hb_label_set_colvaluecurr(GTK_LABEL(data->TX_total[1]), data->total_income, GLOBALS->kcur);
- hb_label_set_colvaluecurr(GTK_LABEL(data->TX_total[2]), data->total_expense + data->total_income, GLOBALS->kcur);
- */
-
- hb_label_set_colvalue(GTK_LABEL(data->TX_total[0]), data->total_expense, GLOBALS->minor);
- hb_label_set_colvalue(GTK_LABEL(data->TX_total[1]), data->total_income, GLOBALS->minor);
- hb_label_set_colvalue(GTK_LABEL(data->TX_total[2]), data->total_expense + data->total_income, GLOBALS->minor);
+ hb_label_set_colvalue(GTK_LABEL(data->TX_total[0]), data->total_expense, GLOBALS->kcur, GLOBALS->minor);
+ hb_label_set_colvalue(GTK_LABEL(data->TX_total[1]), data->total_income, GLOBALS->kcur, GLOBALS->minor);
+ hb_label_set_colvalue(GTK_LABEL(data->TX_total[2]), data->total_expense + data->total_income, GLOBALS->kcur, GLOBALS->minor);
}
DB( g_print(" for=%d,kind=%d\n", tmpfor, tmpkind) );
-
-
- /* do nothing if no transaction */
- if(g_list_length(GLOBALS->ope_list) == 0) return;
-
//get our min max date
from = data->filter->mindate;
to = data->filter->maxdate;
if(to < from) return;
+
+ g_queue_free (data->txn_queue);
+ data->txn_queue = hbfile_transaction_get_partial(data->filter->mindate, data->filter->maxdate);
+
+ DB( g_print(" nb-txn=%d\n", g_queue_get_length (data->txn_queue) ) );
+
/* count number or results */
switch(tmpfor)
{
if(tmp_expense && tmp_income)
{
+
+ DB( g_print(" - ok memory\n") );
+
/* compute the results */
- list = g_list_first(GLOBALS->ope_list);
+ list = g_queue_peek_head_link(data->txn_queue);
while (list != NULL)
{
Transaction *ope = list->data;
- Account *acc;
- //debug
- //DB( g_print("** testing '%s', cat=%d==> %d\n", ope->wording, ope->category, filter_test(data->filter, ope)) );
- acc = da_acc_get(ope->kacc);
- if(acc == NULL) goto next1;
- if((acc->flags & (AF_CLOSED|AF_NOREPORT))) goto next1;
-
- if( !(ope->flags & OF_REMIND) )
- {
- if( (filter_test(data->filter, ope) == 1) )
- {
- guint32 pos = 0;
- gdouble trn_amount;
+
+ DB( g_print("** testing '%s', cat=%d==> %d\n", ope->wording, ope->kcat, filter_test(data->filter, ope)) );
- //trn_amount = to_base_amount(ope->amount, acc->kcur);
- trn_amount = ope->amount;
+ if( (filter_test(data->filter, ope) == 1) )
+ {
+ guint32 pos = 0;
+ gdouble trn_amount;
- if( tmpfor != BY_REPDIST_TAG )
- {
- if( (tmpfor == BY_REPDIST_CATEGORY || tmpfor == BY_REPDIST_SUBCATEGORY) && ope->flags & OF_SPLIT )
- {
- guint nbsplit = da_transaction_splits_count(ope);
- Split *split;
- Category *catentry;
- gint sinsert;
+ DB( g_print(" - should insert\n") );
- for(i=0;i<nbsplit;i++)
- {
- split = ope->splits[i];
- catentry = da_cat_get(split->kcat);
- if(!catentry) continue;
- sinsert = ( catentry->filter == TRUE ) ? 1 : 0;
- if(data->filter->option[FILTER_CATEGORY] == 2) sinsert ^= 1;
+ //trn_amount = ope->amount;
+ trn_amount = hb_amount_base(ope->amount, ope->kcur);
- DB( g_print(" split '%s' insert=%d\n",catentry->name, sinsert) );
-
- if( (data->filter->option[FILTER_CATEGORY] == 0) || sinsert)
- {
- switch(tmpfor)
- {
- case BY_REPDIST_CATEGORY:
- {
- if(catentry)
- pos = (catentry->flags & GF_SUB) ? catentry->parent : catentry->key;
- }
- break;
- case BY_REPDIST_SUBCATEGORY:
- pos = split->kcat;
- break;
- }
+ //#1562372 in case of a split we need to take amount for filter categories only
+ if( ope->flags & OF_SPLIT )
+ {
+ guint nbsplit = da_splits_count(ope->splits);
+ Split *split;
+ Category *catentry;
+ gint sinsert;
- //trn_amount = to_base_amount(split->amount, acc->kcur);
- trn_amount = split->amount;
+ trn_amount = 0.0;
- if(trn_amount > 0.0)
- {
- tmp_income[pos] += trn_amount;
- data->total_income += trn_amount;
- }
- else
- {
- tmp_expense[pos] += trn_amount;
- data->total_expense += trn_amount;
- }
+ for(i=0;i<nbsplit;i++)
+ {
+ split = ope->splits[i];
+ catentry = da_cat_get(split->kcat);
+ if(catentry == NULL) continue;
+ sinsert = ( catentry->filter == TRUE ) ? 1 : 0;
+ if(data->filter->option[FILTER_CATEGORY] == 2) sinsert ^= 1;
- }
- // end insert
+ DB( g_print(" split '%s' insert=%d\n",catentry->name, sinsert) );
- }
- }
- else
+ if( (data->filter->option[FILTER_CATEGORY] == 0) || sinsert)
{
- pos = ui_repdist_result_get_pos(tmpfor, from, ope);
- if(trn_amount > 0.0)
- {
- tmp_income[pos] += trn_amount;
- data->total_income += trn_amount;
- }
- else
- {
- tmp_expense[pos] += trn_amount;
- data->total_expense += trn_amount;
- }
+ trn_amount += hb_amount_base(split->amount, ope->kcur);
}
}
- else
- /* the TAG process is particular */
+
+ }
+
+
+ if( tmpfor != BY_REPDIST_TAG )
+ {
+ if( (tmpfor == BY_REPDIST_CATEGORY || tmpfor == BY_REPDIST_SUBCATEGORY) && ope->flags & OF_SPLIT )
{
- if(ope->tags != NULL)
- {
- guint32 *tptr = ope->tags;
+ guint nbsplit = da_splits_count(ope->splits);
+ Split *split;
+ Category *catentry;
+ gint sinsert;
- while(*tptr)
+ for(i=0;i<nbsplit;i++)
+ {
+ split = ope->splits[i];
+ catentry = da_cat_get(split->kcat);
+ if(catentry == NULL) continue;
+ sinsert = ( catentry->filter == TRUE ) ? 1 : 0;
+ if(data->filter->option[FILTER_CATEGORY] == 2) sinsert ^= 1;
+
+ DB( g_print(" split '%s' insert=%d\n",catentry->name, sinsert) );
+
+ if( (data->filter->option[FILTER_CATEGORY] == 0) || sinsert)
{
- pos = *tptr - 1;
+ switch(tmpfor)
+ {
+ case BY_REPDIST_CATEGORY:
+ {
+ pos = (catentry->flags & GF_SUB) ? catentry->parent : catentry->key;
+ }
+ break;
+ case BY_REPDIST_SUBCATEGORY:
+ pos = split->kcat;
+ break;
+ }
- DB( g_print(" -> storing tag %d %s %.2f\n", pos, da_tag_get(*tptr)->name, trn_amount) );
+ trn_amount = hb_amount_base(split->amount, ope->kcur);
+ //trn_amount = split->amount;
if(trn_amount > 0.0)
{
tmp_income[pos] += trn_amount;
+ data->total_income += trn_amount;
}
else
{
tmp_expense[pos] += trn_amount;
+ data->total_expense += trn_amount;
}
- tptr++;
+
}
+ // end insert
+
+ }
+ }
+ else
+ {
+ pos = ui_repdist_result_get_pos(tmpfor, from, ope);
+ if(trn_amount > 0.0)
+ {
+ tmp_income[pos] += trn_amount;
+ data->total_income += trn_amount;
+ }
+ else
+ {
+ tmp_expense[pos] += trn_amount;
+ data->total_expense += trn_amount;
+ }
+ }
+ }
+ else
+ /* the TAG process is particularly */
+ {
+ if(ope->tags != NULL)
+ {
+ guint32 *tptr = ope->tags;
+
+ while(*tptr)
+ {
+ pos = *tptr - 1;
+
+ DB( g_print(" -> storing tag %d %s %.2f\n", pos, da_tag_get(*tptr)->name, trn_amount) );
- //#1195859
if(trn_amount > 0.0)
{
- data->total_income += trn_amount;
+ tmp_income[pos] += trn_amount;
}
else
{
- data->total_expense += trn_amount;
+ tmp_expense[pos] += trn_amount;
}
+ tptr++;
+ }
+ //#1195859
+ if(trn_amount > 0.0)
+ {
+ data->total_income += trn_amount;
}
+ else
+ {
+ data->total_expense += trn_amount;
+ }
+
}
+ }
- // fix total according to selection
- //if(tmpkind==0 && !tmp_expense[pos]) { data->total_income -= ope->amount; }
- //if(tmpkind==1 && !tmp_income[pos] ) { data->total_expense -= ope->amount; }
+ // fix total according to selection
+ //if(tmpkind==0 && !tmp_expense[pos]) { data->total_income -= ope->amount; }
+ //if(tmpkind==1 && !tmp_income[pos] ) { data->total_expense -= ope->amount; }
- }
}
-next1:
+
list = g_list_next(list);
}
name = NULL;
fullcatname = NULL;
- DB( g_print("try to insert item %d\n", i) );
+ DB( g_print("try to insert item %d - %.2f %.2f\n", i, tmp_expense[i], tmp_income[i]) );
/* filter empty results */
g_free(fullcatname);
}
+ /* update column 0 title */
+ GtkTreeViewColumn *column = gtk_tree_view_get_column( GTK_TREE_VIEW(data->LV_report), 0);
+ gtk_tree_view_column_set_title(column, _(CYA_STATSELECT[tmpfor]));
+
gtk_tree_view_columns_autosize (GTK_TREE_VIEW(data->LV_report));
/* Re-attach model to view */
//view = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_view));
-
-
sensitive = page == 0 ? FALSE : TRUE;
+ gtk_widget_set_sensitive(data->LB_zoomx, sensitive);
gtk_widget_set_sensitive(data->RG_zoomx, sensitive);
-// gtk_widget_set_sensitive(data->TB_buttons[ACTION_REPBUDGET_LEGEND], sensitive);
gtk_action_set_sensitive(gtk_ui_manager_get_action(data->ui, "/ToolBar/Legend"), sensitive);
sensitive = page == 0 ? TRUE : FALSE;
gtk_action_set_sensitive(gtk_ui_manager_get_action(data->ui, "/ToolBar/Rate"), sensitive);
+}
+
+
+static void ui_repdist_detail_onRowActivated (GtkTreeView *treeview,
+ GtkTreePath *path,
+ GtkTreeViewColumn *col,
+ gpointer userdata)
+{
+struct ui_repdist_data *data;
+Transaction *active_txn;
+gboolean result;
+
+ data = g_object_get_data(G_OBJECT(gtk_widget_get_ancestor(GTK_WIDGET(treeview), GTK_TYPE_WINDOW)), "inst_data");
+ DB( g_print ("\n[repdist] A detail row has been double-clicked!\n") );
+
+ active_txn = list_txn_get_active_transaction(GTK_TREE_VIEW(data->LV_detail));
+ if(active_txn)
+ {
+ Transaction *old_txn, *new_txn;
+
+ old_txn = da_transaction_clone (active_txn);
+ new_txn = active_txn;
+ result = deftransaction_external_edit(GTK_WINDOW(data->window), old_txn, new_txn);
+
+ if(result == GTK_RESPONSE_ACCEPT)
+ {
+ //#1640885
+ GLOBALS->changes_count++;
+ ui_repdist_compute(data->window, NULL);
+ }
+
+ da_transaction_free (old_txn);
+ }
}
+
static void ui_repdist_update_detail(GtkWidget *widget, gpointer user_data)
{
struct ui_repdist_data *data;
data->detail ^= 1;
- DB( printf("\n[repdist] toggledetail to %d\n", data->detail) );
+ DB( g_print("\n[repdist] toggledetail to %d\n", data->detail) );
ui_repdist_update_detail(widget, user_data);
{
DB( g_print("\n[repdist] setup\n") );
+ data->txn_queue = g_queue_new ();
+
+ data->filter = da_filter_malloc();
+ filter_default_all_set(data->filter);
+
+
data->detail = PREFS->stat_showdetail;
data->legend = 1;
data->rate = PREFS->stat_showrate^1;
ui_repdist_toggle_rate(data->window, NULL);
- data->filter = da_filter_malloc();
- filter_default_all_set(data->filter);
/* 3.4 : make int transfer out of stats */
data->filter->option[FILTER_PAYMODE] = 1;
data->filter->paymode[PAYMODE_INTXFER] = FALSE;
- filter_preset_daterange_set(data->filter, PREFS->date_range_rep);
+ filter_preset_daterange_set(data->filter, PREFS->date_range_rep, 0);
g_signal_handler_block(data->PO_mindate, data->handler_id[HID_REPDIST_MINDATE]);
g_signal_handler_block(data->PO_maxdate, data->handler_id[HID_REPDIST_MAXDATE]);
- gtk_dateentry_set_date(GTK_DATE_ENTRY(data->PO_mindate), data->filter->mindate);
- gtk_dateentry_set_date(GTK_DATE_ENTRY(data->PO_maxdate), data->filter->maxdate);
+ gtk_date_entry_set_date(GTK_DATE_ENTRY(data->PO_mindate), data->filter->mindate);
+ gtk_date_entry_set_date(GTK_DATE_ENTRY(data->PO_maxdate), data->filter->maxdate);
g_signal_handler_unblock(data->PO_mindate, data->handler_id[HID_REPDIST_MINDATE]);
g_signal_handler_unblock(data->PO_maxdate, data->handler_id[HID_REPDIST_MAXDATE]);
DB( g_print("\n[repdist] dispose\n") );
+ g_queue_free (data->txn_queue);
+
da_filter_free(data->filter);
g_free(data);
{
struct ui_repdist_data *data;
struct WinGeometry *wg;
-GtkWidget *window, *mainvbox, *hbox, *vbox, *notebook, *treeview;
-GtkWidget *label, *widget, *table, *alignment, *entry;
+GtkWidget *window, *mainvbox, *hbox, *vbox, *notebook, *treeview, *vpaned, *sw;
+GtkWidget *label, *widget, *table, *entry;
gint row;
GtkUIManager *ui;
GtkActionGroup *actions;
gtk_window_set_title (GTK_WINDOW (window), _("Statistics Report"));
//set the window icon
- //homebank_window_set_icon_from_file(GTK_WINDOW (window), "report_stats.svg");
- gtk_window_set_icon_name(GTK_WINDOW (window), HB_STOCK_REP_STATS);
+ gtk_window_set_icon_name(GTK_WINDOW (window), ICONNAME_HB_REP_STATS);
//window contents
- mainvbox = gtk_vbox_new (FALSE, 0);
+ mainvbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (window), mainvbox);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start (GTK_BOX (mainvbox), hbox, TRUE, TRUE, 0);
//control part
- table = gtk_table_new (6, 3, FALSE);
- // gtk_alignment_new(xalign, yalign, xscale, yscale)
- alignment = gtk_alignment_new(0.0, 0.0, 0.0, 0.0);
- gtk_container_add(GTK_CONTAINER(alignment), table);
- gtk_box_pack_start (GTK_BOX (hbox), alignment, FALSE, FALSE, 0);
+ table = gtk_grid_new ();
+ gtk_widget_set_hexpand (GTK_WIDGET(table), FALSE);
+ gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (table), HB_BOX_SPACING);
- gtk_table_set_row_spacings (GTK_TABLE (table), HB_TABROW_SPACING);
- gtk_table_set_col_spacings (GTK_TABLE (table), HB_TABCOL_SPACING);
+ gtk_container_set_border_width (GTK_CONTAINER (table), SPACING_SMALL);
+ gtk_grid_set_row_spacing (GTK_GRID (table), SPACING_SMALL);
+ gtk_grid_set_column_spacing (GTK_GRID (table), SPACING_MEDIUM);
row = 0;
- label = make_label(_("Display"), 0.0, 0.5);
- gimp_label_set_attributes(GTK_LABEL(label), PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD, -1);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 3, row, row+1);
+ label = make_label_group(_("Display"));
+ gtk_grid_attach (GTK_GRID (table), label, 0, row, 3, 1);
row++;
- label = make_label(_("_View:"), 0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
+ label = make_label_widget(_("_View:"));
+ gtk_grid_attach (GTK_GRID (table), label, 1, row, 1, 1);
widget = make_cycle(label, CYA_KIND2);
data->CY_view = widget;
- gtk_table_attach_defaults (GTK_TABLE (table), widget, 2, 3, row, row+1);
+ gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1);
row++;
- label = make_label(_("_By:"), 0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
+ label = make_label_widget(_("_By:"));
+ gtk_grid_attach (GTK_GRID (table), label, 1, row, 1, 1);
widget = make_cycle(label, CYA_STATSELECT);
data->CY_by = widget;
- gtk_table_attach_defaults (GTK_TABLE (table), data->CY_by, 2, 3, row, row+1);
+ gtk_grid_attach (GTK_GRID (table), data->CY_by, 2, row, 1, 1);
row++;
widget = gtk_check_button_new_with_mnemonic (_("By _amount"));
data->CM_byamount = widget;
- gtk_table_attach_defaults (GTK_TABLE (table), widget, 1, 3, row, row+1);
+ gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1);
row++;
- widget = gtk_check_button_new_with_mnemonic (_("_Minor currency"));
+ widget = gtk_check_button_new_with_mnemonic (_("Euro _minor"));
data->CM_minor = widget;
- gtk_table_attach_defaults (GTK_TABLE (table), widget, 1, 3, row, row+1);
+ gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1);
row++;
- label = make_label(_("_Zoom X:"), 0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
+ label = make_label_widget(_("_Zoom X:"));
+ data->LB_zoomx = label;
+ gtk_grid_attach (GTK_GRID (table), label, 1, row, 1, 1);
widget = make_scale(label);
data->RG_zoomx = widget;
- gtk_table_attach_defaults (GTK_TABLE (table), widget, 2, 3, row, row+1);
+ gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1);
/*
row++;
widget = gtk_check_button_new_with_mnemonic ("Legend");
data->CM_legend = widget;
- gtk_table_attach_defaults (GTK_TABLE (table), widget, 1, 2, row, row+1);
+ gtk_grid_attach (GTK_GRID (table), widget, 1, 2, row, row+1);
*/
row++;
- widget = gtk_hseparator_new();
- gtk_table_attach_defaults (GTK_TABLE (table), widget, 0, 3, row, row+1);
+ widget = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
+ gtk_grid_attach (GTK_GRID (table), widget, 0, row, 3, 1);
row++;
- label = make_label(_("Date filter"), 0.0, 0.5);
- gimp_label_set_attributes(GTK_LABEL(label), PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD, -1);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 3, row, row+1);
+ label = make_label_group(_("Date filter"));
+ gtk_grid_attach (GTK_GRID (table), label, 0, row, 3, 1);
row++;
- label = make_label(_("_Range:"), 0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
+ label = make_label_widget(_("_Range:"));
+ gtk_grid_attach (GTK_GRID (table), label, 1, row, 1, 1);
data->CY_range = make_daterange(label, TRUE);
- gtk_table_attach_defaults (GTK_TABLE (table), data->CY_range, 2, 3, row, row+1);
+ gtk_grid_attach (GTK_GRID (table), data->CY_range, 2, row, 1, 1);
row++;
- label = make_label(_("_From:"), 0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
- data->PO_mindate = gtk_dateentry_new();
- gtk_table_attach_defaults (GTK_TABLE (table), data->PO_mindate, 2, 3, row, row+1);
+ label = make_label_widget(_("_From:"));
+ gtk_grid_attach (GTK_GRID (table), label, 1, row, 1, 1);
+ data->PO_mindate = gtk_date_entry_new();
+ gtk_grid_attach (GTK_GRID (table), data->PO_mindate, 2, row, 1, 1);
row++;
- label = make_label(_("_To:"), 0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
- data->PO_maxdate = gtk_dateentry_new();
- gtk_table_attach_defaults (GTK_TABLE (table), data->PO_maxdate, 2, 3, row, row+1);
+ label = make_label_widget(_("_To:"));
+ gtk_grid_attach (GTK_GRID (table), label, 1, row, 1, 1);
+ data->PO_maxdate = gtk_date_entry_new();
+ gtk_grid_attach (GTK_GRID (table), data->PO_maxdate, 2, row, 1, 1);
//part: info + report
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
//ui manager
action = gtk_action_group_get_action(actions, "List");
g_object_set(action, "is_important", TRUE, NULL);
- action = gtk_action_group_get_action(actions, "Bar");
+ action = gtk_action_group_get_action(actions, "Column");
g_object_set(action, "is_important", TRUE, NULL);
- action = gtk_action_group_get_action(actions, "Pie");
+ action = gtk_action_group_get_action(actions, "Donut");
g_object_set(action, "is_important", TRUE, NULL);
action = gtk_action_group_get_action(actions, "Detail");
gtk_box_pack_start (GTK_BOX (vbox), data->TB_bar, FALSE, FALSE, 0);
//infos + balance
- hbox = gtk_hbox_new (FALSE, HB_BOX_SPACING);
- gtk_container_set_border_width (GTK_CONTAINER(hbox), HB_BOX_SPACING);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, SPACING_SMALL);
+ gtk_container_set_border_width (GTK_CONTAINER(hbox), SPACING_SMALL);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
widget = make_label(NULL, 0.5, 0.5);
gtk_notebook_set_show_border(GTK_NOTEBOOK(notebook), FALSE);
gtk_box_pack_start (GTK_BOX (vbox), notebook, TRUE, TRUE, 0);
- //page: list
- vbox = gtk_vbox_new (FALSE, 0);
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, NULL);
+ // page list/detail
+ vpaned = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vpaned, NULL);
- widget = gtk_scrolled_window_new (NULL, NULL);
- //gtk_scrolled_window_set_placement(GTK_SCROLLED_WINDOW (widget), GTK_CORNER_TOP_RIGHT);
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_ETCHED_IN);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (widget), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ // list
+ sw = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_ETCHED_IN);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
treeview = ui_list_repdist_create();
data->LV_report = treeview;
- gtk_container_add (GTK_CONTAINER(widget), treeview);
- gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE, 0);
+ gtk_container_add (GTK_CONTAINER(sw), treeview);
+ gtk_paned_pack1 (GTK_PANED(vpaned), sw, TRUE, TRUE);
//detail
- widget = gtk_scrolled_window_new (NULL, NULL);
- data->GR_detail = widget;
- //gtk_scrolled_window_set_placement(GTK_SCROLLED_WINDOW (widget), GTK_CORNER_TOP_RIGHT);
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_ETCHED_IN);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (widget), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- treeview = create_list_transaction(TRN_LIST_TYPE_DETAIL, PREFS->lst_ope_columns);
+ sw = gtk_scrolled_window_new (NULL, NULL);
+ data->GR_detail = sw;
+ //gtk_scrolled_window_set_placement(GTK_SCROLLED_WINDOW (sw), GTK_CORNER_TOP_RIGHT);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_ETCHED_IN);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ treeview = create_list_transaction(LIST_TXN_TYPE_DETAIL, PREFS->lst_ope_columns);
data->LV_detail = treeview;
- gtk_container_add (GTK_CONTAINER(widget), treeview);
-
- gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE, 0);
-
+ gtk_container_add (GTK_CONTAINER(sw), treeview);
+ gtk_paned_pack2 (GTK_PANED(vpaned), sw, TRUE, TRUE);
- //page: 2d bar/pie
+ //page: 2d bar /pie
widget = gtk_chart_new(CHART_TYPE_COL);
data->RE_chart = widget;
gtk_chart_set_minor_prefs(GTK_CHART(widget), PREFS->euro_value, PREFS->minor_cur.symbol);
- //gtk_chart_set_currency(GTK_CHART(widget), GLOBALS->kcur);
+ gtk_chart_set_currency(GTK_CHART(widget), GLOBALS->kcur);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), widget, NULL);
//todo: setup should move this
g_signal_connect (gtk_tree_view_get_selection(GTK_TREE_VIEW(data->LV_report)), "changed", G_CALLBACK (ui_repdist_selection), NULL);
+ g_signal_connect (GTK_TREE_VIEW(data->LV_detail), "row-activated", G_CALLBACK (ui_repdist_detail_onRowActivated), NULL);
//setup, init and show window
ui_repdist_setup(data);
if( value )
{
- mystrfmon(buf, G_ASCII_DTOSTR_BUF_SIZE-1, value, GLOBALS->minor);
- //hb_strfmon(buf, G_ASCII_DTOSTR_BUF_SIZE-1, value, GLOBALS->kcur);
+ hb_strfmon(buf, G_ASCII_DTOSTR_BUF_SIZE-1, value, GLOBALS->kcur, GLOBALS->minor);
color = get_normal_color_amount(value);
view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
g_object_unref(store);
- gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (view), PREFS->rules_hint);
+ gtk_tree_view_set_grid_lines (GTK_TREE_VIEW (view), PREFS->grid_lines);
/* column: Name */
column = gtk_tree_view_column_new();
projects / chaz / homebank / blobdiff