Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
homebank
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Adrien Dorsaz
homebank
Commits
640b99df
Commit
640b99df
authored
Sep 29, 2013
by
Maxime Doyen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
4.5.4 release
parent
9dca1917
Changes
39
Hide whitespace changes
Inline
Side-by-side
Showing
39 changed files
with
499 additions
and
348 deletions
+499
-348
ChangeLog
ChangeLog
+23
-0
src/dsp_account.c
src/dsp_account.c
+35
-29
src/dsp_mainwindow.c
src/dsp_mainwindow.c
+47
-46
src/gtk-chart.c
src/gtk-chart.c
+8
-8
src/gtk-dateentry.c
src/gtk-dateentry.c
+33
-0
src/gtk-dateentry.h
src/gtk-dateentry.h
+3
-1
src/hb-archive.c
src/hb-archive.c
+2
-2
src/hb-category.c
src/hb-category.c
+2
-2
src/hb-filter.c
src/hb-filter.c
+5
-5
src/hb-hbfile.c
src/hb-hbfile.c
+11
-11
src/hb-misc.c
src/hb-misc.c
+11
-7
src/hb-preferences.c
src/hb-preferences.c
+1
-1
src/hb-transaction.c
src/hb-transaction.c
+42
-20
src/hb-transaction.h
src/hb-transaction.h
+3
-3
src/hb-xml.c
src/hb-xml.c
+10
-10
src/homebank.c
src/homebank.c
+11
-9
src/homebank.h
src/homebank.h
+2
-2
src/imp_qif.c
src/imp_qif.c
+2
-2
src/import.c
src/import.c
+5
-5
src/list_operation.c
src/list_operation.c
+37
-5
src/list_operation.h
src/list_operation.h
+1
-0
src/rep_balance.c
src/rep_balance.c
+12
-6
src/rep_budget.c
src/rep_budget.c
+6
-1
src/rep_stats.c
src/rep_stats.c
+7
-5
src/rep_time.c
src/rep_time.c
+24
-19
src/rep_vehicle.c
src/rep_vehicle.c
+12
-5
src/ui-account.c
src/ui-account.c
+15
-15
src/ui-archive.c
src/ui-archive.c
+18
-18
src/ui-assign.c
src/ui-assign.c
+14
-14
src/ui-assist-start.c
src/ui-assist-start.c
+1
-1
src/ui-budget.c
src/ui-budget.c
+1
-1
src/ui-category.c
src/ui-category.c
+1
-1
src/ui-dialogs.c
src/ui-dialogs.c
+8
-8
src/ui-filter.c
src/ui-filter.c
+26
-26
src/ui-hbfile.c
src/ui-hbfile.c
+14
-14
src/ui-payee.c
src/ui-payee.c
+8
-8
src/ui-pref.c
src/ui-pref.c
+2
-2
src/ui-transaction.c
src/ui-transaction.c
+35
-35
src/ui-widgets.c
src/ui-widgets.c
+1
-1
No files found.
ChangeLog
View file @
640b99df
2013-09-29 Maxime Doyen
Made 4.5.4 release.
* bugfix: #1230401 running balance missordered after insert on same date
* bugfix: #1232418 Account, Payees and category, wrongly disabled!
* bugfix: scheduled transaction icon was still displayed after a save
2013-09-21 Maxime Doyen
Made 4.5.3 release.
* bugfix: #1225611 Trend Time report : categories crashes on windows
* bugfix: #1221484 End date not checked to be larger than Start date in reports
* bugfix: #1218644 There is a problem of calculating the column balances.
* bugfix: #1216321 reversed transactions
* bugfix: #1216284 balance report do not exclude account with exclude from report checked
* bugfix: #1215521 when importing qif, automatic assignments are not made
* bugfix: #1214077 win32: my csv file exported crash when import again
* bugfix: #1213569 win32: program not all translated in french since 4.5.1
2013-08-15 Maxime Doyen
Made 4.5.2 release.
...
...
src/dsp_account.c
View file @
640b99df
...
...
@@ -167,7 +167,7 @@ struct account_data *data = user_data;
DB
(
g_print
(
"action close
\n
"
)
);
DB
(
g_print
f
(
"window %p
\n
"
,
data
->
window
)
);
DB
(
g_print
(
"window %p
\n
"
,
data
->
window
)
);
gtk_widget_destroy
(
GTK_WIDGET
(
data
->
window
));
...
...
@@ -449,7 +449,7 @@ gint result, count;
gtk_tree_model_get_iter
(
model
,
&
iter
,
list
->
data
);
gtk_tree_model_get
(
model
,
&
iter
,
LST_DSPOPE_DATAS
,
&
ope
,
-
1
);
DB
(
g_print
f
(
" create archive %s %.2f
\n
"
,
ope
->
wording
,
ope
->
amount
)
);
DB
(
g_print
(
" create archive %s %.2f
\n
"
,
ope
->
wording
,
ope
->
amount
)
);
item
=
da_archive_malloc
();
...
...
@@ -573,10 +573,11 @@ static void account_balance_refresh(GtkWidget *view)
struct
account_data
*
data
;
GList
*
list
;
gdouble
balance
;
GtkTreeModel
*
model
;
data
=
g_object_get_data
(
G_OBJECT
(
gtk_widget_get_ancestor
(
view
,
GTK_TYPE_WINDOW
)),
"inst_data"
);
DB
(
g_print
f
(
"
\n
[account] balance refresh
\n
"
)
);
DB
(
g_print
(
"
\n
[account] balance refresh
\n
"
)
);
balance
=
data
->
acc
->
initial
;
...
...
@@ -594,6 +595,10 @@ gdouble balance;
}
list
=
g_list_next
(
list
);
}
model
=
gtk_tree_view_get_model
(
GTK_TREE_VIEW
(
data
->
LV_ope
));
list_transaction_sort_force
(
GTK_TREE_SORTABLE
(
model
),
NULL
);
}
...
...
@@ -607,7 +612,7 @@ GList *list;
data
=
g_object_get_data
(
G_OBJECT
(
gtk_widget_get_ancestor
(
view
,
GTK_TYPE_WINDOW
)),
"inst_data"
);
DB
(
g_print
f
(
"
\n
[account] populate
\n
"
)
);
DB
(
g_print
(
"
\n
[account] populate
\n
"
)
);
model
=
gtk_tree_view_get_model
(
GTK_TREE_VIEW
(
view
));
...
...
@@ -638,7 +643,7 @@ GList *list;
/* append to our treeview */
gtk_list_store_append
(
GTK_LIST_STORE
(
model
),
&
iter
);
//g_print
f
(" populate: %s\n", ope->ope_Word);
//g_print(" populate: %s\n", ope->ope_Word);
gtk_list_store_set
(
GTK_LIST_STORE
(
model
),
&
iter
,
LST_DSPOPE_DATAS
,
ope
,
...
...
@@ -752,12 +757,12 @@ struct account_data *data;
gint
action
=
(
gint
)
user_data
;
gboolean
result
;
DB
(
g_print
f
(
"
\n
[account] action
\n
"
)
);
DB
(
g_print
(
"
\n
[account] action
\n
"
)
);
data
=
g_object_get_data
(
G_OBJECT
(
gtk_widget_get_ancestor
(
widget
,
GTK_TYPE_WINDOW
)),
"inst_data"
);
//data = INST_DATA(widget);
DB
(
g_print
f
(
" - action=%d
\n
"
,
action
)
);
DB
(
g_print
(
" - action=%d
\n
"
,
action
)
);
switch
(
action
)
{
...
...
@@ -772,7 +777,7 @@ gboolean result;
if
(
action
==
ACTION_ACCOUNT_ADD
)
{
DB
(
g_print
f
(
"(transaction) add multiple
\n
"
)
);
DB
(
g_print
(
"(transaction) add multiple
\n
"
)
);
//date = GLOBALS->today;
src_trn
=
da_transaction_malloc
();
src_trn
->
date
=
GLOBALS
->
today
;
...
...
@@ -781,7 +786,7 @@ gboolean result;
}
else
{
DB
(
g_print
f
(
"(transaction) inherit multiple
\n
"
)
);
DB
(
g_print
(
"(transaction) inherit multiple
\n
"
)
);
src_trn
=
da_transaction_clone
(
get_active_transaction
(
GTK_TREE_VIEW
(
data
->
LV_ope
)));
type
=
TRANSACTION_EDIT_INHERIT
;
}
...
...
@@ -853,12 +858,12 @@ gboolean result;
Transaction
*
ct
;
//nota: if kxfer is 0, the user has just changed the paymode to xfer
DB
(
g_print
f
(
" - kxfer = %d
\n
"
,
ope
->
kxfer
)
);
DB
(
g_print
(
" - kxfer = %d
\n
"
,
ope
->
kxfer
)
);
//1) search a strong linked child
if
(
ope
->
kxfer
>
0
)
{
DB
(
g_print
f
(
" - found a strong link ?
\n
"
)
);
DB
(
g_print
(
" - found a strong link ?
\n
"
)
);
ct
=
transaction_strong_get_child_transfer
(
ope
);
if
(
ct
!=
NULL
)
//should never be the case
...
...
@@ -906,7 +911,7 @@ gboolean result;
gint
result
;
//gint count;
DB
(
g_print
f
(
" - remove
\n
"
)
);
DB
(
g_print
(
" - remove
\n
"
)
);
//count = gtk_tree_selection_count_selected_rows(gtk_tree_view_get_selection(GTK_TREE_VIEW(data->LV_ope)));
...
...
@@ -943,7 +948,7 @@ gboolean result;
gtk_tree_view_set_model
(
GTK_TREE_VIEW
(
data
->
LV_ope
),
NULL
);
/* Detach model from view */
DB
(
g_print
f
(
" remove %d line
\n
"
,
g_list_length
(
selection
))
);
DB
(
g_print
(
" remove %d line
\n
"
,
g_list_length
(
selection
))
);
list
=
g_list_last
(
selection
);
...
...
@@ -955,7 +960,7 @@ gboolean result;
gtk_tree_model_get_iter
(
model
,
&
iter
,
list
->
data
);
gtk_tree_model_get
(
model
,
&
iter
,
LST_DSPOPE_DATAS
,
&
entry
,
-
1
);
DB
(
g_print
f
(
" delete %s %.2f
\n
"
,
entry
->
wording
,
entry
->
amount
)
);
DB
(
g_print
(
" delete %s %.2f
\n
"
,
entry
->
wording
,
entry
->
amount
)
);
account_balances_sub
(
entry
);
...
...
@@ -997,7 +1002,7 @@ gboolean result;
selection
=
gtk_tree_view_get_selection
(
GTK_TREE_VIEW
(
data
->
LV_ope
));
gtk_tree_selection_selected_foreach
(
selection
,
(
GtkTreeSelectionForeachFunc
)
reconcile_selected_foreach_func
,
data
);
DB
(
g_print
f
(
" - reconcile
\n
"
)
);
DB
(
g_print
(
" - reconcile
\n
"
)
);
gtk_widget_queue_draw
(
data
->
LV_ope
);
//gtk_widget_queue_resize (data->LV_acc);
...
...
@@ -1027,7 +1032,7 @@ gboolean result;
//close
case
ACTION_ACCOUNT_CLOSE
:
{
DB
(
g_print
f
(
" - close
\n
"
)
);
DB
(
g_print
(
" - close
\n
"
)
);
//g_signal_emit_by_name(data->window, "delete-event");
...
...
@@ -1044,7 +1049,7 @@ static void account_toggle(GtkWidget *widget, gpointer user_data)
{
struct
account_data
*
data
;
DB
(
g_print
f
(
"
\n
[account] toggle
\n
"
)
);
DB
(
g_print
(
"
\n
[account] toggle
\n
"
)
);
data
=
g_object_get_data
(
G_OBJECT
(
gtk_widget_get_ancestor
(
widget
,
GTK_TYPE_WINDOW
)),
"inst_data"
);
...
...
@@ -1055,7 +1060,7 @@ struct account_data *data;
static
void
account_selection
(
GtkTreeSelection
*
treeselection
,
gpointer
user_data
)
{
DB
(
g_print
f
(
"
\n
[account] selection changed cb
\n
"
)
);
DB
(
g_print
(
"
\n
[account] selection changed cb
\n
"
)
);
account_update
(
GTK_WIDGET
(
gtk_tree_selection_get_tree_view
(
treeselection
)),
GINT_TO_POINTER
(
UF_SENSITIVE
));
...
...
@@ -1070,7 +1075,7 @@ GtkTreeSelection *selection;
gint
flags
;
gint
count
=
0
;
DB
(
g_print
f
(
"
\n
[account] update
\n
"
)
);
DB
(
g_print
(
"
\n
[account] update
\n
"
)
);
data
=
g_object_get_data
(
G_OBJECT
(
gtk_widget_get_ancestor
(
widget
,
GTK_TYPE_WINDOW
)),
"inst_data"
);
//data = INST_DATA(widget);
...
...
@@ -1367,7 +1372,7 @@ gchar *tagstr, *txt;
gtk_tree_model_get_iter
(
model
,
&
iter
,
list
->
data
);
gtk_tree_model_get
(
model
,
&
iter
,
LST_DSPOPE_DATAS
,
&
ope
,
-
1
);
DB
(
g_print
f
(
" modifying %s %.2f
\n
"
,
ope
->
wording
,
ope
->
amount
)
);
DB
(
g_print
(
" modifying %s %.2f
\n
"
,
ope
->
wording
,
ope
->
amount
)
);
switch
(
col_id
)
{
...
...
@@ -1446,7 +1451,7 @@ GtkWidget *window;
GdkWindow
*
gdkwindow
;
GdkCursor
*
cursor
;
DB
(
g_print
f
(
"
\n
[account] busy %d
\n
"
,
state
)
);
DB
(
g_print
(
"
\n
[account] busy %d
\n
"
,
state
)
);
window
=
gtk_widget_get_ancestor
(
widget
,
GTK_TYPE_WINDOW
);
data
=
g_object_get_data
(
G_OBJECT
(
window
),
"inst_data"
);
...
...
@@ -1554,7 +1559,7 @@ account_getgeometry(GtkWidget *widget, GdkEventConfigure *event, gpointer user_d
//struct account_data *data = user_data;
struct
WinGeometry
*
wg
;
DB
(
g_print
f
(
"
\n
[account] get geometry
\n
"
)
);
DB
(
g_print
(
"
\n
[account] get geometry
\n
"
)
);
//store position and size
wg
=
&
PREFS
->
acc_wg
;
...
...
@@ -1564,7 +1569,7 @@ struct WinGeometry *wg;
GdkWindowState
state
=
gdk_window_get_state
(
gdk_window
);
wg
->
s
=
(
state
&
GDK_WINDOW_STATE_MAXIMIZED
)
?
1
:
0
;
DB
(
g_print
f
(
" window: l=%d, t=%d, w=%d, h=%d s=%d, state=%d
\n
"
,
wg
->
l
,
wg
->
t
,
wg
->
w
,
wg
->
h
,
wg
->
s
,
state
&
GDK_WINDOW_STATE_MAXIMIZED
)
);
DB
(
g_print
(
" window: l=%d, t=%d, w=%d, h=%d s=%d, state=%d
\n
"
,
wg
->
l
,
wg
->
t
,
wg
->
w
,
wg
->
h
,
wg
->
s
,
state
&
GDK_WINDOW_STATE_MAXIMIZED
)
);
return
FALSE
;
}
...
...
@@ -1577,14 +1582,14 @@ static gboolean account_dispose(GtkWidget *widget, GdkEvent *event, gpointer use
//struct account_data *data = user_data;
DB
(
g_print
f
(
"
\n
[account] delete-event
\n
"
)
);
DB
(
g_print
(
"
\n
[account] delete-event
\n
"
)
);
return
FALSE
;
}
/* Another callback */
static
void
account_destroy
(
GtkWidget
*
widget
,
static
gboolean
account_destroy
(
GtkWidget
*
widget
,
gpointer
user_data
)
{
struct
account_data
*
data
;
...
...
@@ -1604,7 +1609,7 @@ struct account_data *data;
data
->
acc
->
window
=
NULL
;
/* free title and filter */
DB
(
g_print
f
(
" user_data=%p to be free
\n
"
,
user_data
)
);
DB
(
g_print
(
" user_data=%p to be free
\n
"
,
user_data
)
);
g_free
(
data
->
wintitle
);
...
...
@@ -1616,6 +1621,7 @@ struct account_data *data;
//our global list has changed, so update the treeview
ui_mainwindow_update
(
GLOBALS
->
mainwindow
,
GINT_TO_POINTER
(
UF_TITLE
+
UF_SENSITIVE
+
UF_BALANCE
+
UF_REFRESHALL
));
return
FALSE
;
}
...
...
@@ -1632,7 +1638,7 @@ GtkActionGroup *actions;
GtkAction
*
action
;
GError
*
error
=
NULL
;
DB
(
g_print
f
(
"
\n
[account] create_account_window
\n
"
)
);
DB
(
g_print
(
"
\n
[account] create_account_window
\n
"
)
);
data
=
g_malloc0
(
sizeof
(
struct
account_data
));
if
(
!
data
)
return
NULL
;
...
...
@@ -1677,7 +1683,7 @@ GError *error = NULL;
//store our window private data
g_object_set_data
(
G_OBJECT
(
window
),
"inst_data"
,
(
gpointer
)
data
);
DB
(
g_print
f
(
" - new window=%p, inst_data=%p
\n
"
,
window
,
data
)
);
DB
(
g_print
(
" - new window=%p, inst_data=%p
\n
"
,
window
,
data
)
);
//set the window icon
//homebank_window_set_icon_from_file(GTK_WINDOW (window), "ope_show.svg");
...
...
@@ -1908,7 +1914,7 @@ GError *error = NULL;
/* setup to moove later */
data
->
filter
=
da_filter_malloc
();
DB
(
g_print
f
(
" - filter ok %x
\n
"
,
(
gint
)
data
->
filter
)
);
DB
(
g_print
(
" - filter ok %x
\n
"
,
(
gint
)
data
->
filter
)
);
return
window
;
...
...
src/dsp_mainwindow.c
View file @
640b99df
...
...
@@ -332,7 +332,7 @@ GtkWidget *dialog;
gchar
*
basename
;
gint
result
;
DB
(
g_print
f
(
"
\n
[ui-mainwindow] revert
\n
"
)
);
DB
(
g_print
(
"
\n
[ui-mainwindow] revert
\n
"
)
);
//data = g_object_get_data(G_OBJECT(gtk_widget_get_ancestor(widget, GTK_TYPE_WINDOW)), "inst_data");
...
...
@@ -363,7 +363,7 @@ gint result;
if
(
result
==
1
)
{
DB
(
g_print
f
(
" - should revert
\n
"
)
);
DB
(
g_print
(
" - should revert
\n
"
)
);
hbfile_change_filepath
(
homebank_filepath_with_extention
(
GLOBALS
->
xhb_filepath
,
"xhb~"
));
ui_mainwindow_open_internal
(
widget
,
NULL
);
...
...
@@ -948,7 +948,7 @@ static void ui_mainwindow_close_openbooks(void)
{
GList
*
list
;
DB
(
g_print
f
(
"
\n
[ui-mainwindow] close openbooks
\n
"
)
);
DB
(
g_print
(
"
\n
[ui-mainwindow] close openbooks
\n
"
)
);
list
=
g_hash_table_get_values
(
GLOBALS
->
h_acc
);
while
(
list
!=
NULL
)
...
...
@@ -977,7 +977,7 @@ void ui_mainwindow_clear(GtkWidget *widget, gpointer user_data)
//struct hbfile_data *data;
gboolean
file_clear
=
GPOINTER_TO_INT
(
user_data
);
DB
(
g_print
f
(
"
\n
[ui-mainwindow] clear
\n
"
)
);
DB
(
g_print
(
"
\n
[ui-mainwindow] clear
\n
"
)
);
//data = g_object_get_data(G_OBJECT(gtk_widget_get_ancestor(widget, GTK_TYPE_WINDOW)), "inst_data");
...
...
@@ -1015,7 +1015,7 @@ gint result = 1;
guint32
date
;
gint
account
=
1
,
count
;
DB
(
g_print
f
(
"
\n
[ui-mainwindow] add transactions
\n
"
)
);
DB
(
g_print
(
"
\n
[ui-mainwindow] add transactions
\n
"
)
);
data
=
g_object_get_data
(
G_OBJECT
(
gtk_widget_get_ancestor
(
widget
,
GTK_TYPE_WINDOW
)),
"inst_data"
);
...
...
@@ -1039,14 +1039,14 @@ gint account = 1, count;
result
=
gtk_dialog_run
(
GTK_DIALOG
(
window
));
DB
(
g_print
f
(
" -> dialog result is %d
\n
"
,
result
)
);
DB
(
g_print
(
" -> dialog result is %d
\n
"
,
result
)
);
if
(
result
==
GTK_RESPONSE_ADD
||
result
==
GTK_RESPONSE_ACCEPT
)
{
deftransaction_get
(
window
,
NULL
);
transaction_add
(
ope
,
NULL
,
ope
->
kacc
);
DB
(
g_print
f
(
" -> added 1 transaction to %d
\n
"
,
ope
->
kacc
)
);
DB
(
g_print
(
" -> added 1 transaction to %d
\n
"
,
ope
->
kacc
)
);
ui_mainwindow_populate_accounts
(
GLOBALS
->
mainwindow
,
NULL
);
...
...
@@ -1094,14 +1094,14 @@ GArray *garray;
gdouble
total
;
//Account *acc;
DB
(
g_print
f
(
"
\n
[ui-mainwindow] populate_topspending
\n
"
)
);
DB
(
g_print
(
"
\n
[ui-mainwindow] populate_topspending
\n
"
)
);
data
=
g_object_get_data
(
G_OBJECT
(
gtk_widget_get_ancestor
(
widget
,
GTK_TYPE_WINDOW
)),
"inst_data"
);
range
=
gtk_combo_box_get_active
(
GTK_COMBO_BOX
(
data
->
CY_range
));
DB
(
g_print
f
(
" - range=%d
\n
"
,
range
)
);
DB
(
g_print
f
(
" - pref range=%d
\n
"
,
PREFS
->
date_range_wal
)
);
DB
(
g_print
(
" - range=%d
\n
"
,
range
)
);
DB
(
g_print
(
" - pref range=%d
\n
"
,
PREFS
->
date_range_wal
)
);
if
(
range
==
FLT_RANGE_OTHER
)
return
;
...
...
@@ -1112,7 +1112,7 @@ gdouble total;
n_result
=
da_cat_get_max_key
()
+
1
;
total
=
0
.
0
;
DB
(
g_print
f
(
" - max key is %d
\n
"
,
n_result
)
);
DB
(
g_print
(
" - max key is %d
\n
"
,
n_result
)
);
/* allocate some memory */
garray
=
g_array_sized_new
(
FALSE
,
FALSE
,
sizeof
(
struct
tmptop
),
n_result
);
...
...
@@ -1121,7 +1121,7 @@ gdouble total;
{
struct
tmptop
zero
=
{
.
key
=
0
,
.
value
=
0
.
0
};
//DB( g_print
f
(" - array length=%d\n", garray->len) );
//DB( g_print(" - array length=%d\n", garray->len) );
for
(
i
=
0
;
i
<
n_result
;
i
++
)
{
...
...
@@ -1132,7 +1132,7 @@ gdouble total;
//DB( g_print("%4d, %4d %f\n", i, tt->key, tt->value) );
}
//DB( g_print
f
("\n - end array length=%d\n", garray->len) );
//DB( g_print("\n - end array length=%d\n", garray->len) );
/* compute the results */
list
=
g_list_first
(
GLOBALS
->
ope_list
);
...
...
@@ -1216,7 +1216,7 @@ next1:
item
=
&
g_array_index
(
garray
,
struct
tmptop
,
i
);
total
+=
item
->
value
;
DB
(
g_print
f
(
" - %d : k='%d' v='%f' t='%f'
\n
"
,
i
,
item
->
key
,
item
->
value
,
total
)
);
DB
(
g_print
(
" - %d : k='%d' v='%f' t='%f'
\n
"
,
i
,
item
->
key
,
item
->
value
,
total
)
);
}
model
=
gtk_tree_view_get_model
(
GTK_TREE_VIEW
(
data
->
LV_top
));
...
...
@@ -1292,11 +1292,11 @@ gdouble total = 0;
gint
count
=
0
;
//Account *acc;
DB
(
g_print
f
(
"
\n
[ui-mainwindow] refresh upcoming
\n
"
)
);
DB
(
g_print
(
"
\n
[ui-mainwindow] refresh upcoming
\n
"
)
);
data
=
g_object_get_data
(
G_OBJECT
(
gtk_widget_get_ancestor
(
widget
,
GTK_TYPE_WINDOW
)),
"inst_data"
);
DB
(
g_print
f
(
" - append limit today +%d days
\n
"
,
archive_add_get_nbdays
())
);
DB
(
g_print
(
" - append limit today +%d days
\n
"
,
archive_add_get_nbdays
())
);
model
=
gtk_tree_view_get_model
(
GTK_TREE_VIEW
(
data
->
LV_upc
));
...
...
@@ -1313,7 +1313,7 @@ gint count = 0;
count
++
;
decay
=
arc
->
nextdate
-
GLOBALS
->
today
;
DB
(
g_print
f
(
" - append '%s' : %d
\n
"
,
arc
->
wording
,
decay
)
);
DB
(
g_print
(
" - append '%s' : %d
\n
"
,
arc
->
wording
,
decay
)
);
gtk_list_store_append
(
GTK_LIST_STORE
(
model
),
&
iter
);
gtk_list_store_set
(
GTK_LIST_STORE
(
model
),
&
iter
,
...
...
@@ -1327,7 +1327,7 @@ gint count = 0;
//total += to_base_amount(arc->amount, acc->kcur);
total
+=
arc
->
amount
;
DB
(
g_print
f
(
" - total: %f
\n
"
,
total
)
);
DB
(
g_print
(
" - total: %f
\n
"
,
total
)
);
}
list
=
g_list_next
(
list
);
}
...
...
@@ -1355,7 +1355,7 @@ void ui_mainwindow_check_scheduled(GtkWidget *widget, gpointer user_data)
gint
count
;
gint
usermode
=
GPOINTER_TO_INT
(
user_data
);
DB
(
g_print
f
(
"
\n
[ui-mainwindow] check scheduled
\n
"
)
);
DB
(
g_print
(
"
\n
[ui-mainwindow] check scheduled
\n
"
)
);
//data = g_object_get_data(G_OBJECT(gtk_widget_get_ancestor(widget, GTK_TYPE_WINDOW)), "inst_data");
...
...
@@ -1392,7 +1392,7 @@ void ui_mainwindow_open(GtkWidget *widget, gpointer user_data)
//struct hbfile_data *data;
gchar
*
filename
=
NULL
;
DB
(
g_print
f
(
"
\n
[ui-mainwindow] open
\n
"
)
);
DB
(
g_print
(
"
\n
[ui-mainwindow] open
\n
"
)
);
//data = g_object_get_data(G_OBJECT(gtk_widget_get_ancestor(widget, GTK_TYPE_WINDOW)), "inst_data");
...
...
@@ -1417,11 +1417,11 @@ void ui_mainwindow_open_internal(GtkWidget *widget, gpointer user_data)
struct
hbfile_data
*
data
;
gint
r
;
DB
(
g_print
f
(
"
\n
[ui-mainwindow] open internal
\n
"
)
);
DB
(
g_print
(
"
\n
[ui-mainwindow] open internal
\n
"
)
);
data
=
g_object_get_data
(
G_OBJECT
(
gtk_widget_get_ancestor
(
widget
,
GTK_TYPE_WINDOW
)),
"inst_data"
);
DB
(
g_print
f
(
" -> filename: '%s'
\n
"
,
GLOBALS
->
xhb_filepath
)
);
DB
(
g_print
(
" -> filename: '%s'
\n
"
,
GLOBALS
->
xhb_filepath
)
);
if
(
GLOBALS
->
xhb_filepath
!=
NULL
)
{
...
...
@@ -1431,7 +1431,7 @@ gint r;
r
=
homebank_load_xml
(
GLOBALS
->
xhb_filepath
);
if
(
r
==
XML_OK
)
{
DB
(
g_print
f
(
" -> file loaded ok : rcode=%d
\n
"
,
r
)
);
DB
(
g_print
(
" -> file loaded ok : rcode=%d
\n
"
,
r
)
);
hbfile_file_hasbackup
(
GLOBALS
->
xhb_filepath
);
...
...
@@ -1491,7 +1491,7 @@ gboolean saveas = GPOINTER_TO_INT(user_data);
gchar
*
filename
=
NULL
;
gint
r
=
XML_UNSET
;
DB
(
g_print
f
(
"
\n
[ui-mainwindow] save
\n
"
)
);
DB
(
g_print
(
"
\n
[ui-mainwindow] save
\n
"
)
);
data
=
g_object_get_data
(
G_OBJECT
(
gtk_widget_get_ancestor
(
widget
,
GTK_TYPE_WINDOW
)),
"inst_data"
);
...
...
@@ -1502,7 +1502,7 @@ gint r = XML_UNSET;
{
if
(
ui_file_chooser_xhb
(
GTK_FILE_CHOOSER_ACTION_SAVE
,
&
filename
)
==
TRUE
)
{
DB
(
g_print
f
(
" + should save as %s
\n
"
,
GLOBALS
->
xhb_filepath
)
);
DB
(
g_print
(
" + should save as %s
\n
"
,
GLOBALS
->
xhb_filepath
)
);
hbfile_change_filepath
(
filename
);
homebank_backup_current_file
(
GLOBALS
->
xhb_filepath
);
homebank_file_ensure_xhb
();
...
...
@@ -1515,7 +1515,7 @@ gint r = XML_UNSET;
}
else
{
DB
(
g_print
f
(
" + should quick save %s
\n
"
,
GLOBALS
->
xhb_filepath
)
);
DB
(
g_print
(
" + should quick save %s
\n
"
,
GLOBALS
->
xhb_filepath
)
);
homebank_backup_current_file
(
GLOBALS
->
xhb_filepath
);
homebank_file_ensure_xhb
();
r
=
homebank_save_xml
(
GLOBALS
->
xhb_filepath
);
...
...
@@ -1553,7 +1553,7 @@ Account *acc;
guint
i
,
j
,
nbtype
;
gdouble
gtbank
,
gttoday
,
gtfuture
;
DB
(
g_print
f
(
"
\n
[ui-mainwindow] populate accounts
\n
"
)
);
DB
(
g_print
(
"
\n
[ui-mainwindow] populate accounts
\n
"
)
);
data
=
g_object_get_data
(
G_OBJECT
(
gtk_widget_get_ancestor
(
widget
,
GTK_TYPE_WINDOW
)),
"inst_data"
);
...
...
@@ -1566,7 +1566,7 @@ gdouble gtbank, gttoday, gtfuture;
acc
=
list
->
data
;
if
(
!
(
acc
->
flags
&
(
AF_CLOSED
|
AF_NOREPORT
|
AF_NOSUMMARY
))
)
{
DB
(
g_print
f
(
" -> insert %d:%s
\n
"
,
acc
->
key
,
acc
->
name
)
);
DB
(
g_print
(
" -> insert %d:%s
\n
"
,
acc
->
key
,
acc
->
name
)
);
if
(
typeacc
[
acc
->
type
]
==
NULL
)
typeacc
[
acc
->
type
]
=
g_ptr_array_sized_new
(
da_acc_length
());
...
...
@@ -1579,7 +1579,7 @@ gdouble gtbank, gttoday, gtfuture;
gtbank
=
gttoday
=
gtfuture
=
0
;
DB
(
g_print
f
(
" -> populate listview
\n
"
)
);
DB
(
g_print
(
" -> populate listview
\n
"
)
);
/* then populate the listview */
...
...
@@ -1596,7 +1596,7 @@ gdouble gtbank, gttoday, gtfuture;
{
nbtype
++
;
//1: Header: Bank, Cash, ...
DB
(
g_print
f
(
" -> append type '%s'
\n
"
,
CYA_ACC_TYPE
[
i
])
);
DB
(
g_print
(
" -> append type '%s'
\n
"
,
CYA_ACC_TYPE
[
i
])
);
gtk_tree_store_append
(
GTK_TREE_STORE
(
model
),
&
iter1
,
NULL
);
gtk_tree_store_set
(
GTK_TREE_STORE
(
model
),
&
iter1
,
...
...
@@ -1624,7 +1624,7 @@ gdouble gtbank, gttoday, gtfuture;
tfuture += to_base_amount(acc->bal_future, acc->kcur);
}*/
DB
(
g_print
f
(
" - insert '%s' :: %.2f %.2f %.2f
\n
"
,
acc
->
name
,
acc
->
bal_bank
,
acc
->
bal_today
,
acc
->
bal_future
)
);
DB
(
g_print
(
" - insert '%s' :: %.2f %.2f %.2f
\n
"
,
acc
->
name
,
acc
->
bal_bank
,
acc
->
bal_today
,
acc
->
bal_future
)
);
gtk_tree_store_append
(
GTK_TREE_STORE
(
model
),
&
child_iter
,
&
iter1
);
gtk_tree_store_set
(
GTK_TREE_STORE
(
model
),
&
child_iter
,
...
...
@@ -1638,7 +1638,7 @@ gdouble gtbank, gttoday, gtfuture;
if
(
gpa
->
len
>
1
)
{
DB
(
g_print
f
(
" - type totals :: %.2f %.2f %.2f
\n
"
,
tbank
,
ttoday
,
tfuture
)
);
DB
(
g_print
(
" - type totals :: %.2f %.2f %.2f
\n
"
,
tbank
,
ttoday
,
tfuture
)
);
// insert the total line
gtk_tree_store_append
(
GTK_TREE_STORE
(
model
),
&
child_iter
,
&
iter1
);
...
...
@@ -1667,7 +1667,7 @@ gdouble gtbank, gttoday, gtfuture;
}
DB
(
g_print
f
(
" - grand totals :: %.2f %.2f %.2f
\n
"
,
gtbank
,
gttoday
,
gtfuture
)
);
DB
(
g_print
(
" - grand totals :: %.2f %.2f %.2f
\n
"
,
gtbank
,
gttoday
,
gtfuture
)
);
// Grand total
if
(
nbtype
>
1
)
...
...
@@ -1685,7 +1685,7 @@ gdouble gtbank, gttoday, gtfuture;
gtk_tree_view_expand_all
(
GTK_TREE_VIEW
(
data
->
LV_acc
));
DB
(
g_print
f
(
" -> free ressources
\n
"
)
);
DB
(
g_print
(
" -> free ressources
\n
"
)
);
/* free all temp stuff */
...
...
@@ -1706,7 +1706,7 @@ void ui_mainwindow_update(GtkWidget *widget, gpointer user_data)
struct
hbfile_data
*
data
;
gint
flags
;
DB
(
g_print
f
(
"
\n
[ui-mainwindow] refresh_display
\n
"
)
);
DB
(
g_print
(
"
\n
[ui-mainwindow] refresh_display
\n
"
)
);
data
=
g_object_get_data
(
G_OBJECT
(
gtk_widget_get_ancestor
(
widget
,
GTK_TYPE_WINDOW
)),
"inst_data"
);
//data = INST_DATA(widget);
...
...
@@ -1793,6 +1793,7 @@ gint flags;
gtk_action_set_sensitive
(
gtk_ui_manager_get_action
(
data
->
manager
,
"/MenuBar/ManageMenu/Account"
),
sensitive
);
gtk_action_set_sensitive
(
gtk_ui_manager_get_action
(
data
->
manager
,
"/MenuBar/ManageMenu/Payee"
),
sensitive
);
gtk_action_set_sensitive
(
gtk_ui_manager_get_action
(
data
->
manager
,
"/MenuBar/ManageMenu/Category"
),
sensitive
);
//gtk_action_set_sensitive(gtk_ui_manager_get_action(data->manager, "/MenuBar/ManageMenu/Assign"), sensitive);
gtk_action_set_sensitive
(
gtk_ui_manager_get_action
(
data
->
manager
,
"/MenuBar/ManageMenu/Budget"
),
sensitive
);
gtk_action_set_sensitive
(
gtk_ui_manager_get_action
(
data
->
manager
,
"/MenuBar/EditMenu/Preferences"
),
sensitive
);
...
...
@@ -1910,7 +1911,7 @@ GtkWidget *window;
GdkWindow
*
gdkwindow
;
GdkCursor
*
cursor
;
DB
(
g_print
f
(
"
\n
[ui-mainwindow] busy: %d
\n
"
,
state
)
);
DB
(
g_print
(
"
\n
[ui-mainwindow] busy: %d
\n
"
,
state
)
);
window
=
gtk_widget_get_ancestor
(
widget
,
GTK_TYPE_WINDOW
);
data
=
g_object_get_data
(
G_OBJECT
(
window
),
"inst_data"
);
...
...
@@ -1984,7 +1985,7 @@ struct hbfile_data *data = user_data;
struct
WinGeometry
*
wg
;
gboolean
retval
=
FALSE
;
DB
(
g_print
f
(
"
\n
[ui-mainwindow] dispose
\n
"
)
);
DB
(
g_print
(
"
\n
[ui-mainwindow] dispose
\n
"
)
);
//store position and size
wg
=
&
PREFS
->
wal_wg
;
...
...
@@ -1994,7 +1995,7 @@ gboolean retval = FALSE;
GdkWindowState
state
=
gdk_window_get_state
(
gdk_window
);
wg
->
s
=
(
state
&
GDK_WINDOW_STATE_MAXIMIZED
)
?
1
:
0
;
DB
(
g_print
f
(
" window: l=%d, t=%d, w=%d, h=%d s=%d, state=%d
\n
"
,
wg
->
l
,
wg
->
t
,
wg
->
w
,
wg
->
h
,
wg
->
s
,
state
&
GDK_WINDOW_STATE_MAXIMIZED
)
);
DB
(
g_print
(
" window: l=%d, t=%d, w=%d, h=%d s=%d, state=%d
\n
"
,
wg
->
l
,
wg
->
t
,
wg
->
w
,
wg
->
h
,
wg
->
s
,
state
&
GDK_WINDOW_STATE_MAXIMIZED
)
);
PREFS
->
wal_vpaned
=
gtk_paned_get_position
(
GTK_PANED
(
data
->
vpaned
));
PREFS
->
wal_hpaned
=
gtk_paned_get_position
(
GTK_PANED
(
data
->
hpaned
));
...
...
@@ -2008,7 +2009,7 @@ gboolean retval = FALSE;
}
else
{
DB
(
g_print
f
(
" free wintitle %x
\n
"
,
(
gint
)
data
->
wintitle
)
);
DB
(
g_print
(
" free wintitle %x
\n
"
,
(
gint
)
data
->
wintitle
)
);
gtk_widget_destroy
(
data
->
LV_top
);
...
...
@@ -2067,7 +2068,7 @@ static void ui_mainwindow_window_screen_changed_cb (GtkWidget *widget,
struct
hbfile_data
*
data
)
{
DB
(
g_print
f
(
"
\n
[ui-mainwindow] screen_changed_cb
\n
"
)
);