gnucash master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Tue Oct 17 21:35:12 EDT 2017
Updated via https://github.com/Gnucash/gnucash/commit/e8e43b33 (commit)
via https://github.com/Gnucash/gnucash/commit/5e7c2106 (commit)
via https://github.com/Gnucash/gnucash/commit/b6d3c0e5 (commit)
via https://github.com/Gnucash/gnucash/commit/25e3b22a (commit)
via https://github.com/Gnucash/gnucash/commit/99a28888 (commit)
via https://github.com/Gnucash/gnucash/commit/2184cb34 (commit)
via https://github.com/Gnucash/gnucash/commit/4c007f8b (commit)
via https://github.com/Gnucash/gnucash/commit/91a2ee45 (commit)
via https://github.com/Gnucash/gnucash/commit/14eafd8a (commit)
via https://github.com/Gnucash/gnucash/commit/281421d5 (commit)
via https://github.com/Gnucash/gnucash/commit/97b09b5d (commit)
via https://github.com/Gnucash/gnucash/commit/789a28dd (commit)
via https://github.com/Gnucash/gnucash/commit/9e92cc2e (commit)
via https://github.com/Gnucash/gnucash/commit/3cdac65d (commit)
from https://github.com/Gnucash/gnucash/commit/9472e934 (commit)
commit e8e43b33d6f91eea8bc6bbf289437c0d531c79d6
Merge: 9472e93 5e7c210
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Oct 17 18:34:48 2017 -0700
Merge branch 'unstable'
commit 5e7c2106eca8b299adfb86eb84b9b708344c6554
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Oct 15 16:11:57 2017 -0700
Re-release 2.7.0
diff --git a/ChangeLog b/ChangeLog
index 591f74c..fc7d16b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,374 @@
+2017-10-15 John Ralls
+
+ * Re-release 2.7.0 (HEAD -> unstable)
+
+2017-10-15 John Ralls
+
+ * Disable inclusion of transaction text for OFX transactions in the description.
+
+2017-10-16 John Ralls
+
+ * Use file:/// when constructing a tempdir uri on Windows. (origin/unstable)
+
+2017-10-16 John Ralls
+
+ * Merge branch 'unstable-fix-spelling' of https://github.com/christopherlam/gnucash into unstable
+
+2017-10-16 John Ralls
+
+ * Install libgwengui-gtk3.dll on Windows.
+
+2017-10-16 Christopher Lam
+
+ * Fix spelling insensative->insensitive
+
+2017-10-15 John Ralls
+
+ * [MacOS] Change CMake installed names to absolute paths from @rpath/...
+
+2017-10-14 John Ralls
+
+ * Build Macs with WebKit1.
+
+2017-10-14 John Ralls
+
+ * HTML: Connect to load-failed and resource-load signals.
+
+2017-10-13 John Ralls
+
+ * Fix html temp-file URI.
+
+2017-10-11 fell
+
+ * reapply commit 3cdac65 on the new dialog-ab-pref and remove obsolete section from dialog-ab.gade
+
+2017-10-06 fell
+
+ * Merge branch 'maint' into unstable
+
+2017-10-06 fell
+
+ * Use descriptions from gschema as tooltips in Preferences Aqbanking
+
+2017-10-05 Geert Janssens
+
+ * Replace ambiguous 'scm' with 'vcs' in macro name (origin/master, origin/HEAD)
+
+2017-10-05 Geert Janssens
+
+ * Use different format specifier to make older git versions happy
+
+2017-10-05 Geert Janssens
+
+ * Merge branch maint into unstable
+
+2017-10-04 Geert Janssens
+
+ * Additional changes to use commit date rather than build date
+
+2017-10-03 Geert Janssens
+
+ * Fix gnucash.pot generation from cmake build.
+
+2017-10-03 Geert Janssens
+
+ * Stop testing GObject's handling of invalid parameters
+
+2017-10-03 fell
+
+ * Fix a typo in gir error message
+
+2017-10-02 fell
+
+ * Readd the missing glade msgctx strings to ru.po (maint)
+
+2017-10-02 fell
+
+ * ru.po: Minor improvements of the header after PR #209
+
+2017-10-01 ashed
+
+ * Update Russian Translation with the 2.6.18 gnucash.pot.
+
+2017-09-07 Bernhard M. Wiedemann
+
+ * Allow to export the last commit's date
+
+2017-09-29 Ashed
+
+ * Updated and polished Russian Translation.
+
+2017-09-29 Robert Fewell
+
+ * Change the item_edit blanking rectangle position and size
+
+2017-09-29 Robert Fewell
+
+ * Change the position of the double row on the cursor
+
+2017-09-29 Robert Fewell
+
+ * Instead of removing a css class, wrap the change in save/restore
+
+2017-09-29 Robert Fewell
+
+ * Rename internal CSS class prefix for the register to 'register-'
+
+2017-09-29 Robert Fewell
+
+ * Remove the CSS for a dark theme Register
+
+2017-09-29 Robert Fewell
+
+ * Fix typo in comment
+
+2017-09-23 Robert Fewell
+
+ * Make sure the sheet has focus at start
+
+2017-09-23 Robert Fewell
+
+ * Fix problem with scrollbar sliders not tracking value
+
+2017-09-13 Robert Fewell
+
+ * Fix missing hatchings when transaction unbalanced
+
+2017-09-13 Robert Fewell
+
+ * When tabbing to the field, text should be highlighted only
+
+2017-09-13 Robert Fewell
+
+ * Remove spaces from blank lines
+
+2017-09-13 Robert Fewell
+
+ * Adjust text position to be the same as the item_edit entry
+
+2017-09-09 Robert Fewell
+
+ * Make sure the cursor background is filled to start to hide whats below it
+
+2017-09-09 Robert Fewell
+
+ * Add ability to draw a text cursor for the entry
+
+2017-09-09 Robert Fewell
+
+ * Do not copy the colour and so prevent form having to free it
+
+2017-09-09 Robert Fewell
+
+ * Allow the sheet to be scrolled with the mouse wheel
+
+2017-09-09 Robert Fewell
+
+ * Rename a couple of functions to align with the format of the rest
+
+2017-09-09 Robert Fewell
+
+ * Use a higher priority for the idle add when item edit updating
+
+2017-09-09 Robert Fewell
+
+ * Fix problem when sheet first loaded in the register
+
+2017-09-09 Robert Fewell
+
+ * Change the line position to make double thickness line on cursor
+
+2017-09-04 Robert Fewell
+
+ * Use the background class for the dense-calendar
+
+2017-09-04 Robert Fewell
+
+ * Change the way negative-numbers class was defined in CSS
+
+2017-09-04 Robert Fewell
+
+ * Remove white space and tabs from split-register-model
+
+2017-09-04 Robert Fewell
+
+ * Add a heading for the Rate column.
+
+2017-09-04 Robert Fewell
+
+ * Register in journal mode with rate column, split columns loose alignment
+
+2017-09-04 Robert Fewell
+
+ * Redraw the header after size allocation of the sheet.
+
+2017-09-04 Robert Fewell
+
+ * Add redraw of the header when preference changes
+
+2017-09-04 Robert Fewell
+
+ * Remove the no longer widgets for setting register colours
+
+2017-09-04 Robert Fewell
+
+ * Change the register to be based on CSS
+
+2017-09-04 Robert Fewell
+
+ * Change tabs to spaces in gnucash-style.c
+
+2017-09-04 Robert Fewell
+
+ * Remove trailing white space from gnucash-sheet.c
+
+2017-09-04 Robert Fewell
+
+ * Remove trailing white space from gnucash-item-edit.c
+
+2017-09-04 Robert Fewell
+
+ * This dialog-invoice.glade file had missing changes, corrected.
+
+2017-09-01 Robert Fewell
+
+ * This change is needed after all, used when header is resized
+
+2017-08-31 Robert Fewell
+
+ * Remove white space and change tabs to spaces in gnucash-register.c
+
+2017-08-31 Robert Fewell
+
+ * Rework the item-edit pop up to use sheet width and not move about
+
+2017-08-31 Robert Fewell
+
+ * Change gnc_item_edit_update to be used in an idle add function
+
+2017-08-31 Robert Fewell
+
+ * Move inline css for padding to gnucash.css
+
+2017-08-31 Robert Fewell
+
+ * Remove an obsolete source comment in gnucash-item-list.c
+
+2017-08-31 Robert Fewell
+
+ * Remove white space and change tabs to spaces in datecell-gnome.c
+
+2017-08-31 Robert Fewell
+
+ * Rename various forms of Get Popup Height to Popup Get Height
+
+2017-09-21 christopherlam
+
+ * Add missing export (gnc:date-get-week)
+
+2017-09-27 Geert Janssens
+
+ * Merge branch 'maint' into unstable
+
+2017-09-27 Geert Janssens
+
+ * Use the same bugzilla url in AC_INIT as on maint
+
+2017-09-27 Geert Janssens
+
+ * Add Catalan README file to autotools based build
+
+2017-09-26 Geert Janssens
+
+ * Fix build failures if userdata_home exists but gnc_userdata_home doesn't (master)
+
+2017-09-26 Josep-Maria Prat
+
+ * Readme translated into catalan
+
+2017-09-22 John Ralls
+
+ * Release 2.6.18 (tag: 2.6.18)
+
+2017-09-22 John Ralls
+
+ * Remove automake version check for make dist.
+
+2017-09-22 John Ralls
+
+ * Fix typo in CA_DIST name.
+
+2017-09-21 John Ralls
+
+ * Import latest Farsi and Srpska translations from the translation project.
+
+2017-09-21 Geert Janssens
+
+ * Ignore softlink for new report
+
+2017-09-21 Geert Janssens
+
+ * Revert "Ignore softlink for new report"
+
+2017-09-21 Geert Janssens
+
+ * Ignore softlink for new report
+
+2017-09-21 Geert Janssens
+
+ * Merge 'maint' into unstable
+
+2017-09-21 Geert Janssens
+
+ * Add income-gst-statement.scm to POTFILES.in
+
+2017-09-21 christopherlam
+
+ * Fix some (gnc:make-gnc-monetary) errors
+
+2017-09-17 christopherlam
+
+ * Restore "sign reverses" option This was removed during development.
+
+2017-09-17 christopherlam
+
+ * Initial commit income-gst-statement.scm
+
+2017-09-17 christopherlam
+
+ * Reindent from transaction.scm
+
+2017-09-17 christopherlam
+
+ * cp transaction.scm income-gst-statement.scm
+
+2017-09-21 Geert Janssens
+
+ * Fixup for Catalan account charts
+
+2017-09-21 Geert Janssens
+
+ * Add boilerplate to get Catalan account charts installed and added to the distribution
+
+2017-09-21 Josep-Maria Prat
+
+ * Catalan accounts missing
+
+2017-09-20 Geert Janssens
+
+ * Properly ignore internal report options that are not on invisible option pages when opening the report options dialog
+
2017-09-16 John Ralls
- * Merge branch 'maint' (HEAD -> unstable, master)
+ * Release 2.7.0 (tag: 2.7.0)
2017-09-16 John Ralls
- * Fix test-userdata-dir on Mac. (origin/master, origin/HEAD)
+ * Fix the fix from mac for test-userdata-dir.c
+
+2017-09-16 John Ralls
+
+ * Fix test-userdata-dir on Mac.
2017-09-16 Geert Janssens
@@ -32,7 +396,7 @@
2017-09-06 John Ralls
- * Install the current, 2015, and 2016 ChangeLogs. (origin/maint, maint)
+ * Install the current, 2015, and 2016 ChangeLogs.
2017-09-16 Geert Janssens
@@ -6086,3 +6450,7 @@
* Add a missing gettext in plugin page owner tree
+2016-01-01 fell
+
+ * Bug 760052 - missing flag translatable in Custom Report
+
diff --git a/NEWS b/NEWS
index d878f87..67b09c7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,17 @@
Version history:
------- -------
-2.7.0 - 19 September 2017
+2.7.0 - 17 October 2017
The Gnucash Development Team is pleased to release Gnucash 2.7.0,
the first release of an unstable series leading to Gnucash 2.8.0.
This release is UNSTABLE and SHOULD NOT BE USED in production.
+ See the KNOWN PROBLEMS list at the bottom of the announcement.
+
+ Note: Version information in the splash screen and About dialog
+ will now reflect the date of the last commit used to build
+ GnuCash rather than the date it was compiled. This is to assist
+ quality assurance and debugging efforts by Linux distribution
+ maintainers.
The headline item for this release is that GnuCash now uses the
Gtk+-3.0 Toolkit and the WebKit2Gtk API. This change was forced
@@ -13,66 +20,80 @@ Version history:
support Microsoft Windows so that platform will continue to use
the WebKit1 API, though with Gtk3. We've selected Gtk+-3.14.0
as the minimum version because it fully supports CSS
- theming. Geert Janssens did the original conversion and Bob
- Fewell has contributed much UI polishing.
-
- Geert Janssens has overhauled the CSV importer, rewriting the
- bulk of it in C++, adding new features including the ability to
- re-import CSV files exported from GnuCash.
-
- Geert has also adjusted the data file directory so that it's
- located appropriately to the operating system's conventions by
- default. It's still possible to overried with the environment
- variable GNC_DOC_PATH, which replaces GNC_DOT_DIR in earlier
- versions of GnuCash.
-
- Bob Fewell has converted the account representation in the
- Bayes import map to GUID from strings so that the matcher won't
- have to be retrained if you rename an account. THIS WILL MAKE
- YOUR MAP UNREADABLE BY PREVIOUS VERSIONS OF GNUCASH. Bob has
- also implemented an editor to remove outdated or incorrect
- match data from the import maps, added user interfacs for
- managing files associated with transactions, improved the
- facility for removing old prices from the price database, and
- provided for removing deleted files from the history list in
- the file menu.
-
- John Ralls has rewritten the numerics to allow for more
- significant digits. The old 6-digit-maximum fraction will be a
- 9-digit maximum by 2.8. there is still some cleanup required
- before the limit can actually change.
-
- Christopher Lam has contributed a new Income GST Report and
- made some improvements to the Transaction report.
-
- Carsten Rinke has improved the appearance of the chart reports.
-
- John Ralls and Aaron Laws have rewritten several parts of the
- engine and SQL backend in C++, an effort that will continue in
- the next development cycle. KVP is now private to
- libgncmod-engine and accessible outside via qof_instance_set
- and qof_instance_get. Aaron has reimplemented KVP itself in C++
- using boost::variant and GUID based on boost::UUID.
-
- John rewrote the date implementation to boost::date-time,
+ theming. (Geert Janssens and Robert Fewell)
+
+ There's a new CSV importer largely rewritten in C++, adding new
+ features including the ability to re-import CSV files exported
+ from GnuCash. (Geert Janssens)
+
+ Data file directories are now located appropriately to the
+ operating system's conventions by default. It's still possible
+ to overried with the environment variable GNC_DOC_PATH, which
+ replaces GNC_DOT_DIR in earlier versions of GnuCash. (Geert
+ Janssens)
+
+ Accounts in the Bayes import map are now linked by GUID instead
+ of names so that the matcher won't have to be retrained if you
+ rename an account. THIS WILL MAKE YOUR FILE UNREADABLE BY
+ PREVIOUS VERSIONS OF GNUCASH. There's a new editor to remove
+ outdated or incorrect match data from the import maps, a new
+ user interfacs for managing files associated with transactions,
+ an improved facility for removing old prices from the price
+ database, and a way to remove deleted files from the history
+ list in the file menu. (All from Robert Fewell!)
+
+ Numerics are rewritten to allow for more significant
+ digits. The old 6-digit-maximum fraction will be a 9-digit
+ maximum by 2.8. there is still some cleanup required before the
+ limit can actually change. (John Ralls)
+
+ New Income GST Report and some improvements to the Transaction
+ report. (Christopher Lam)
+
+ Chart Reports appearance is improved (Carsten Rinke)
+
+ Several parts of the engine and the SQL backend are rewritten
+ in C++, an effort that will continue in the next development
+ cycle. KVP is now private to libgncmod-engine and accessible
+ outside via qof_instance_set and qof_instance_get. (John Ralls
+ and Aaron Laws)
+
+ KVP and GUID are reimplemnted in C++ using boost::variant and
+ boost::UUID respectively (Aaron Laws).
+
+ The date implementation is migrated to boost::date-time,
replacing a Glib GDateTime implementation. This makes the
earliest date recordable 1 January 1400CE instead of 1 January
- 1CE. We doubt any users will be affected.
+ 1CE. We doubt any users will be affected. (John Ralls)
+
+ Distribution tarballs can now be built with CMake as well as
+ Autotools. (Rob Gowin)
The CuteCash front end has been removed. The code we need from
GOffice has been brought into the GnuCash code base so GOffice
is no longer a dependency.
- Rob Gowin, in addition to creating the CMake-based build system
- partway through the 2.6 release cycle, has added to it a dist
- function that allows us to distribute tarballs that will build
- with either CMake or Autotools... but look for Autotools to be
- dropped soon.
-
Of interest mostly to developers, we've reorganized the code
into a core library directory, libgnucash, and
applications-specific directory, gnucash.
+ A new Russian translation of the Guide has been started by
+ Dmitriy Mandel. Downloads in the usual formats are available at
+ https://code.gnucash.org/docs/ru/; the HTML is at
+ https://code.gnucash.org/docs/ru/gnucash-guide/.
+
+ There will be no unstable documentation release at this
+ time. There have been very few relatively minor changes to the
+ master documentation branch; those documents may be viewed in
+ the nightly builds at https://www.gnucash.org/docs.phtml.
+
+ KNOWN PROBLEMS:
+
+ On Microsoft Windows starting the AQBanking Setup Wizard crashes GnuCash.
+
+ test-import-bayes built with autotools intermittently fails at
+ line 381, where the returned value is 1 instead of the expected
+ 6.
2.6.18 - 24 September 2017
commit b6d3c0e5818dd907fa963bcec30d586c5cc62dd5
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Oct 15 15:56:40 2017 -0700
Disable inclusion of transaction text for OFX transactions in the description.
OFX puts rather useless information in the transaction text that makes
the description overly long with the important part at the end.
diff --git a/gnucash/import-export/aqb/dialog-ab-trans.c b/gnucash/import-export/aqb/dialog-ab-trans.c
index 718e530..1a45cca 100644
--- a/gnucash/import-export/aqb/dialog-ab-trans.c
+++ b/gnucash/import-export/aqb/dialog-ab-trans.c
@@ -688,8 +688,8 @@ gnc_ab_trans_dialog_verify_values(GncABTransDialog *td)
gnc_ab_trans_dialog_entry_set (amount_entry, "", NULL);
}
- /* Check transaction purpose */
- purpose = gnc_ab_get_purpose(td->ab_trans);
+ /* Check transaction purpose. OFX doesn't do transfers. */
+ purpose = gnc_ab_get_purpose(td->ab_trans, FALSE);
if (!purpose || !strlen(purpose))
{
gnc_ab_trans_dialog_entry_set (td->purpose_entry,
diff --git a/gnucash/import-export/aqb/gnc-ab-transfer.c b/gnucash/import-export/aqb/gnc-ab-transfer.c
index ec21267..74f337c 100644
--- a/gnucash/import-export/aqb/gnc-ab-transfer.c
+++ b/gnucash/import-export/aqb/gnc-ab-transfer.c
@@ -238,7 +238,8 @@ gnc_ab_maketrans(GtkWidget *parent, Account *gnc_acc,
gnc_xfer_dialog_set_amount_sensitive(xfer_dialog, FALSE);
gnc_xfer_dialog_set_date_sensitive(xfer_dialog, FALSE);
- description = gnc_ab_description_to_gnc(ab_trans);
+ /* OFX doesn't do transfers. */
+ description = gnc_ab_description_to_gnc(ab_trans, FALSE);
gnc_xfer_dialog_set_description(xfer_dialog, description);
g_free(description);
diff --git a/gnucash/import-export/aqb/gnc-ab-utils.c b/gnucash/import-export/aqb/gnc-ab-utils.c
index 131481c..bf04ea8 100644
--- a/gnucash/import-export/aqb/gnc-ab-utils.c
+++ b/gnucash/import-export/aqb/gnc-ab-utils.c
@@ -363,7 +363,7 @@ gnc_ab_get_remote_name(const AB_TRANSACTION *ab_trans)
}
gchar *
-gnc_ab_get_purpose(const AB_TRANSACTION *ab_trans)
+gnc_ab_get_purpose(const AB_TRANSACTION *ab_trans, gboolean is_ofx)
{
const GWEN_STRINGLIST *ab_purpose;
const char *ab_transactionText = NULL;
@@ -371,7 +371,7 @@ gnc_ab_get_purpose(const AB_TRANSACTION *ab_trans)
g_return_val_if_fail(ab_trans, g_strdup(""));
- if (gnc_prefs_get_bool(GNC_PREFS_GROUP_AQBANKING, GNC_PREF_USE_TRANSACTION_TXT))
+ if (!is_ofx && gnc_prefs_get_bool(GNC_PREFS_GROUP_AQBANKING, GNC_PREF_USE_TRANSACTION_TXT))
{
/* According to AqBanking, some of the non-swift lines have a special
* meaning. Some banks place valuable text into the transaction text,
@@ -393,10 +393,10 @@ gnc_ab_get_purpose(const AB_TRANSACTION *ab_trans)
}
gchar *
-gnc_ab_description_to_gnc(const AB_TRANSACTION *ab_trans)
+gnc_ab_description_to_gnc(const AB_TRANSACTION *ab_trans, gboolean is_ofx)
{
/* Description */
- gchar *description = gnc_ab_get_purpose(ab_trans);
+ gchar *description = gnc_ab_get_purpose(ab_trans, is_ofx);
gchar *other_name = gnc_ab_get_remote_name(ab_trans);
gchar *retval;
@@ -527,8 +527,10 @@ gnc_ab_trans_to_gnc(const AB_TRANSACTION *ab_trans, Account *gnc_acc)
/* Trans-Num or Split-Action set with gnc_set_num_action below per book
* option */
+ fitid = AB_Transaction_GetFiId(ab_trans);
+
/* Description */
- description = gnc_ab_description_to_gnc(ab_trans);
+ description = gnc_ab_description_to_gnc(ab_trans, (fitid && *fitid));
xaccTransSetDescription(gnc_trans, description);
g_free(description);
@@ -549,10 +551,10 @@ gnc_ab_trans_to_gnc(const AB_TRANSACTION *ab_trans, Account *gnc_acc)
gnc_set_num_action (gnc_trans, split, custref, NULL);
/* Set OFX unique transaction ID */
- fitid = AB_Transaction_GetFiId(ab_trans);
if (fitid && *fitid)
gnc_import_set_split_online_id(split, fitid);
+ /* FIXME: Extract function */
{
/* Amount into the split */
const AB_VALUE *ab_value = AB_Transaction_GetValue(ab_trans);
diff --git a/gnucash/import-export/aqb/gnc-ab-utils.h b/gnucash/import-export/aqb/gnc-ab-utils.h
index ca7153d..3f3fc44 100644
--- a/gnucash/import-export/aqb/gnc-ab-utils.h
+++ b/gnucash/import-export/aqb/gnc-ab-utils.h
@@ -179,7 +179,7 @@ gchar *gnc_ab_get_remote_name(const AB_TRANSACTION *ab_trans);
* @param ab_trans AqBanking transaction
* @return A newly allocated string, may be ""
*/
-gchar *gnc_ab_get_purpose(const AB_TRANSACTION *ab_trans);
+gchar *gnc_ab_get_purpose(const AB_TRANSACTION *ab_trans, gboolean is_ofx);
/**
* Create the appropriate description field for a GnuCash Transaction by the
@@ -189,7 +189,7 @@ gchar *gnc_ab_get_purpose(const AB_TRANSACTION *ab_trans);
* @param ab_trans AqBanking transaction
* @return A newly allocated string, may be ""
*/
-gchar *gnc_ab_description_to_gnc(const AB_TRANSACTION *ab_trans);
+gchar *gnc_ab_description_to_gnc(const AB_TRANSACTION *ab_trans, gboolean is_ofx);
/**
* Create the appropriate memo field for a GnuCash Split by the information
commit 25e3b22a4a5c579c3add22e7a8d8d686a80293e0
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Oct 16 14:27:15 2017 -0700
Use file:/// when constructing a tempdir uri on Windows.
g_get_temp_dir doesn't provide the leading /.
diff --git a/gnucash/html/gnc-html-webkit1.c b/gnucash/html/gnc-html-webkit1.c
index 565d647..0bf2186 100644
--- a/gnucash/html/gnc-html-webkit1.c
+++ b/gnucash/html/gnc-html-webkit1.c
@@ -797,7 +797,11 @@ impl_webkit_show_data( GncHtml* self, const gchar* data, int datalen )
fd = g_mkstemp( filename );
impl_webkit_export_to_file( self, filename );
close( fd );
+#ifdef G_OS_WIN32
+ uri = g_strdup_printf( "file:///%s", filename );
+#else
uri = g_strdup_printf( "file://%s", filename );
+#endif
g_free(filename);
DEBUG("Loading uri '%s'", uri);
webkit_web_view_load_uri( priv->web_view, uri );
commit 99a28888683f23247ba3cc3c29d774043349c6db
Merge: 2184cb3 4c007f8
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Oct 16 12:04:17 2017 -0700
Merge branch 'unstable-fix-spelling' of https://github.com/christopherlam/gnucash into unstable
commit 2184cb347a02f589961e9c45c5300ed92bdb59a5
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Oct 16 11:22:55 2017 -0700
Install libgwengui-gtk3.dll on Windows.
diff --git a/borrowed/gwengui-gtk3/CMakeLists.txt b/borrowed/gwengui-gtk3/CMakeLists.txt
index b462e63..446c63c 100644
--- a/borrowed/gwengui-gtk3/CMakeLists.txt
+++ b/borrowed/gwengui-gtk3/CMakeLists.txt
@@ -55,4 +55,5 @@ TARGET_LINK_LIBRARIES(gwengui-gtk3 ${GWENHYWFAR_LDFLAGS} ${GTK3_LDFLAGS})
INSTALL(TARGETS gwengui-gtk3
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
+ RUNTIME DESTINATION bin
)
commit 4c007f8b28b1575f50d5d535e28b685458a58462
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Mon Oct 16 21:00:26 2017 +0800
Fix spelling insensative->insensitive
diff --git a/gnucash/gnome/gtkbuilder/dialog-find-account.glade b/gnucash/gnome/gtkbuilder/dialog-find-account.glade
index f311543..27e0de3 100644
--- a/gnucash/gnome/gtkbuilder/dialog-find-account.glade
+++ b/gnucash/gnome/gtkbuilder/dialog-find-account.glade
@@ -184,7 +184,7 @@
<object class="GtkLabel" id="filter-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Case insensative searching is available on 'Account Full Name'.</property>
+ <property name="label" translatable="yes">Case insensitive searching is available on 'Account Full Name'.</property>
<property name="justify">center</property>
</object>
<packing>
diff --git a/po/lv.po b/po/lv.po
index 292991e..dafedb8 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -26375,7 +26375,7 @@ msgstr ""
#~ msgid "Account Full Name"
#~ msgstr "Konta pilnais nosaukums"
-#~ msgid "Case insensative searching is available on 'Account Full Name'."
+#~ msgid "Case insensitive searching is available on 'Account Full Name'."
#~ msgstr ""
#~ "'Konta pilnajÄ nosaukumÄ' meklÄ“Å¡ana tiek veikta, neÅ¡Ä·irojot lielos un "
#~ "mazos burtus."
commit 91a2ee45254454626b10b36ca65d73da0740b968
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Oct 15 13:22:29 2017 -0700
[MacOS] Change CMake installed names to absolute paths from @rpath/...
gtk-mac-bundler can't access the executable's rpath list so it can't
follow dependencies if they're not in $install_dir/lib from @rpath.
Autotools always sets absolute path install names so this should have no
adverse affects on other Mac builds.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 738b434..a940b87 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -491,9 +491,10 @@ SET( CMAKE_CXX_FLAGS_DEBUG "-O0 -g ${CMAKE_CXX_FLAGS} -Wno-deprecated-declaratio
IF (APPLE AND WITH_GNUCASH)
SET(CMAKE_MACOSX_RPATH ON)
+ SET(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
ENDIF (APPLE AND WITH_GNUCASH)
-IF (UNIX AND NOT APPLE)
+IF (UNIX)
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib:${CMAKE_INSTALL_PREFIX}/lib/gnucash")
ENDIF()
diff --git a/gnucash/gnome-search/CMakeLists.txt b/gnucash/gnome-search/CMakeLists.txt
index 5f27601..3695186 100644
--- a/gnucash/gnome-search/CMakeLists.txt
+++ b/gnucash/gnome-search/CMakeLists.txt
@@ -52,6 +52,10 @@ TARGET_COMPILE_DEFINITIONS(gncmod-gnome-search PRIVATE -DG_LOG_DOMAIN=\"gnc.gui.
TARGET_INCLUDE_DIRECTORIES(gncmod-gnome-search PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+IF (APPLE)
+ SET_TARGET_PROPERTIES (gncmod-gnome-search PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash")
+ENDIF()
+
INSTALL(TARGETS gncmod-gnome-search
LIBRARY DESTINATION lib/gnucash
ARCHIVE DESTINATION lib/gnucash
diff --git a/gnucash/gnome-utils/CMakeLists.txt b/gnucash/gnome-utils/CMakeLists.txt
index fd5043f..4588de8 100644
--- a/gnucash/gnome-utils/CMakeLists.txt
+++ b/gnucash/gnome-utils/CMakeLists.txt
@@ -232,6 +232,10 @@ TARGET_INCLUDE_DIRECTORIES(gncmod-gnome-utils
)
+IF (APPLE)
+ SET_TARGET_PROPERTIES (gncmod-gnome-utils PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash")
+ENDIF()
+
INSTALL(TARGETS gncmod-gnome-utils
LIBRARY DESTINATION lib/gnucash
ARCHIVE DESTINATION lib/gnucash
diff --git a/gnucash/html/CMakeLists.txt b/gnucash/html/CMakeLists.txt
index c270c14..25a77d3 100644
--- a/gnucash/html/CMakeLists.txt
+++ b/gnucash/html/CMakeLists.txt
@@ -53,6 +53,10 @@ PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
+IF (APPLE)
+ SET_TARGET_PROPERTIES (gncmod-html PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash")
+ENDIF()
+
INSTALL(TARGETS gncmod-html
LIBRARY DESTINATION lib/gnucash
ARCHIVE DESTINATION lib/gnucash
diff --git a/gnucash/import-export/CMakeLists.txt b/gnucash/import-export/CMakeLists.txt
index bfc14b5..6e620ae 100644
--- a/gnucash/import-export/CMakeLists.txt
+++ b/gnucash/import-export/CMakeLists.txt
@@ -64,6 +64,10 @@ TARGET_COMPILE_DEFINITIONS (gncmod-generic-import PRIVATE -DG_LOG_DOMAIN=\"gnc.i
TARGET_INCLUDE_DIRECTORIES(gncmod-generic-import PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+IF (APPLE)
+ SET_TARGET_PROPERTIES (gncmod-generic-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash")
+ENDIF()
+
INSTALL(TARGETS gncmod-generic-import
LIBRARY DESTINATION lib/gnucash
ARCHIVE DESTINATION lib/gnucash
diff --git a/gnucash/import-export/aqb/CMakeLists.txt b/gnucash/import-export/aqb/CMakeLists.txt
index 44c1bdf..52c2ff5 100644
--- a/gnucash/import-export/aqb/CMakeLists.txt
+++ b/gnucash/import-export/aqb/CMakeLists.txt
@@ -69,6 +69,10 @@ IF(WITH_AQBANKING)
${GWENHYWFAR_INCLUDE_DIRS}
${KTOBLZCHECK_INCLUDE_DIRS})
+IF (APPLE)
+ SET_TARGET_PROPERTIES (gncmod-aqbanking PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash")
+ENDIF()
+
INSTALL(TARGETS gncmod-aqbanking
LIBRARY DESTINATION lib/gnucash
ARCHIVE DESTINATION lib/gnucash
diff --git a/gnucash/import-export/bi-import/CMakeLists.txt b/gnucash/import-export/bi-import/CMakeLists.txt
index ec5efeb..ad6cf6c 100644
--- a/gnucash/import-export/bi-import/CMakeLists.txt
+++ b/gnucash/import-export/bi-import/CMakeLists.txt
@@ -39,6 +39,10 @@ TARGET_INCLUDE_DIRECTORIES(gncmod-bi-import
TARGET_COMPILE_DEFINITIONS(gncmod-bi-import PRIVATE -DG_LOG_DOMAIN=\"gnc.plugin.bi-import\")
+IF (APPLE)
+ SET_TARGET_PROPERTIES (gncmod-bi-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash")
+ENDIF()
+
INSTALL(TARGETS gncmod-bi-import
LIBRARY DESTINATION lib/gnucash
ARCHIVE DESTINATION lib/gnucash
diff --git a/gnucash/import-export/csv-exp/CMakeLists.txt b/gnucash/import-export/csv-exp/CMakeLists.txt
index 392a8fb..424efcf 100644
--- a/gnucash/import-export/csv-exp/CMakeLists.txt
+++ b/gnucash/import-export/csv-exp/CMakeLists.txt
@@ -25,6 +25,10 @@ TARGET_LINK_LIBRARIES(gncmod-csv-export gncmod-register-gnome gncmod-register-co
TARGET_COMPILE_DEFINITIONS(gncmod-csv-export PRIVATE -DG_LOG_DOMAIN=\"gnc.export.csv\")
+IF (APPLE)
+ SET_TARGET_PROPERTIES (gncmod-csv-export PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash")
+ENDIF()
+
INSTALL(TARGETS gncmod-csv-export
LIBRARY DESTINATION lib/gnucash
ARCHIVE DESTINATION lib/gnucash
diff --git a/gnucash/import-export/csv-imp/CMakeLists.txt b/gnucash/import-export/csv-imp/CMakeLists.txt
index a8a719c..e2fbb5e 100644
--- a/gnucash/import-export/csv-imp/CMakeLists.txt
+++ b/gnucash/import-export/csv-imp/CMakeLists.txt
@@ -72,6 +72,10 @@ TARGET_INCLUDE_DIRECTORIES(gncmod-csv-import PRIVATE
${CMAKE_SOURCE_DIR}/borrowed/goffice
)
+IF (APPLE)
+ SET_TARGET_PROPERTIES (gncmod-csv-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash")
+ENDIF()
+
INSTALL(TARGETS gncmod-csv-import
LIBRARY DESTINATION lib/gnucash
ARCHIVE DESTINATION lib/gnucash
diff --git a/gnucash/import-export/customer-import/CMakeLists.txt b/gnucash/import-export/customer-import/CMakeLists.txt
index 014c641..f7e8255 100644
--- a/gnucash/import-export/customer-import/CMakeLists.txt
+++ b/gnucash/import-export/customer-import/CMakeLists.txt
@@ -30,6 +30,10 @@ TARGET_INCLUDE_DIRECTORIES(gncmod-customer-import
TARGET_COMPILE_DEFINITIONS(gncmod-customer-import PRIVATE -DG_LOG_DOMAIN=\"gnc.plugin.customer-import\")
+IF (APPLE)
+ SET_TARGET_PROPERTIES (gncmod-customer-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash")
+ENDIF()
+
INSTALL(TARGETS gncmod-customer-import
LIBRARY DESTINATION lib/gnucash
ARCHIVE DESTINATION lib/gnucash
diff --git a/gnucash/import-export/log-replay/CMakeLists.txt b/gnucash/import-export/log-replay/CMakeLists.txt
index b7ad96d..a0878b4 100644
--- a/gnucash/import-export/log-replay/CMakeLists.txt
+++ b/gnucash/import-export/log-replay/CMakeLists.txt
@@ -20,6 +20,10 @@ TARGET_LINK_LIBRARIES(gncmod-log-replay gncmod-gnome-utils gncmod-app-utils gncm
TARGET_COMPILE_DEFINITIONS(gncmod-log-replay PRIVATE -DG_LOG_DOMAIN=\"gnc.import.log-replay\")
+IF (APPLE)
+ SET_TARGET_PROPERTIES (gncmod-log-replay PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash")
+ENDIF()
+
INSTALL(TARGETS gncmod-log-replay
LIBRARY DESTINATION lib/gnucash
ARCHIVE DESTINATION lib/gnucash
diff --git a/gnucash/import-export/ofx/CMakeLists.txt b/gnucash/import-export/ofx/CMakeLists.txt
index 7a88499..5484412 100644
--- a/gnucash/import-export/ofx/CMakeLists.txt
+++ b/gnucash/import-export/ofx/CMakeLists.txt
@@ -29,6 +29,10 @@ IF (WITH_OFX)
TARGET_INCLUDE_DIRECTORIES(gncmod-ofx PRIVATE ${LIBOFX_INCLUDE_DIRS})
+IF (APPLE)
+ SET_TARGET_PROPERTIES (gncmod-ofx PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash")
+ENDIF()
+
INSTALL(TARGETS gncmod-ofx
LIBRARY DESTINATION lib/gnucash
ARCHIVE DESTINATION lib/gnucash
diff --git a/gnucash/import-export/qif-imp/CMakeLists.txt b/gnucash/import-export/qif-imp/CMakeLists.txt
index a26fb08..8334451 100644
--- a/gnucash/import-export/qif-imp/CMakeLists.txt
+++ b/gnucash/import-export/qif-imp/CMakeLists.txt
@@ -25,6 +25,10 @@ TARGET_LINK_LIBRARIES(gncmod-qif-import gncmod-app-utils gncmod-gnome-utils gnc-
TARGET_COMPILE_DEFINITIONS(gncmod-qif-import PRIVATE -DG_LOG_DOMAIN=\"gnc.import.qif.import\")
+IF (APPLE)
+ SET_TARGET_PROPERTIES (gncmod-qif-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash")
+ENDIF()
+
INSTALL(TARGETS gncmod-qif-import
LIBRARY DESTINATION lib/gnucash
ARCHIVE DESTINATION lib/gnucash
diff --git a/gnucash/import-export/qif/CMakeLists.txt b/gnucash/import-export/qif/CMakeLists.txt
index 7a2047a..ae0fa02 100644
--- a/gnucash/import-export/qif/CMakeLists.txt
+++ b/gnucash/import-export/qif/CMakeLists.txt
@@ -29,6 +29,10 @@ TARGET_LINK_LIBRARIES(gncmod-qif gncmod-generic-import gncmod-engine ${GLIB2_LDF
TARGET_COMPILE_DEFINITIONS(gncmod-qif PRIVATE -DG_LOG_DOMAIN=\"gnc.import.qif\")
+IF (APPLE)
+ SET_TARGET_PROPERTIES (gncmod-qif PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash")
+ENDIF()
+
INSTALL(TARGETS gncmod-qif
LIBRARY DESTINATION lib/gnucash
ARCHIVE DESTINATION lib/gnucash
diff --git a/gnucash/register/ledger-core/CMakeLists.txt b/gnucash/register/ledger-core/CMakeLists.txt
index df8a676..6a663bb 100644
--- a/gnucash/register/ledger-core/CMakeLists.txt
+++ b/gnucash/register/ledger-core/CMakeLists.txt
@@ -53,6 +53,10 @@ TARGET_INCLUDE_DIRECTORIES(gncmod-ledger-core
${CMAKE_BINARY_DIR}/gnucash/gnome-utils # for gnc-warnings.h
)
+IF (APPLE)
+ SET_TARGET_PROPERTIES (gncmod-ledger-core PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash")
+ENDIF()
+
INSTALL(TARGETS gncmod-ledger-core
LIBRARY DESTINATION lib/gnucash
ARCHIVE DESTINATION lib/gnucash
diff --git a/gnucash/register/register-core/CMakeLists.txt b/gnucash/register/register-core/CMakeLists.txt
index 6ab939f..a001646 100644
--- a/gnucash/register/register-core/CMakeLists.txt
+++ b/gnucash/register/register-core/CMakeLists.txt
@@ -51,6 +51,10 @@ TARGET_COMPILE_DEFINITIONS (gncmod-register-core PRIVATE -DG_LOG_DOMAIN=\"gnc.re
TARGET_INCLUDE_DIRECTORIES(gncmod-register-core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+IF (APPLE)
+ SET_TARGET_PROPERTIES (gncmod-register-core PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash")
+ENDIF()
+
INSTALL(TARGETS gncmod-register-core
LIBRARY DESTINATION lib/gnucash
ARCHIVE DESTINATION lib/gnucash
diff --git a/gnucash/register/register-gnome/CMakeLists.txt b/gnucash/register/register-gnome/CMakeLists.txt
index a3c17bb..2fa125a 100644
--- a/gnucash/register/register-gnome/CMakeLists.txt
+++ b/gnucash/register/register-gnome/CMakeLists.txt
@@ -53,6 +53,10 @@ TARGET_INCLUDE_DIRECTORIES(gncmod-register-gnome
PRIVATE ${CMAKE_SOURCE_DIR}/gnucash/register/ledger-core ${GTK3_INCLUDE_DIRS}
)
+IF (APPLE)
+ SET_TARGET_PROPERTIES (gncmod-register-gnome PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash")
+ENDIF()
+
INSTALL(TARGETS gncmod-register-gnome
LIBRARY DESTINATION lib/gnucash
ARCHIVE DESTINATION lib/gnucash
diff --git a/gnucash/report/locale-specific/us/CMakeLists.txt b/gnucash/report/locale-specific/us/CMakeLists.txt
index 41da7bd..6793bb5 100644
--- a/gnucash/report/locale-specific/us/CMakeLists.txt
+++ b/gnucash/report/locale-specific/us/CMakeLists.txt
@@ -12,6 +12,10 @@ TARGET_LINK_LIBRARIES(gncmod-locale-reports-us gnc-module gncmod-app-utils gncmo
TARGET_COMPILE_DEFINITIONS(gncmod-locale-reports-us PRIVATE -DG_LOG_DOMAIN=\"gnc.report.locale.us\")
+IF (APPLE)
+ SET_TARGET_PROPERTIES (gncmod-locale-reports-us PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash")
+ENDIF()
+
INSTALL(TARGETS gncmod-locale-reports-us
LIBRARY DESTINATION lib/gnucash
ARCHIVE DESTINATION lib/gnucash
diff --git a/gnucash/report/report-gnome/CMakeLists.txt b/gnucash/report/report-gnome/CMakeLists.txt
index 3df3aa9..ab4bc9a 100644
--- a/gnucash/report/report-gnome/CMakeLists.txt
+++ b/gnucash/report/report-gnome/CMakeLists.txt
@@ -36,6 +36,10 @@ TARGET_COMPILE_DEFINITIONS (gncmod-report-gnome PRIVATE -DG_LOG_DOMAIN=\"gnc.rep
TARGET_INCLUDE_DIRECTORIES(gncmod-report-gnome PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+IF (APPLE)
+ SET_TARGET_PROPERTIES (gncmod-report-gnome PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash")
+ENDIF()
+
INSTALL(TARGETS gncmod-report-gnome
LIBRARY DESTINATION lib/gnucash
ARCHIVE DESTINATION lib/gnucash
diff --git a/gnucash/report/report-system/CMakeLists.txt b/gnucash/report/report-system/CMakeLists.txt
index c6eec39..6f0bbef 100644
--- a/gnucash/report/report-system/CMakeLists.txt
+++ b/gnucash/report/report-system/CMakeLists.txt
@@ -32,6 +32,10 @@ TARGET_INCLUDE_DIRECTORIES (gncmod-report-system
)
+IF (APPLE)
+ SET_TARGET_PROPERTIES (gncmod-report-system PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash")
+ENDIF()
+
INSTALL(TARGETS gncmod-report-system
LIBRARY DESTINATION lib/gnucash
ARCHIVE DESTINATION lib/gnucash
diff --git a/gnucash/report/stylesheets/CMakeLists.txt b/gnucash/report/stylesheets/CMakeLists.txt
index bd0e89b..0964272 100644
--- a/gnucash/report/stylesheets/CMakeLists.txt
+++ b/gnucash/report/stylesheets/CMakeLists.txt
@@ -22,6 +22,10 @@ IF (WIN32)
ENDIF(WIN32)
+IF (APPLE)
+ SET_TARGET_PROPERTIES (gncmod-stylesheets PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash")
+ENDIF()
+
INSTALL(TARGETS gncmod-stylesheets
LIBRARY DESTINATION ${LIB_DIR}
ARCHIVE DESTINATION ${LIB_DIR}
diff --git a/libgnucash/app-utils/CMakeLists.txt b/libgnucash/app-utils/CMakeLists.txt
index 795ccea..3b2a312 100644
--- a/libgnucash/app-utils/CMakeLists.txt
+++ b/libgnucash/app-utils/CMakeLists.txt
@@ -99,6 +99,10 @@ TARGET_INCLUDE_DIRECTORIES (gncmod-app-utils
)
TARGET_COMPILE_DEFINITIONS (gncmod-app-utils PRIVATE -DG_LOG_DOMAIN=\"gnc.app-utils\")
+IF (APPLE)
+ SET_TARGET_PROPERTIES (gncmod-app-utils PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash")
+ENDIF()
+
INSTALL(TARGETS gncmod-app-utils
LIBRARY DESTINATION lib/gnucash
ARCHIVE DESTINATION lib/gnucash
@@ -116,6 +120,10 @@ IF (WITH_PYTHON)
)
TARGET_COMPILE_DEFINITIONS (gncmod-app-utils-python PRIVATE -DG_LOG_DOMAIN=\"gnc.app-utils\")
+ IF (APPLE)
+ SET_TARGET_PROPERTIES (gncmod-app-utils-python PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash")
+ ENDIF()
+
INSTALL(TARGETS gncmod-app-utils-python
LIBRARY DESTINATION lib/gnucash
ARCHIVE DESTINATION lib/gnucash
diff --git a/libgnucash/backend/dbi/CMakeLists.txt b/libgnucash/backend/dbi/CMakeLists.txt
index bedd23f..6c8dbdf 100644
--- a/libgnucash/backend/dbi/CMakeLists.txt
+++ b/libgnucash/backend/dbi/CMakeLists.txt
@@ -40,6 +40,10 @@ TARGET_COMPILE_DEFINITIONS(gncmod-backend-dbi PRIVATE -DG_LOG_DOMAIN=\"gnc.backe
TARGET_INCLUDE_DIRECTORIES(gncmod-backend-dbi PRIVATE ${LIBDBI_INCLUDE_PATH})
+IF (APPLE)
+ SET_TARGET_PROPERTIES (gncmod-backend-dbi PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash")
+ENDIF()
+
INSTALL(TARGETS gncmod-backend-dbi
LIBRARY DESTINATION lib/gnucash
ARCHIVE DESTINATION lib/gnucash
diff --git a/libgnucash/backend/xml/CMakeLists.txt b/libgnucash/backend/xml/CMakeLists.txt
index aafc4cd..4c3d8c9 100644
--- a/libgnucash/backend/xml/CMakeLists.txt
+++ b/libgnucash/backend/xml/CMakeLists.txt
@@ -115,6 +115,10 @@ IF (WIN32)
ENDIF(WIN32)
+IF (APPLE)
+ SET_TARGET_PROPERTIES (gncmod-backend-xml PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}")
+ENDIF()
+
INSTALL(TARGETS gncmod-backend-xml
LIBRARY DESTINATION ${LIB_DIR}
ARCHIVE DESTINATION ${LIB_DIR}
diff --git a/libgnucash/engine/CMakeLists.txt b/libgnucash/engine/CMakeLists.txt
index a3cd35b..1b2f626 100644
--- a/libgnucash/engine/CMakeLists.txt
+++ b/libgnucash/engine/CMakeLists.txt
@@ -248,6 +248,10 @@ TARGET_INCLUDE_DIRECTORIES (gncmod-engine
${CMAKE_SOURCE_DIR}/borrowed/libc # for strptime.h
)
+IF (APPLE)
+ SET_TARGET_PROPERTIES (gncmod-engine PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash")
+ENDIF()
+
INSTALL(TARGETS gncmod-engine
LIBRARY DESTINATION lib/gnucash
ARCHIVE DESTINATION lib/gnucash
diff --git a/libgnucash/tax/us/CMakeLists.txt b/libgnucash/tax/us/CMakeLists.txt
index 62aac51..c99f1b8 100644
--- a/libgnucash/tax/us/CMakeLists.txt
+++ b/libgnucash/tax/us/CMakeLists.txt
@@ -11,6 +11,10 @@ TARGET_LINK_LIBRARIES(gncmod-tax-us gnc-module ${GLIB2_LDFLAGS} ${GUILE_LDFLAGS}
TARGET_INCLUDE_DIRECTORIES(gncmod-tax-us
PRIVATE ${CMAKE_BINARY_DIR}/common ${GUILE_INCLUDE_DIRS})
+IF (APPLE)
+ SET_TARGET_PROPERTIES (gncmod-tax-us PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash")
+ENDIF()
+
INSTALL(TARGETS gncmod-tax-us
LIBRARY DESTINATION lib/gnucash
ARCHIVE DESTINATION lib/gnucash
commit 14eafd8a1dc5755494b4522acc7588af76a3456d
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Oct 14 14:26:04 2017 -0700
Build Macs with WebKit1.
Temporarily, I hope. Javascript isn't working with WebKit-2.16 but does
with WebKit 2.4.11 and I don't want to hold up releasing 2.7.0 any longer.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9265b6f..738b434 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,10 +177,10 @@ GNC_PKG_CHECK_MODULES (GTHREAD REQUIRED gthread-2.0>=2.20)
GNC_PKG_CHECK_MODULES (LIBXML2 REQUIRED libxml-2.0>=2.7.0)
GNC_PKG_CHECK_MODULES (LIBXSLT REQUIRED libxslt)
-IF (WIN32)
+IF (WIN32 OR APPLE)
GNC_PKG_CHECK_MODULES (WEBKIT REQUIRED webkitgtk-3.0)
SET(WEBKIT1 1)
-ELSE (WIN32)
+ELSE (WIN32 OR APPLE)
GNC_PKG_CHECK_MODULES (WEBKIT webkit2gtk-4.0)
IF (NOT WEBKIT_FOUND)
GNC_PKG_CHECK_MODULES (WEBKIT REQUIRED webkit2gtk-3.0)
@@ -188,7 +188,7 @@ ELSE (WIN32)
ELSE (NOT WEBKIT_FOUND)
SET(WEBKIT2_4 1)
ENDIF (NOT WEBKIT_FOUND)
-ENDIF (WIN32)
+ENDIF (WIN32 OR APPLE)
IF (WITH_GNUCASH)
GNC_PKG_CHECK_MODULES (GTK3 REQUIRED gtk+-3.0>=3.10.0)
commit 281421d5cfe4c2e36620f61a48d579ebccbdef5c
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Oct 14 14:18:07 2017 -0700
HTML: Connect to load-failed and resource-load signals.
Useful diagnostics for reports not drawing.
diff --git a/gnucash/html/gnc-html-webkit1.c b/gnucash/html/gnc-html-webkit1.c
index eb0ec52..565d647 100644
--- a/gnucash/html/gnc-html-webkit1.c
+++ b/gnucash/html/gnc-html-webkit1.c
@@ -88,6 +88,13 @@ static WebKitNavigationResponse webkit_navigation_requested_cb(
WebKitWebFrame* frame,
WebKitNetworkRequest* request,
gpointer user_data );
+static gboolean webkit_on_load_error (WebKitWebView *web_view,
+ WebKitWebFrame *web_frame, gchar *uri,
+ GError *error, gpointer data);
+static void webkit_resource_load_error (WebKitWebView *web_view,
+ WebKitWebFrame *web_frame,
+ WebKitWebResource *resource,
+ GError *error, gpointer data);
static void webkit_on_url_cb( WebKitWebView* web_view, gchar* title, gchar* url,
gpointer data );
static gchar* handle_embedded_object( GncHtmlWebkit* self, gchar* html_str );
@@ -189,6 +196,13 @@ gnc_html_webkit_init( GncHtmlWebkit* self )
G_CALLBACK(gnc_html_submit_cb),
self);
#endif
+ g_signal_connect (priv->web_view, "load-error",
+ G_CALLBACK (webkit_on_load_error),
+ self);
+
+ g_signal_connect (priv->web_view, "resource-load-failed",
+ G_CALLBACK (webkit_resource_load_error),
+ self);
gnc_prefs_register_cb (GNC_PREFS_GROUP_GENERAL_REPORT,
GNC_PREF_RPT_DFLT_ZOOM,
@@ -621,6 +635,25 @@ webkit_navigation_requested_cb( WebKitWebView* web_view, WebKitWebFrame* frame,
return WEBKIT_NAVIGATION_RESPONSE_IGNORE;
}
+static gboolean
+webkit_on_load_error (WebKitWebView *web_view, WebKitWebFrame *web_frame,
+ gchar *uri, GError *error, gpointer data)
+{
+ PERR ("WebKit load of %s failed due to %s\n", uri, error->message);
+ return FALSE;
+}
+
+static void
+webkit_resource_load_error (WebKitWebView *web_view, WebKitWebFrame *web_frame,
+ WebKitWebResource *resource, GError *error,
+ gpointer data)
+{
+ const gchar *uri = webkit_web_resource_get_uri (resource);
+ const gchar *type = webkit_web_resource_get_mime_type (resource);
+ PERR ("WebKit load of resource %s, type %s, failed due to %s\n",
+ uri, type, error->message);
+}
+
#if 0
/********************************************************************
* gnc_html_object_requested_cb - called when an applet needs to be
diff --git a/gnucash/html/gnc-html-webkit2.c b/gnucash/html/gnc-html-webkit2.c
index 502032e..abd402b 100644
--- a/gnucash/html/gnc-html-webkit2.c
+++ b/gnucash/html/gnc-html-webkit2.c
@@ -107,6 +107,10 @@ static gboolean webkit_load_failed_cb (WebKitWebView *web_view,
WebKitLoadEvent event,
gchar *uri, GError *error,
gpointer user_data);
+static void webkit_resource_load_started_cb (WebKitWebView *web_view,
+ WebKitWebResource *resource,
+ WebKitURIRequest *request,
+ gpointer data);
static gchar* handle_embedded_object( GncHtmlWebkit* self, gchar* html_str );
static void impl_webkit_show_url( GncHtml* self, URLType type,
const gchar* location, const gchar* label,
@@ -207,9 +211,11 @@ gnc_html_webkit_init( GncHtmlWebkit* self )
#endif
g_signal_connect (priv->web_view, "load-failed",
- G_CALLBACK (webkit_load_failed_cb),
- self);
-
+ G_CALLBACK (webkit_load_failed_cb),
+ self);
+ g_signal_connect (priv->web_view, "resource-load-started",
+ G_CALLBACK (webkit_resource_load_started_cb),
+ self);
gnc_prefs_register_cb (GNC_PREFS_GROUP_GENERAL_REPORT,
GNC_PREF_RPT_DFLT_ZOOM,
impl_webkit_default_zoom_changed,
@@ -691,13 +697,43 @@ webkit_notification_cb (WebKitWebView* web_view, WebKitNotification *note,
static gboolean
webkit_load_failed_cb (WebKitWebView *web_view, WebKitLoadEvent event,
- gchar *uri, GError *error, gpointer user_data)
+ gchar *uri, GError *error, gpointer user_data)
{
- char *msg = g_strdup_printf ("Failed to load %s: %s", uri, error->message);
- webkit_web_view_load_plain_text(web_view, msg);
- g_free (msg);
+ PERR ("WebKit load of %s failed due to %s\n", uri, error->message);
return FALSE;
}
+static void
+webkit_resource_load_failed_cb (WebKitWebResource *resource,
+ GError *error,
+ gpointer data)
+{
+ WebKitURIResponse *response = webkit_web_resource_get_response (resource);
+ const gchar * uri = webkit_web_resource_get_uri (resource);
+ PERR ("Load of resource at %s failed with error %s and status code %d.\n",
+ uri, error->message, webkit_uri_response_get_status_code (response));
+}
+
+static void
+webkit_resource_load_finished_cb (WebKitWebResource *resource, gpointer data)
+{
+ DEBUG ("Load of resource %s completed.\n", webkit_web_resource_get_uri(resource));
+}
+
+static void
+webkit_resource_load_started_cb (WebKitWebView *web_view,
+ WebKitWebResource *resource,
+ WebKitURIRequest *request,
+ gpointer data)
+{
+ DEBUG ("Load of resource %s begun.\n", webkit_web_resource_get_uri(resource));
+ g_signal_connect (resource, "failed",
+ G_CALLBACK (webkit_resource_load_failed_cb),
+ data);
+ g_signal_connect (resource, "finished",
+ G_CALLBACK (webkit_resource_load_finished_cb),
+ data);
+}
+
/********************************************************************
* gnc_html_open_scm
* insert some scheme-generated HTML
commit 97b09b5df500b036acc32ed5f03cd7088dccbde3
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Oct 13 14:30:46 2017 -0700
Fix html temp-file URI.
The file path must start with a / anyway so we were getting URIs that
looked like "file:////foo/bar".
diff --git a/gnucash/html/gnc-html-webkit1.c b/gnucash/html/gnc-html-webkit1.c
index b7b1570..eb0ec52 100644
--- a/gnucash/html/gnc-html-webkit1.c
+++ b/gnucash/html/gnc-html-webkit1.c
@@ -764,7 +764,7 @@ impl_webkit_show_data( GncHtml* self, const gchar* data, int datalen )
fd = g_mkstemp( filename );
impl_webkit_export_to_file( self, filename );
close( fd );
- uri = g_strdup_printf( "file:///%s", filename );
+ uri = g_strdup_printf( "file://%s", filename );
g_free(filename);
DEBUG("Loading uri '%s'", uri);
webkit_web_view_load_uri( priv->web_view, uri );
diff --git a/gnucash/html/gnc-html-webkit2.c b/gnucash/html/gnc-html-webkit2.c
index a5ae409..502032e 100644
--- a/gnucash/html/gnc-html-webkit2.c
+++ b/gnucash/html/gnc-html-webkit2.c
@@ -742,7 +742,7 @@ impl_webkit_show_data( GncHtml* self, const gchar* data, int datalen )
fd = g_mkstemp( filename );
impl_webkit_export_to_file( self, filename );
close( fd );
- uri = g_strdup_printf( "file:///%s", filename );
+ uri = g_strdup_printf( "file://%s", filename );
g_free(filename);
DEBUG("Loading uri '%s'", uri);
webkit_web_view_load_uri( priv->web_view, uri );
commit 789a28dd5b0b6634566d21f4084555a9794f62e8
Author: fell <frank.h.ellenberger at gmail.com>
Date: Wed Oct 11 22:38:09 2017 +0200
reapply commit 3cdac65 on the new dialog-ab-pref and remove obsolete
section from dialog-ab.gade
diff --git a/gnucash/import-export/aqb/dialog-ab-pref.glade b/gnucash/import-export/aqb/dialog-ab-pref.glade
index 53dbb3e..1860d3e 100644
--- a/gnucash/import-export/aqb/dialog-ab-pref.glade
+++ b/gnucash/import-export/aqb/dialog-ab-pref.glade
@@ -29,6 +29,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">If active, the window will be closed automatically when you finish the HBCI/AqBanking import process. Otherwise it will stay open.</property>
+ <property name="tooltip_text" translatable="yes">If active, the window will be closed automatically when you finish the HBCI/AqBanking import process. Otherwise it will stay open.</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
<property name="use_underline">True</property>
@@ -41,10 +44,13 @@
</child>
<child>
<object class="GtkCheckButton" id="pref/dialogs.import.hbci/remember-pin">
- <property name="label" translatable="yes">Remember _PIN</property>
+ <property name="label" translatable="yes">Remember the _PIN in memory</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">If active, the PIN for HBCI/AqBanking actions will be remembered in memory during a session. Otherwise it will have to be entered again each time during a session when it is needed.</property>
+ <property name="tooltip_text" translatable="yes">If active, the PIN for HBCI/AqBanking actions will be remembered in memory during a session. Otherwise it will have to be entered again each time during a session when it is needed.</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
<property name="use_underline">True</property>
@@ -61,6 +67,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Enables verbose debug messages for HBCI/AqBanking Online Banking.</property>
+ <property name="tooltip_text" translatable="yes">Enables verbose debug messages for HBCI/AqBanking Online Banking.</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
<property name="use_underline">True</property>
@@ -76,7 +85,9 @@
<property name="label" translatable="yes">Use Non-SWIFT _transaction text</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Some banks place part of transaction description as "transaction text" in the MT940 file. Normally GNUcash ignores this text. However by activating this option, the transaction text is used for the transaction description too.</property>
+ <property name="tooltip_text" translatable="yes">Some banks place part of transaction description as "transaction text" in the MT940 file. Normally GNUcash ignores this text. However by activating this option, the transaction text is used for the transaction description too.</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
<property name="use_underline">True</property>
diff --git a/gnucash/import-export/aqb/dialog-ab.glade b/gnucash/import-export/aqb/dialog-ab.glade
index 51b9d52..b17e235 100644
--- a/gnucash/import-export/aqb/dialog-ab.glade
+++ b/gnucash/import-export/aqb/dialog-ab.glade
@@ -793,121 +793,6 @@
<action-widget response="-5">okbutton2</action-widget>
</action-widgets>
</object>
- <object class="GtkWindow" id="aqbanking_preferences">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="title" translatable="yes">window1</property>
- <child>
- <object class="GtkTable" id="aqbanking_prefs">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="n_rows">4</property>
- <property name="n_columns">4</property>
- <child>
- <object class="GtkLabel" id="label8877457">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Online Banking</b></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="right_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="pref/dialogs.import.hbci/close-on-finish">
- <property name="label" translatable="yes">_Close log window when finished</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup">If active, the window will be closed automatically when you finish the HBCI/AqBanking import process. Otherwise it will stay open.</property>
- <property name="tooltip_text" translatable="yes">If active, the window will be closed automatically when you finish the HBCI/AqBanking import process. Otherwise it will stay open.</property>
- <property name="use_action_appearance">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="x_padding">12</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="pref/dialogs.import.hbci/remember-pin">
- <property name="label" translatable="yes">Remember the _PIN in memory</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup">If active, the PIN for HBCI/AqBanking actions will be remembered in memory during a session. Otherwise it will have to be entered again each time during a session when it is needed.</property>
- <property name="tooltip_text" translatable="yes">If active, the PIN for HBCI/AqBanking actions will be remembered in memory during a session. Otherwise it will have to be entered again each time during a session when it is needed.</property>
- <property name="use_action_appearance">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="right_attach">4</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="x_padding">12</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="pref/dialogs.import.hbci/use-ns-transaction-text">
- <property name="label" translatable="yes">Use Non-SWIFT _transaction text</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup">Some banks place part of transaction description as "transaction text" in the MT940 file. Normally GNUcash ignores this text. However by activating this option, the transaction text is used for the transaction description too.</property>
- <property name="tooltip_text" translatable="yes">Some banks place part of transaction description as "transaction text" in the MT940 file. Normally GNUcash ignores this text. However by activating this option, the transaction text is used for the transaction description too.</property>
- <property name="use_action_appearance">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="right_attach">4</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="x_padding">12</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton3">
- <property name="label" translatable="yes">_Verbose debug messages</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup">Enables verbose debug messages for HBCI/AqBanking Online Banking.</property>
- <property name="tooltip_text" translatable="yes">Enables verbose debug messages for HBCI/AqBanking Online Banking.</property>
- <property name="use_action_appearance">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="right_attach">4</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="x_padding">12</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
<object class="GtkDialog" id="aqbanking_template_name_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
commit 9e92cc2ec620f211f1d06ac4cdb7448fbcf3d256
Merge: 9472e93 3cdac65
Author: fell <frank.h.ellenberger at gmail.com>
Date: Fri Oct 6 20:42:22 2017 +0200
Merge branch 'maint' into unstable
diff --cc gnucash/import-export/aqb/dialog-ab.glade
index a331f28,0000000..51b9d52
mode 100644,000000..100644
--- a/gnucash/import-export/aqb/dialog-ab.glade
+++ b/gnucash/import-export/aqb/dialog-ab.glade
@@@ -1,1891 -1,0 +1,1906 @@@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <object class="GtkDialog" id="aqbanking_connection_dialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Online Banking Connection Window</property>
+ <property name="default_width">350</property>
+ <property name="default_height">420</property>
+ <property name="type_hint">dialog</property>
+ <signal name="delete-event" handler="ggg_delete_event_cb" swapped="no"/>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="abort_button">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="ggg_abort_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="close_button">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="ggg_close_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox149">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="spacing">18</property>
+ <child>
+ <object class="GtkVBox" id="vbox160">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label8877443">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>Progress</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkTable" id="entries_table">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label8877424">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Current Job</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="top_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkProgressBar" id="top_progress">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="pulse_step">0.10000000149</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label8877426">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Progress</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label8877425">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Current Action</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="second_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox162">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label8877444">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>Log Messages</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow30">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTextView" id="log_text">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">False</property>
+ <property name="wrap_mode">word</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="close_checkbutton">
+ <property name="label" translatable="yes">Close when finished</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="ggg_close_toggled_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">abort_button</action-widget>
+ <action-widget response="0">close_button</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="aqbanking_date_range_dialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Get Transactions Online</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="cancel_button1">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="ok_button">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox152">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="spacing">18</property>
+ <child>
+ <object class="GtkLabel" id="heading_label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Date range of transactions to retrieve:</property>
+ <property name="justify">center</property>
+ <property name="wrap">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox163">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label8877445">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>From</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox164">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkRadioButton" id="first_button">
+ <property name="label" translatable="yes">_Earliest possible date</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="last_retrieval_button">
+ <property name="label" translatable="yes">_Last retrieval date</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">first_button</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox123">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkRadioButton" id="enter_from_button">
+ <property name="label" translatable="yes">E_nter date:</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">first_button</property>
+ <signal name="toggled" handler="ddr_toggled_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="enter_from_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox165">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label8877446">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>To</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox166">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkRadioButton" id="now_button">
+ <property name="label" translatable="yes">_Now</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox124">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkRadioButton" id="enter_to_button">
+ <property name="label" translatable="yes">Ente_r date:</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">now_button</property>
+ <signal name="toggled" handler="ddr_toggled_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="enter_to_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">cancel_button1</action-widget>
+ <action-widget response="-5">ok_button</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="aqbanking_password_dialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Enter Password</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="cancelbutton2">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="okbutton2">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox167">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="spacing">18</property>
+ <child>
+ <object class="GtkLabel" id="heading_pw_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Enter your password</property>
+ <property name="wrap">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="table7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label8877456">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Password:</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="confirm_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Confirm Password:</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="input_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="confirm_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="remember_pin">
- <property name="label" translatable="yes">Remember _PIN</property>
++ <property name="label" translatable="yes">Remember the _PIN in memory</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
++ <property name="has_tooltip">True</property>
++ <property name="tooltip_markup">If active, the PIN for HBCI/AqBanking actions will be remembered in memory during a session. Otherwise it will have to be entered again each time during a session when it is needed.</property>
++ <property name="tooltip_text" translatable="yes">If active, the PIN for HBCI/AqBanking actions will be remembered in memory during a session. Otherwise it will have to be entered again each time during a session when it is needed.</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">cancelbutton2</action-widget>
+ <action-widget response="-5">okbutton2</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkWindow" id="aqbanking_preferences">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">window1</property>
+ <child>
+ <object class="GtkTable" id="aqbanking_prefs">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">4</property>
+ <property name="n_columns">4</property>
+ <child>
+ <object class="GtkLabel" id="label8877457">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>Online Banking</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="right_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="pref/dialogs.import.hbci/close-on-finish">
+ <property name="label" translatable="yes">_Close log window when finished</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
++ <property name="has_tooltip">True</property>
++ <property name="tooltip_markup">If active, the window will be closed automatically when you finish the HBCI/AqBanking import process. Otherwise it will stay open.</property>
++ <property name="tooltip_text" translatable="yes">If active, the window will be closed automatically when you finish the HBCI/AqBanking import process. Otherwise it will stay open.</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ <property name="x_padding">12</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="pref/dialogs.import.hbci/remember-pin">
- <property name="label" translatable="yes">Remember _PIN</property>
++ <property name="label" translatable="yes">Remember the _PIN in memory</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
++ <property name="has_tooltip">True</property>
++ <property name="tooltip_markup">If active, the PIN for HBCI/AqBanking actions will be remembered in memory during a session. Otherwise it will have to be entered again each time during a session when it is needed.</property>
++ <property name="tooltip_text" translatable="yes">If active, the PIN for HBCI/AqBanking actions will be remembered in memory during a session. Otherwise it will have to be entered again each time during a session when it is needed.</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="right_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ <property name="x_padding">12</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="pref/dialogs.import.hbci/use-ns-transaction-text">
+ <property name="label" translatable="yes">Use Non-SWIFT _transaction text</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
++ <property name="has_tooltip">True</property>
++ <property name="tooltip_markup">Some banks place part of transaction description as "transaction text" in the MT940 file. Normally GNUcash ignores this text. However by activating this option, the transaction text is used for the transaction description too.</property>
++ <property name="tooltip_text" translatable="yes">Some banks place part of transaction description as "transaction text" in the MT940 file. Normally GNUcash ignores this text. However by activating this option, the transaction text is used for the transaction description too.</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="right_attach">4</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ <property name="x_padding">12</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton3">
+ <property name="label" translatable="yes">_Verbose debug messages</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
++ <property name="has_tooltip">True</property>
++ <property name="tooltip_markup">Enables verbose debug messages for HBCI/AqBanking Online Banking.</property>
++ <property name="tooltip_text" translatable="yes">Enables verbose debug messages for HBCI/AqBanking Online Banking.</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="right_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ <property name="x_padding">12</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <object class="GtkDialog" id="aqbanking_template_name_dialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Name for new template</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="cancelbutton1">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="okbutton1">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox159">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label8877450">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Enter name for new template:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="template_name">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="max_length">250</property>
+ <property name="invisible_char">â—</property>
+ <property name="activates_default">True</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">cancelbutton1</action-widget>
+ <action-widget response="-5">okbutton1</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="aqbanking_transaction_dialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Online Transaction</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="trans_vbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <child>
+ <object class="GtkLabel" id="heading_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Enter an Online Transaction</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="table6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">21</property>
+ <property name="n_columns">3</property>
+ <child>
+ <object class="GtkEntry" id="recp_account_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="max_length">12</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <signal name="changed" handler="gnc_ab_trans_dialog_verify_values" swapped="yes"/>
+ <signal name="insert-text" handler="gnc_ab_trans_dialog_ibanentry_filter_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="recp_account_heading">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Recipient Account Number</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="recp_bankcode_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="max_length">8</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <signal name="changed" handler="gnc_ab_trans_dialog_bankcode_changed_cb" swapped="no"/>
+ <signal name="insert-text" handler="gnc_ab_trans_dialog_bicentry_filter_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="recp_bankcode_heading">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Recipient Bank Code</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="recp_name_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="max_length">27</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <signal name="changed" handler="gnc_ab_trans_dialog_verify_values" swapped="yes"/>
+ </object>
+ <packing>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="recp_name_heading">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Recipient Name</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="recp_bankname_heading">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">at Bank</property>
+ </object>
+ <packing>
+ <property name="right_attach">3</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="recp_bankname_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">(filled in automatically)</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="right_attach">3</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label8877434">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Amount</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label8877433">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Payment Purpose (only for recipient)</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="right_attach">3</property>
+ <property name="top_attach">10</property>
+ <property name="bottom_attach">11</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label8877435">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Payment Purpose continued</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="right_attach">3</property>
+ <property name="top_attach">12</property>
+ <property name="bottom_attach">13</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="orig_name_heading">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Originator Name</property>
+ </object>
+ <packing>
+ <property name="top_attach">15</property>
+ <property name="bottom_attach">16</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="orig_name_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="max_length">54</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ </object>
+ <packing>
+ <property name="top_attach">16</property>
+ <property name="bottom_attach">17</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="orig_bankname_heading">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">at Bank</property>
+ </object>
+ <packing>
+ <property name="top_attach">17</property>
+ <property name="bottom_attach">18</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="orig_bankname_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">something</property>
+ </object>
+ <packing>
+ <property name="top_attach">18</property>
+ <property name="bottom_attach">19</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="orig_account_heading">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Originator Account Number</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">15</property>
+ <property name="bottom_attach">16</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="orig_account_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">something</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">16</property>
+ <property name="bottom_attach">17</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="orig_bankcode_heading">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Bank Code</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">17</property>
+ <property name="bottom_attach">18</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="orig_bankcode_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">something</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">18</property>
+ <property name="bottom_attach">19</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="purpose_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="max_length">27</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <signal name="changed" handler="gnc_ab_trans_dialog_verify_values" swapped="yes"/>
+ </object>
+ <packing>
+ <property name="top_attach">11</property>
+ <property name="bottom_attach">12</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="purpose_cont2_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="max_length">27</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <signal name="changed" handler="gnc_ab_trans_dialog_verify_values" swapped="yes"/>
+ </object>
+ <packing>
+ <property name="top_attach">13</property>
+ <property name="bottom_attach">14</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="purpose_cont_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="max_length">27</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <signal name="changed" handler="gnc_ab_trans_dialog_verify_values" swapped="yes"/>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">11</property>
+ <property name="bottom_attach">12</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="purpose_cont3_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="max_length">27</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <signal name="changed" handler="gnc_ab_trans_dialog_verify_values" swapped="yes"/>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">13</property>
+ <property name="bottom_attach">14</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="amount_hbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHSeparator" id="hseparator8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="right_attach">3</property>
+ <property name="top_attach">19</property>
+ <property name="bottom_attach">20</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ <property name="y_padding">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHSeparator" id="hseparator4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="right_attach">3</property>
+ <property name="top_attach">14</property>
+ <property name="bottom_attach">15</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHSeparator" id="hseparator5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="right_attach">3</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ <property name="y_padding">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHSeparator" id="hseparator6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="right_attach">3</property>
+ <property name="top_attach">9</property>
+ <property name="bottom_attach">10</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkExpander" id="expander1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox117">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <object class="GtkVButtonBox" id="vbutonbox158">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkButton" id="add_templ_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Add the current online transaction as a new transaction template</property>
+ <property name="tooltip_text" translatable="yes">Add the current online transaction as a new transaction template</property>
+ <property name="use_action_appearance">False</property>
+ <signal name="clicked" handler="gnc_ab_trans_dialog_add_templ_cb" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox119">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-add</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label8877451">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Add current</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="moveup_templ_button">
+ <property name="label">gtk-go-up</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Move the selected transaction template one row up</property>
+ <property name="tooltip_text" translatable="yes">Move the selected transaction template one row up</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="gnc_ab_trans_dialog_moveup_templ_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="movedown_templ_button">
+ <property name="label">gtk-go-down</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Move the selected transaction template one row down</property>
+ <property name="tooltip_text" translatable="yes">Move the selected transaction template one row down</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="gnc_ab_trans_dialog_movedown_templ_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="sort_templ_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Sort the list of transaction templates alphabetically</property>
+ <property name="tooltip_text" translatable="yes">Sort the list of transaction templates alphabetically</property>
+ <property name="use_action_appearance">False</property>
+ <signal name="clicked" handler="gnc_ab_trans_dialog_sort_templ_cb" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox120">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-sort-ascending</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label8877452">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Sort</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="del_templ_button">
+ <property name="label">gtk-delete</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Delete the currently selected transaction template</property>
+ <property name="tooltip_text" translatable="yes">Delete the currently selected transaction template</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="gnc_ab_trans_dialog_del_templ_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="template_scrolledwindow">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="template_list">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ <property name="rules_hint">True</property>
+ <signal name="row-activated" handler="gnc_ab_trans_dialog_templ_list_row_activated_cb" swapped="no"/>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Templates</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHSeparator" id="hseparator7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="exec_later_button">
+ <property name="label" translatable="yes">Execute later (unimpl.)</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="exec_now_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Execute this online transaction now</property>
+ <property name="tooltip_text" translatable="yes">Execute this online transaction now</property>
+ <property name="use_action_appearance">False</property>
+ <child>
+ <object class="GtkAlignment" id="alignment6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox122">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-execute</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label8877454">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Execute Now</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-9">exec_later_button</action-widget>
+ <action-widget response="-6">cancel_button</action-widget>
+ <action-widget response="-8">exec_now_button</action-widget>
+ </action-widgets>
+ </object>
+</interface>
+
commit 3cdac65d49999a3b7845e22ac8eb66b824108aac
Author: fell <frank.h.ellenberger at gmail.com>
Date: Fri Oct 6 20:17:12 2017 +0200
Use descriptions from gschema as tooltips in Preferences Aqbanking
Inspired by Finster
https://lists.gnucash.org/logs/2017/10/05.html#T06:42:38
diff --git a/src/import-export/aqb/dialog-ab.glade b/src/import-export/aqb/dialog-ab.glade
index b5c4ee3..51d5d74 100644
--- a/src/import-export/aqb/dialog-ab.glade
+++ b/src/import-export/aqb/dialog-ab.glade
@@ -753,10 +753,13 @@
</child>
<child>
<object class="GtkCheckButton" id="remember_pin">
- <property name="label" translatable="yes">Remember _PIN</property>
+ <property name="label" translatable="yes">Remember the _PIN in memory</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">If active, the PIN for HBCI/AqBanking actions will be remembered in memory during a session. Otherwise it will have to be entered again each time during a session when it is needed.</property>
+ <property name="tooltip_text" translatable="yes">If active, the PIN for HBCI/AqBanking actions will be remembered in memory during a session. Otherwise it will have to be entered again each time during a session when it is needed.</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
@@ -820,6 +823,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">If active, the window will be closed automatically when you finish the HBCI/AqBanking import process. Otherwise it will stay open.</property>
+ <property name="tooltip_text" translatable="yes">If active, the window will be closed automatically when you finish the HBCI/AqBanking import process. Otherwise it will stay open.</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
@@ -835,10 +841,13 @@
</child>
<child>
<object class="GtkCheckButton" id="pref/dialogs.import.hbci/remember-pin">
- <property name="label" translatable="yes">Remember _PIN</property>
+ <property name="label" translatable="yes">Remember the _PIN in memory</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">If active, the PIN for HBCI/AqBanking actions will be remembered in memory during a session. Otherwise it will have to be entered again each time during a session when it is needed.</property>
+ <property name="tooltip_text" translatable="yes">If active, the PIN for HBCI/AqBanking actions will be remembered in memory during a session. Otherwise it will have to be entered again each time during a session when it is needed.</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
@@ -858,6 +867,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Some banks place part of transaction description as "transaction text" in the MT940 file. Normally GNUcash ignores this text. However by activating this option, the transaction text is used for the transaction description too.</property>
+ <property name="tooltip_text" translatable="yes">Some banks place part of transaction description as "transaction text" in the MT940 file. Normally GNUcash ignores this text. However by activating this option, the transaction text is used for the transaction description too.</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
@@ -877,6 +889,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Enables verbose debug messages for HBCI/AqBanking Online Banking.</property>
+ <property name="tooltip_text" translatable="yes">Enables verbose debug messages for HBCI/AqBanking Online Banking.</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
Summary of changes:
CMakeLists.txt | 9 +-
ChangeLog | 374 ++++++++++++++++++++-
NEWS | 121 ++++---
borrowed/gwengui-gtk3/CMakeLists.txt | 1 +
gnucash/gnome-search/CMakeLists.txt | 4 +
gnucash/gnome-utils/CMakeLists.txt | 4 +
gnucash/gnome/gtkbuilder/dialog-find-account.glade | 2 +-
gnucash/html/CMakeLists.txt | 4 +
gnucash/html/gnc-html-webkit1.c | 37 ++
gnucash/html/gnc-html-webkit2.c | 52 ++-
gnucash/import-export/CMakeLists.txt | 4 +
gnucash/import-export/aqb/CMakeLists.txt | 4 +
gnucash/import-export/aqb/dialog-ab-pref.glade | 15 +-
gnucash/import-export/aqb/dialog-ab-trans.c | 4 +-
gnucash/import-export/aqb/dialog-ab.glade | 108 +-----
gnucash/import-export/aqb/gnc-ab-transfer.c | 3 +-
gnucash/import-export/aqb/gnc-ab-utils.c | 14 +-
gnucash/import-export/aqb/gnc-ab-utils.h | 4 +-
gnucash/import-export/bi-import/CMakeLists.txt | 4 +
gnucash/import-export/csv-exp/CMakeLists.txt | 4 +
gnucash/import-export/csv-imp/CMakeLists.txt | 4 +
.../import-export/customer-import/CMakeLists.txt | 4 +
gnucash/import-export/log-replay/CMakeLists.txt | 4 +
gnucash/import-export/ofx/CMakeLists.txt | 4 +
gnucash/import-export/qif-imp/CMakeLists.txt | 4 +
gnucash/import-export/qif/CMakeLists.txt | 4 +
gnucash/register/ledger-core/CMakeLists.txt | 4 +
gnucash/register/register-core/CMakeLists.txt | 4 +
gnucash/register/register-gnome/CMakeLists.txt | 4 +
gnucash/report/locale-specific/us/CMakeLists.txt | 4 +
gnucash/report/report-gnome/CMakeLists.txt | 4 +
gnucash/report/report-system/CMakeLists.txt | 4 +
gnucash/report/stylesheets/CMakeLists.txt | 4 +
libgnucash/app-utils/CMakeLists.txt | 8 +
libgnucash/backend/dbi/CMakeLists.txt | 4 +
libgnucash/backend/xml/CMakeLists.txt | 4 +
libgnucash/engine/CMakeLists.txt | 4 +
libgnucash/tax/us/CMakeLists.txt | 4 +
po/lv.po | 2 +-
39 files changed, 666 insertions(+), 184 deletions(-)
More information about the gnucash-changes
mailing list