Commit 09264719 authored by Maxime Doyen's avatar Maxime Doyen

5.1.6 release

parent 5ecc1a7b
2017-09-14 Maxime Doyen
Made 5.1.6 release.
* change: win32: upgraded to gtk+ 3.22.16
* wish : #1710955 warn when opening a backup file
* bugfix: #1716182 New memo doesn't get added to quick list
* bugfix: #1716181 New/deleted transactions and search box show inconsistency
* bugfix: #1715532 "All date" range remains as is after "Select All" in Report
* bugfix: #1713413 Un-editable category
* bugfix: #1710800 Manage budget window do not expand properly
* bugfix: #1708956 Automatic check numbering issue
* bugfix: #1707201 Anonymize dialog change accounts if user close window
* bugfix: #1697174 Months in Manage Budget should allow tabbing from consecutive months
* bugfix: #1697171 'Notes' field in 'Manage Accounts' should wrap text
* bugfix: #1694520 Windows 10 x64 5.1.5 cannot start application
* bugfix: #1693998 Start Balance not shown after new file assistant
* bugfix: #1691992 The "other" side of an internal transfer is not marked as changed when an internal transfer is deleted
* bugfix: #1690555 Internal transfers with a status of "Remind" are not created correctly
* bugfix: #1664012 libofx: macos, cannot import newer OFX versions
2017-05-10 Maxime Doyen
Made 5.1.5 release.
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for homebank 5.1.5.
# Generated by GNU Autoconf 2.69 for homebank 5.1.6.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
......@@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='homebank'
PACKAGE_TARNAME='homebank'
PACKAGE_VERSION='5.1.5'
PACKAGE_STRING='homebank 5.1.5'
PACKAGE_VERSION='5.1.6'
PACKAGE_STRING='homebank 5.1.6'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
......@@ -1340,7 +1340,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures homebank 5.1.5 to adapt to many kinds of systems.
\`configure' configures homebank 5.1.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1407,7 +1407,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of homebank 5.1.5:";;
short | recursive ) echo "Configuration of homebank 5.1.6:";;
esac
cat <<\_ACEOF
......@@ -1515,7 +1515,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
homebank configure 5.1.5
homebank configure 5.1.6
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -1934,7 +1934,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by homebank $as_me 5.1.5, which was
It was created by homebank $as_me 5.1.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -2802,7 +2802,7 @@ fi
# Define the identity of the package.
PACKAGE='homebank'
VERSION='5.1.5'
VERSION='5.1.6'
cat >>confdefs.h <<_ACEOF
......@@ -6999,7 +6999,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by homebank $as_me 5.1.5, which was
This file was extended by homebank $as_me 5.1.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -7065,7 +7065,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
homebank config.status 5.1.5
homebank config.status 5.1.6
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
......@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
AC_INIT([homebank], [5.1.5])
AC_INIT([homebank], [5.1.6])
#AC_INIT([homebank], [x.x-rc])
AM_CONFIG_HEADER(config.h)
......
homebank (5.1.5-1) unstable; urgency=medium
homebank (5.1.6-1) unstable; urgency=medium
* debian/control: changed description (Closes: #734503, #639536)
(LP: #155059)
......
......@@ -289,7 +289,7 @@
<tr>
<th>Enable</th>
<td>enable euro minor currency support in HomeBank.<br>
see <a href="misc-minor.html">minor currency</a> for more details.</td>
see <a href="misc-euro.html">minor currency</a> for more details.</td>
</tr>
</table>
<h3>Currency</h3>
......@@ -333,4 +333,4 @@
<p class="top"><a href="#top">↑ Back to Top</a></p>
</div>
</body>
</html>
\ No newline at end of file
</html>
......@@ -11,8 +11,8 @@
<p><img src="images/web_title.png"><br></p>
<p>&copy; Copyright 1995-2017 by Maxime Doyen<br>
All Rights Reserved</p>
<p>Version: 5.1.5<br>
Compilation date: May 6th, 2017</p><br>
<p>Version: 5.1.6<br>
Compilation date: Sep 14th, 2017</p><br>
</div>
</body>
</html>
......@@ -20,7 +20,7 @@
<h2><img align="bottom" border="0" height="12" id="graphics5" name="graphics5" src="images/1.png" width="12"> Menu</h2>
<p>The <a href="menu-account.html">menu</a> is the start of every actions on transactions.</p>
<h2><img align="bottom" border="0" height="12" id="graphics7" name="graphics7" src="images/2.png" width="12"> Balance</h2>
<p>The balance area contains the balance summary of the account, see <a href="misc-balance.html">this page</a> for details. If the minor option is checked in the preferences, a minor toggle button appear here, see <a href="misc-minor.html">this page</a> for details.</p>
<p>The balance area contains the balance summary of the account, see <a href="misc-balance.html">this page</a> for details. If the minor option is checked in the preferences, a minor toggle button appear here, see <a href="misc-euro.html">this page</a> for details.</p>
<h2><img border="0" height="12" src="images/3.png" width="12"> Quick search</h2>
<p>The quick search will permit to filter the transaction list instantly on text column. The search apply to all columns except status, date and amount columns.</p>
<h2><img align="bottom" border="0" height="12" id="graphics15" name="graphics15" src="images/4.png" width="12"> Quick filter area</h2>
......@@ -72,4 +72,4 @@
<p>The tool-bar provides easy mouse shortcut for some of the menu. All tool button have a tool tip that will help you know what action will be launched when you click on the tool button.</p>
</div>
</body>
</html>
\ No newline at end of file
</html>
......@@ -10,6 +10,7 @@ src/hb-archive.c
src/hb-category.c
src/hb-filter.c
src/hb-hbfile.c
src/hb-payee.c
src/hb-preferences.c
src/homebank.c
src/hb-import-csv.c
......@@ -38,4 +39,5 @@ src/ui-payee.c
src/ui-pref.c
src/ui-split.c
src/ui-transaction.c
src/ui-txn-multi.c
src/ui-widgets.c
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.
......@@ -118,6 +118,8 @@ homebank_SOURCES = \
ui-split.h \
ui-transaction.c \
ui-transaction.h \
ui-txn-multi.c \
ui-txn-multi.h \
ui-widgets.c \
ui-widgets.h
......
......@@ -121,7 +121,7 @@ am_homebank_OBJECTS = dsp_account.$(OBJEXT) dsp_mainwindow.$(OBJEXT) \
ui-currency.$(OBJEXT) ui-dialogs.$(OBJEXT) ui-filter.$(OBJEXT) \
ui-hbfile.$(OBJEXT) ui-payee.$(OBJEXT) ui-pref.$(OBJEXT) \
ui-split.$(OBJEXT) ui-transaction.$(OBJEXT) \
ui-widgets.$(OBJEXT)
ui-txn-multi.$(OBJEXT) ui-widgets.$(OBJEXT)
homebank_OBJECTS = $(am_homebank_OBJECTS)
am__DEPENDENCIES_1 =
homebank_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
......@@ -418,6 +418,8 @@ homebank_SOURCES = \
ui-split.h \
ui-transaction.c \
ui-transaction.h \
ui-txn-multi.c \
ui-txn-multi.h \
ui-widgets.c \
ui-widgets.h
......@@ -568,6 +570,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui-pref.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui-split.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui-transaction.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui-txn-multi.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui-widgets.Po@am__quote@
.c.o:
......
This diff is collapsed.
......@@ -21,25 +21,6 @@
#define __HB_DSPACCOUNT_H__
struct ui_multipleedit_dialog_data
{
GtkWidget *window;
GtkWidget *CM_date, *PO_date;
GtkWidget *LB_mode, *CM_mode, *NU_mode;
GtkWidget *CM_info, *ST_info;
GtkWidget *LB_acc, *CM_acc, *PO_acc;
GtkWidget *CM_pay, *PO_pay;
GtkWidget *CM_cat, *PO_cat;
GtkWidget *CM_tags, *ST_tags;
GtkWidget *CM_memo, *ST_memo;
GtkTreeView *treeview;
gboolean has_xfer;
};
enum
{
ACTION_ACCOUNT_ADD,
......
......@@ -388,9 +388,9 @@ gint result;
{
DB( g_print(" - should revert\n") );
hbfile_change_filepath(hb_util_filename_new_with_extension(GLOBALS->xhb_filepath, "xhb~"));
hbfile_change_filepath(hb_filename_new_with_extension(GLOBALS->xhb_filepath, "xhb~"));
ui_mainwindow_open_internal(widget, NULL);
hbfile_change_filepath(hb_util_filename_new_with_extension(GLOBALS->xhb_filepath, "xhb"));
hbfile_change_filepath(hb_filename_new_with_extension(GLOBALS->xhb_filepath, "xhb"));
}
}
......@@ -497,9 +497,9 @@ GtkWidget *widget = GLOBALS->mainwindow;
ui_mainwindow_update(widget, GINT_TO_POINTER(UF_TITLE+UF_SENSITIVE+UF_REFRESHALL));
ui_start_assistant();
ui_mainwindow_populate_accounts(GLOBALS->mainwindow, NULL);
ui_mainwindow_scheduled_populate(GLOBALS->mainwindow, NULL);
ui_mainwindow_populate_topspending(GLOBALS->mainwindow, NULL);
//ui_mainwindow_populate_accounts(GLOBALS->mainwindow, NULL);
//ui_mainwindow_scheduled_populate(GLOBALS->mainwindow, NULL);
//ui_mainwindow_populate_topspending(GLOBALS->mainwindow, NULL);
}
}
......@@ -577,11 +577,14 @@ gchar *secondtext;
_("_Anonymize")
);
if( result == GTK_RESPONSE_CANCEL )
return;
hbfile_anonymize();
ui_mainwindow_update(GLOBALS->mainwindow, GINT_TO_POINTER(UF_TITLE+UF_SENSITIVE+UF_REFRESHALL));
//#1707201
//if( result == GTK_RESPONSE_CANCEL )
// return;
if( result == GTK_RESPONSE_OK )
{
hbfile_anonymize();
ui_mainwindow_update(GLOBALS->mainwindow, GINT_TO_POINTER(UF_TITLE+UF_SENSITIVE+UF_REFRESHALL));
}
}
......@@ -1095,7 +1098,7 @@ gint account, count;
if(result == GTK_RESPONSE_ADD || result == GTK_RESPONSE_ADDKEEP || result == GTK_RESPONSE_ACCEPT)
{
deftransaction_get(window, NULL);
transaction_add(ope, NULL, ope->kacc);
transaction_add(ope);
DB( g_print(" - added 1 transaction to %d\n", ope->kacc) );
......@@ -1447,7 +1450,7 @@ Transaction *txn;
if(result == GTK_RESPONSE_ADD || result == GTK_RESPONSE_ACCEPT)
{
deftransaction_get(window, NULL);
transaction_add(txn, NULL, txn->kacc);
transaction_add(txn);
GLOBALS->changes_count++;
scheduled_date_advance(arc);
......@@ -1493,7 +1496,7 @@ struct hbfile_data *data = user_data;
da_transaction_init_from_template(txn, arc);
txn->date = scheduled_get_postdate(arc, arc->nextdate);
transaction_add(txn, NULL, 0);
transaction_add(txn);
GLOBALS->changes_count++;
scheduled_date_advance(arc);
......@@ -1729,6 +1732,31 @@ GDate *date;
}
gboolean ui_mainwindow_open_backup_check_confirm(gchar *filepath)
{
gboolean retval = FALSE;
gchar *basename, *secondtext;
gboolean result;
basename = g_path_get_basename(filepath);
secondtext = g_strdup_printf (
_("Your are about to open the backup file '%s'.\n\nAre you sure you want to do this ?"), basename);
result = ui_dialog_msg_confirm_alert(
GTK_WINDOW(GLOBALS->mainwindow),
_("Open a backup file ?"),
secondtext,
_("_Open backup")
);
g_free(secondtext);
g_free(basename);
if( result == GTK_RESPONSE_OK )
retval = TRUE;
return retval;
}
/*
......@@ -1745,17 +1773,29 @@ gchar *filename = NULL;
if( ui_dialog_msg_savechanges(widget,NULL) == TRUE )
{
if(ui_file_chooser_xhb(GTK_FILE_CHOOSER_ACTION_OPEN, &filename) == TRUE)
if( ui_file_chooser_xhb(GTK_FILE_CHOOSER_ACTION_OPEN, &filename) == TRUE )
{
hbfile_change_filepath(filename);
//#1710955 test for backup open
if( hbfile_file_isbackup(filename) )
{
if( ui_mainwindow_open_backup_check_confirm(filename) == TRUE )
{
GLOBALS->hbfile_is_bak = TRUE;
}
else
{
g_free(filename);
return;
}
}
hbfile_change_filepath(filename);
ui_mainwindow_open_internal(widget, NULL);
}
}
}
/*
* open the file stored in GLOBALS->xhb_filepath
*/
......@@ -1768,10 +1808,10 @@ gint r;
data = g_object_get_data(G_OBJECT(gtk_widget_get_ancestor(widget, GTK_TYPE_WINDOW)), "inst_data");
DB( g_print(" - filename: '%s'\n", GLOBALS->xhb_filepath) );
if( GLOBALS->xhb_filepath != NULL )
{
DB( g_print(" - filename: '%s'\n", GLOBALS->xhb_filepath) );
ui_mainwindow_clear(GLOBALS->mainwindow, GINT_TO_POINTER(FALSE));
GLOBALS->hbfile_is_new = FALSE;
......@@ -1831,6 +1871,7 @@ gint r;
}
/*
**
*/
......@@ -1848,6 +1889,14 @@ gint r = XML_UNSET;
if( GLOBALS->hbfile_is_new == TRUE )
saveas = 1;
//#1710955 test for backup open
if( GLOBALS->hbfile_is_bak == TRUE )
{
//todo: later for backup, should also remove datetime and .bak
hbfile_change_filepath(hb_filename_new_with_extension(GLOBALS->xhb_filepath, "xhb"));
saveas = 1;
}
if(saveas == 1)
{
if(ui_file_chooser_xhb(GTK_FILE_CHOOSER_ACTION_SAVE, &filename) == TRUE)
......@@ -1857,6 +1906,7 @@ gint r = XML_UNSET;
homebank_backup_current_file();
r = homebank_save_xml(GLOBALS->xhb_filepath);
GLOBALS->hbfile_is_new = FALSE;
GLOBALS->hbfile_is_bak = FALSE;
}
else
return;
......@@ -1917,7 +1967,12 @@ GList *elt;
gchar *groupname;
gint nballoc;
DB( g_print("\n[ui-mainwindow] accounts_groups_get\n") );
nballoc = da_acc_length ();
DB( g_print(" %d accounts\n", nballoc) );
hash = g_hash_table_new_full(g_str_hash, g_str_equal, (GDestroyNotify)g_free, NULL);
elt = g_list_first(lacc);
while (elt != NULL)
......@@ -1990,7 +2045,7 @@ gpointer key, value;
gtbank = gttoday = gtfuture = 0;
DB( g_print(" populate listview\n") );
DB( g_print(" - populate listview, %d group(s)\n", g_hash_table_size(h_group)) );
model = gtk_tree_view_get_model(GTK_TREE_VIEW(data->LV_acc));
gtk_tree_store_clear (GTK_TREE_STORE(model));
......@@ -2007,7 +2062,7 @@ gpointer key, value;
{
nbtype++;
//1: Header: Bank, Cash, ...
DB( g_print("\n - append type '%s'\n", (gchar *)key) );
DB( g_print(" - add group '%s'\n", (gchar *)key) );
//#1663399 keep type position like in dropdown
position = 0;
......@@ -2046,7 +2101,7 @@ gpointer key, value;
ttoday += hb_amount_base(acc->bal_today, acc->kcur);
tfuture += hb_amount_base(acc->bal_future, acc->kcur);
DB( g_print(" - insert '%s' :: %.2f %.2f %.2f\n", acc->name, acc->bal_bank, acc->bal_today, acc->bal_future) );
DB( g_print(" - add account '%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,
......@@ -2060,7 +2115,7 @@ gpointer key, value;
if(gpa->len > 1)
{
DB( g_print(" - type totals :: %.2f %.2f %.2f\n", tbank, ttoday, tfuture) );
DB( g_print(" - group total :: %.2f %.2f %.2f\n", tbank, ttoday, tfuture) );
// insert the total line
gtk_tree_store_append (GTK_TREE_STORE(model), &child_iter, &iter1);
......@@ -2074,7 +2129,7 @@ gpointer key, value;
}
/* set balance to header to display when collasped */
DB( g_print(" - enrich totals to header :: %.2f %.2f %.2f\n", tbank, ttoday, tfuture) );
DB( g_print(" - enrich group total header :: %.2f %.2f %.2f\n", tbank, ttoday, tfuture) );
gtk_tree_store_set (GTK_TREE_STORE(model), &iter1,
LST_DSPACC_BANK, tbank,
LST_DSPACC_TODAY, ttoday,
......@@ -2090,7 +2145,7 @@ gpointer key, value;
}
DB( g_print(" - grand totals :: %.2f %.2f %.2f\n", gtbank, gttoday, gtfuture) );
DB( g_print(" - grand total :: %.2f %.2f %.2f\n", gtbank, gttoday, gtfuture) );
// Grand total
if( nbtype > 1 )
......@@ -2125,7 +2180,7 @@ void ui_mainwindow_update(GtkWidget *widget, gpointer user_data)
struct hbfile_data *data;
gint flags;
DB( g_print("\n[ui-mainwindow] refresh_display\n") );
DB( g_print("\n[ui-mainwindow] update %p\n", user_data) );
data = g_object_get_data(G_OBJECT(gtk_widget_get_ancestor(widget, GTK_TYPE_WINDOW)), "inst_data");
//data = INST_DATA(widget);
......@@ -2138,7 +2193,7 @@ gint flags;
gchar *basename;
gchar *changed;
DB( g_print(" + 1: wintitle %p\n", data->wintitle) );
DB( g_print(" 1: wintitle %p\n", data->wintitle) );
basename = g_path_get_basename(GLOBALS->xhb_filepath);
......@@ -2164,7 +2219,7 @@ gint flags;
GtkTreePath *path;
gboolean active,sensitive;
DB( g_print(" + 2: disabled, opelist count\n") );
DB( g_print(" 2: disabled, opelist count\n") );
//#1656531
data->acc = NULL;
......@@ -2251,7 +2306,7 @@ gint flags;
/* update toolbar, list */
if(flags & UF_VISUAL)
{
DB( g_print(" + 8: visual\n") );
DB( g_print(" 8: visual\n") );
if(PREFS->toolbar_style == 0)
gtk_toolbar_unset_style(GTK_TOOLBAR(data->toolbar));
......@@ -2296,7 +2351,7 @@ gint flags;
if(flags & UF_BALANCE)
{
DB( g_print(" + 4: balances\n") );
DB( g_print(" 4: balances\n") );
gtk_tree_view_columns_autosize (GTK_TREE_VIEW(data->LV_acc));
......@@ -2311,7 +2366,7 @@ gint flags;
if(flags & UF_REFRESHALL)
{
DB( g_print(" + 8: refreshall\n") );
DB( g_print(" 16: refreshall\n") );
ui_mainwindow_populate_accounts(GLOBALS->mainwindow, NULL);
ui_mainwindow_populate_topspending(GLOBALS->mainwindow, NULL);
......
......@@ -82,6 +82,7 @@ struct hbfile_data
GtkWidget *create_hbfile_window(GtkWidget *do_widget);
void ui_mainwindow_populate_accounts(GtkWidget *widget, gpointer user_data);
gboolean ui_mainwindow_open_backup_check_confirm(gchar *filepath);
void ui_mainwindow_open_internal(GtkWidget *widget, gpointer user_data);
void ui_mainwindow_update(GtkWidget *widget, gpointer user_data);
void ui_mainwindow_action_help_welcome(void);
......
......@@ -404,6 +404,7 @@ void colorscheme_init(GtkColorScheme *scheme, gint index)
case CHART_COLMAP_YNAB:
scheme->colors = ynab_colors;
scheme->nb_cols = ynab_nbcolors;
scheme->cs_blue = 3;
scheme->cs_green = 5;
scheme->cs_red = 0;
scheme->cs_orange = 1;
......
......@@ -444,9 +444,12 @@ PangoLayout *layout;
StackItem *item = &g_array_index(chart->items, StackItem, i);
// category width
pango_layout_set_text (layout, item->label, -1);
pango_layout_get_size (layout, &tw, &th);
title_w = MAX(title_w, (tw / PANGO_SCALE));
if( item->label != NULL )
{
pango_layout_set_text (layout, item->label, -1);
pango_layout_get_size (layout, &tw, &th);
title_w = MAX(title_w, (tw / PANGO_SCALE));
}
DB( g_print(" - calc '%s' title_w=%f (w=%d)\n", item->label, title_w, tw) );
......@@ -458,9 +461,12 @@ PangoLayout *layout;
DB( g_print(" - maxbudget maxbudget=%f (w=%d)\n", maxbudget, tw) );
pango_layout_set_text (layout, item->status, -1);
pango_layout_get_size (layout, &tw, &th);
chart->rel_col_w = MAX(chart->rel_col_w, (tw / PANGO_SCALE));
if( item->status != NULL )
{
pango_layout_set_text (layout, item->status, -1);
pango_layout_get_size (layout, &tw, &th);
chart->rel_col_w = MAX(chart->rel_col_w, (tw / PANGO_SCALE));
}
}
chart->rel_col_w += CHART_SPACING;
......@@ -781,10 +787,13 @@ int tw, th;
pango_cairo_show_layout (cr, layout);
// status
pango_layout_set_text (layout, item->status, -1);
pango_layout_get_size (layout, &tw, &th);
cairo_move_to(cr, chart->l + chart->cat_col_w + chart->graph_width + chart->bud_col_w + chart->res_col_w + (CHART_SPACING*4), ytext);
pango_cairo_show_layout (cr, layout);
if( item->status )
{
pango_layout_set_text (layout, item->status, -1);
pango_layout_get_size (layout, &tw, &th);
cairo_move_to(cr, chart->l + chart->cat_col_w + chart->graph_width + chart->bud_col_w + chart->res_col_w + (CHART_SPACING*4), ytext);
pango_cairo_show_layout (cr, layout);
}
}
//y += blkw;
......
......@@ -634,7 +634,6 @@ gint i;
chart->w = allocation.width - (CHART_MARGIN*2);
chart->h = allocation.height - (CHART_MARGIN*2);
gdkwindow = gtk_widget_get_window(chart->drawarea);
if(!gdkwindow)
{
......
......@@ -472,7 +472,7 @@ Transaction *txn;
txn->date = scheduled_get_postdate(arc, mydate);
/* todo: ? fill in cheque number */
transaction_add(txn, NULL, 0);
transaction_add(txn);
GLOBALS->changes_count++;
count++;
......
......@@ -467,6 +467,9 @@ guint32 *new_key;
newcat->imported = imported;
newcat->flags |= GF_SUB;
//#1713413 take parent type into account
if(parent->flags & GF_INCOME)
newcat->flags |= GF_INCOME;
DB( g_print(" -> insert subcat '%s' id: %d\n", newcat->name, newcat->key) );
......
......@@ -22,6 +22,7 @@
#include "hb-archive.h"
#include "hb-transaction.h"
/****************************************************************************/
/* Debug macros */