gnucash master: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Sun Apr 19 15:23:52 EDT 2020
Updated via https://github.com/Gnucash/gnucash/commit/0cfb40ef (commit)
via https://github.com/Gnucash/gnucash/commit/261bff12 (commit)
via https://github.com/Gnucash/gnucash/commit/9d960970 (commit)
via https://github.com/Gnucash/gnucash/commit/954c1a00 (commit)
via https://github.com/Gnucash/gnucash/commit/6cedd0d7 (commit)
from https://github.com/Gnucash/gnucash/commit/a392190a (commit)
commit 0cfb40efeba7db45a91086cf509c3ed289becce1
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sun Apr 19 19:33:07 2020 +0200
CMake - use configure_file instead of file(COPY ) wherever possible
file(COPY ) will only trigger when the destination file doesn't exist yet.
It won't retrigger on source file changes.
configure_file on the other hand will. To avoid unwanted substitution
attempts this can be invoked with the COPYONLY keyword.
Disadvantage of configure_file is that it will only take one
input file where file(COPY ) can operate on a list of files.
As such the configure_file statement has to be wrapped in a foreach.
A few uses of file(COPY ) can't be replaced as they are setting
file permissions. And the one in make_dist has been kept as that
always operates on an empty directory, hence copying is guaranteed.
The former will monitor the file for updates and copy it again
the latter will only copy the file if it doesn't exist in the destination yet
diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
index 225a04e92..b41f5a215 100644
--- a/bindings/python/CMakeLists.txt
+++ b/bindings/python/CMakeLists.txt
@@ -102,7 +102,9 @@ if(WITH_PYTHON)
DESTINATION ${PYTHON_SYSCONFIG_OUTPUT}/gnucash
)
- file(COPY ${PYEXEC_FILES} DESTINATION ${PYTHON_SYSCONFIG_BUILD}/gnucash)
+ foreach(PYEXEC_FILE ${PYEXEC_FILES})
+ configure_file(${PYEXEC_FILE} ${PYTHON_SYSCONFIG_BUILD}/gnucash/${PYEXEC_FILE} COPYONLY)
+ endforeach()
add_custom_target(gnucash-core-c-py ALL
COMMAND ${CMAKE_COMMAND} -E copy ${SWIG_GNUCASH_CORE_PY} ${PYTHON_SYSCONFIG_BUILD}/gnucash
diff --git a/cmake/configure-manpage.cmake b/cmake/configure-manpage.cmake
index fbef1dda8..4dd414498 100644
--- a/cmake/configure-manpage.cmake
+++ b/cmake/configure-manpage.cmake
@@ -13,5 +13,4 @@
include (${SRC_DIR}/cmake/version-info2env.cmake)
versioninfo2env (${VCS_INFO_FILE})
configure_file(${SRC} ${DST} )
-file(COPY gnucash.1
-DESTINATION ${DATADIR_BUILD}/gnucash)
+configure_file(gnucash.1 ${DATADIR_BUILD}/gnucash/gnucash.1 COPYONLY)
diff --git a/data/accounts/C/CMakeLists.txt b/data/accounts/C/CMakeLists.txt
index 7dda269ae..236187036 100644
--- a/data/accounts/C/CMakeLists.txt
+++ b/data/accounts/C/CMakeLists.txt
@@ -21,5 +21,7 @@ set(account_DATA
set_dist_list(C_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/C)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/C)
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/C/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/ca/CMakeLists.txt b/data/accounts/ca/CMakeLists.txt
index 4c0986d51..f1e0c0356 100644
--- a/data/accounts/ca/CMakeLists.txt
+++ b/data/accounts/ca/CMakeLists.txt
@@ -18,4 +18,7 @@ set(account_DATA
set_dist_list(CA_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/ca)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/ca)
+
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/ca/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/cs/CMakeLists.txt b/data/accounts/cs/CMakeLists.txt
index 5d8586e1b..7150fca37 100644
--- a/data/accounts/cs/CMakeLists.txt
+++ b/data/accounts/cs/CMakeLists.txt
@@ -18,4 +18,7 @@ set(account_DATA
set_dist_list(CS_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/cs)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/cs)
+
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/cs/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/da/CMakeLists.txt b/data/accounts/da/CMakeLists.txt
index ceda89df0..3850c7efd 100644
--- a/data/accounts/da/CMakeLists.txt
+++ b/data/accounts/da/CMakeLists.txt
@@ -7,4 +7,7 @@ set(account_DATA
set_dist_list(DA_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/da)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/da)
+
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/da/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/de_AT/CMakeLists.txt b/data/accounts/de_AT/CMakeLists.txt
index 331171ea7..e98b65259 100644
--- a/data/accounts/de_AT/CMakeLists.txt
+++ b/data/accounts/de_AT/CMakeLists.txt
@@ -13,4 +13,7 @@ set(dist_account_DATA
set_dist_list(DE_AT_DIST ${dist_account_DATA} CMakeLists.txt)
install(FILES ${dist_account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/de_AT)
-file(COPY ${dist_account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/de_AT)
+
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/de_AT/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/de_CH/CMakeLists.txt b/data/accounts/de_CH/CMakeLists.txt
index d6274c2cd..fcd0f8903 100644
--- a/data/accounts/de_CH/CMakeLists.txt
+++ b/data/accounts/de_CH/CMakeLists.txt
@@ -9,4 +9,7 @@ set(account_DATA
set_dist_list(DE_CH_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/de_CH)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/de_CH)
\ No newline at end of file
+
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/de_CH/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/de_DE/CMakeLists.txt b/data/accounts/de_DE/CMakeLists.txt
index 6603fcd6f..b2322221e 100644
--- a/data/accounts/de_DE/CMakeLists.txt
+++ b/data/accounts/de_DE/CMakeLists.txt
@@ -17,4 +17,7 @@ set(account_DATA
set_dist_list(DE_DE_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/de_DE)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/de_DE)
\ No newline at end of file
+
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/de_DE/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/el_GR/CMakeLists.txt b/data/accounts/el_GR/CMakeLists.txt
index 605465091..55dfa3ff6 100644
--- a/data/accounts/el_GR/CMakeLists.txt
+++ b/data/accounts/el_GR/CMakeLists.txt
@@ -6,4 +6,7 @@ set(account_DATA
set_dist_list(EL_GR_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/el_GR)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/el_GR)
\ No newline at end of file
+
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/el_GR/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/en_GB/CMakeLists.txt b/data/accounts/en_GB/CMakeLists.txt
index 9e10dd4a7..555c67a6e 100644
--- a/data/accounts/en_GB/CMakeLists.txt
+++ b/data/accounts/en_GB/CMakeLists.txt
@@ -20,4 +20,7 @@ set(account_DATA
set_dist_list(EN_GB_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/en_GB)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/en_GB)
+
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/en_GB/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/en_IN/CMakeLists.txt b/data/accounts/en_IN/CMakeLists.txt
index 7789a32ae..73f264e23 100644
--- a/data/accounts/en_IN/CMakeLists.txt
+++ b/data/accounts/en_IN/CMakeLists.txt
@@ -25,5 +25,7 @@ set_dist_list(EN_IN_DIST ${account_DATA}
CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/en_IN)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/en_IN)
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/en_IN/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/es_ES/CMakeLists.txt b/data/accounts/es_ES/CMakeLists.txt
index ca21d97c0..de937b47a 100644
--- a/data/accounts/es_ES/CMakeLists.txt
+++ b/data/accounts/es_ES/CMakeLists.txt
@@ -18,4 +18,7 @@ set(account_DATA
set_dist_list(ES_ES_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/es_ES)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/es_ES)
+
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/es_ES/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/es_MX/CMakeLists.txt b/data/accounts/es_MX/CMakeLists.txt
index 04e731fb1..b19258d8e 100644
--- a/data/accounts/es_MX/CMakeLists.txt
+++ b/data/accounts/es_MX/CMakeLists.txt
@@ -18,5 +18,7 @@ set(account_DATA
set_dist_list(ES_MX_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/es_MX)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/es_MX)
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/es_MX/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/fi_FI/CMakeLists.txt b/data/accounts/fi_FI/CMakeLists.txt
index 7dd2f0ccd..e639279b0 100644
--- a/data/accounts/fi_FI/CMakeLists.txt
+++ b/data/accounts/fi_FI/CMakeLists.txt
@@ -6,4 +6,7 @@ set(account_DATA
set_dist_list(FI_FI_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/fi_FI)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/fi_FI)
+
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/fi_FI/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/fr_BE/CMakeLists.txt b/data/accounts/fr_BE/CMakeLists.txt
index d1dbb5ed3..2a64c60e7 100644
--- a/data/accounts/fr_BE/CMakeLists.txt
+++ b/data/accounts/fr_BE/CMakeLists.txt
@@ -19,4 +19,7 @@ set(account_DATA
set_dist_list(FR_BE_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/fr_BE)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/fr_BE)
+
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/fr_BE/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/fr_CA/CMakeLists.txt b/data/accounts/fr_CA/CMakeLists.txt
index fa448f787..4860d84d3 100644
--- a/data/accounts/fr_CA/CMakeLists.txt
+++ b/data/accounts/fr_CA/CMakeLists.txt
@@ -17,5 +17,7 @@ set(account_DATA
set_dist_list(FR_CA_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/fr_CA)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/fr_CA)
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/fr_CA/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/fr_CH/CMakeLists.txt b/data/accounts/fr_CH/CMakeLists.txt
index c37ecd119..5a3c4d182 100644
--- a/data/accounts/fr_CH/CMakeLists.txt
+++ b/data/accounts/fr_CH/CMakeLists.txt
@@ -19,4 +19,7 @@ set(account_DATA
set_dist_list(FR_CH_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/fr_CH)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/fr_CH)
+
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/fr_CH/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/fr_FR/CMakeLists.txt b/data/accounts/fr_FR/CMakeLists.txt
index dc2c17bb3..16f8b22d7 100644
--- a/data/accounts/fr_FR/CMakeLists.txt
+++ b/data/accounts/fr_FR/CMakeLists.txt
@@ -19,4 +19,7 @@ set(account_DATA
set_dist_list(FR_FR_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/fr_FR)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/fr_FR)
+
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/fr_FR/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/he/CMakeLists.txt b/data/accounts/he/CMakeLists.txt
index 025a862e9..ef271b907 100644
--- a/data/accounts/he/CMakeLists.txt
+++ b/data/accounts/he/CMakeLists.txt
@@ -21,5 +21,7 @@ set(account_DATA
set_dist_list(HE_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/he)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/he)
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/he/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/hr/CMakeLists.txt b/data/accounts/hr/CMakeLists.txt
index 15efd5b7a..a62b4a000 100644
--- a/data/accounts/hr/CMakeLists.txt
+++ b/data/accounts/hr/CMakeLists.txt
@@ -23,5 +23,7 @@ set(account_DATA
set_dist_list(HR_DIST ${account_DATA} CMakeLists.txt) # acctchrt_full.gnucash-xea
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/hr)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/hr)
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/hr/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/hu/CMakeLists.txt b/data/accounts/hu/CMakeLists.txt
index 0f9adf6d2..12528d880 100644
--- a/data/accounts/hu/CMakeLists.txt
+++ b/data/accounts/hu/CMakeLists.txt
@@ -20,5 +20,7 @@ set(account_DATA
set_dist_list(HU_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/hu)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/hu)
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/hu/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/it/CMakeLists.txt b/data/accounts/it/CMakeLists.txt
index 5783f1960..09016fc69 100644
--- a/data/accounts/it/CMakeLists.txt
+++ b/data/accounts/it/CMakeLists.txt
@@ -16,4 +16,7 @@ set(account_DATA
set_dist_list(IT_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/it)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/it)
+
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/it/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/ja/CMakeLists.txt b/data/accounts/ja/CMakeLists.txt
index 1f673f2d2..69e93ecc4 100644
--- a/data/accounts/ja/CMakeLists.txt
+++ b/data/accounts/ja/CMakeLists.txt
@@ -20,5 +20,7 @@ set(account_DATA
set_dist_list(JA_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/ja)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/ja)
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/ja/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/ko/CMakeLists.txt b/data/accounts/ko/CMakeLists.txt
index 20dc92590..dbb83d0d3 100644
--- a/data/accounts/ko/CMakeLists.txt
+++ b/data/accounts/ko/CMakeLists.txt
@@ -19,4 +19,7 @@ set(account_DATA
set_dist_list(KO_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/ko)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/ko)
+
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/ko/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/lt/CMakeLists.txt b/data/accounts/lt/CMakeLists.txt
index 1cc8b3d64..0a359af2a 100644
--- a/data/accounts/lt/CMakeLists.txt
+++ b/data/accounts/lt/CMakeLists.txt
@@ -3,4 +3,7 @@ set(account_DATA acctchrt_business.gnucash-xea)
set_dist_list(LT_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/lt)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/lt)
+
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/lt/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/lv/CMakeLists.txt b/data/accounts/lv/CMakeLists.txt
index e36a8f831..9e0eea322 100644
--- a/data/accounts/lv/CMakeLists.txt
+++ b/data/accounts/lv/CMakeLists.txt
@@ -19,4 +19,7 @@ set(account_DATA
set_dist_list(LV_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/lv)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/lv)
+
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/lv/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/nb/CMakeLists.txt b/data/accounts/nb/CMakeLists.txt
index a21dbc9db..87dc6ae4c 100644
--- a/data/accounts/nb/CMakeLists.txt
+++ b/data/accounts/nb/CMakeLists.txt
@@ -20,4 +20,7 @@ set(account_DATA
set_dist_list(NB_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/nb)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/nb)
+
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/nb/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/nl/CMakeLists.txt b/data/accounts/nl/CMakeLists.txt
index 97d9a99fe..c60dd15d7 100644
--- a/data/accounts/nl/CMakeLists.txt
+++ b/data/accounts/nl/CMakeLists.txt
@@ -6,4 +6,7 @@ set(account_DATA
set_dist_list(NL_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/nl)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/nl)
+
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/nl/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/pl/CMakeLists.txt b/data/accounts/pl/CMakeLists.txt
index 6531a4d27..8d842e8e2 100644
--- a/data/accounts/pl/CMakeLists.txt
+++ b/data/accounts/pl/CMakeLists.txt
@@ -19,4 +19,7 @@ set(account_DATA
set_dist_list(PL_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/pl)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/pl)
\ No newline at end of file
+
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/pl/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/pt_BR/CMakeLists.txt b/data/accounts/pt_BR/CMakeLists.txt
index 2f9f31ed2..b2f2d7d0e 100644
--- a/data/accounts/pt_BR/CMakeLists.txt
+++ b/data/accounts/pt_BR/CMakeLists.txt
@@ -18,5 +18,7 @@ set(account_DATA
set_dist_list(PT_BR_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/pt_BR)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/pt_BR)
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/pt_BR/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/pt_PT/CMakeLists.txt b/data/accounts/pt_PT/CMakeLists.txt
index 744386bf9..2c56a912c 100644
--- a/data/accounts/pt_PT/CMakeLists.txt
+++ b/data/accounts/pt_PT/CMakeLists.txt
@@ -17,5 +17,7 @@ set(account_DATA
set_dist_list(PT_PT_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/pt_PT)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/pt_PT)
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/pt_PT/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/ru/CMakeLists.txt b/data/accounts/ru/CMakeLists.txt
index d5ada84a4..390caaa85 100644
--- a/data/accounts/ru/CMakeLists.txt
+++ b/data/accounts/ru/CMakeLists.txt
@@ -11,5 +11,7 @@ set(account_DATA
set_dist_list(RU_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/ru)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/ru)
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/ru/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/sk/CMakeLists.txt b/data/accounts/sk/CMakeLists.txt
index 2e05ec8ae..9c90456e4 100644
--- a/data/accounts/sk/CMakeLists.txt
+++ b/data/accounts/sk/CMakeLists.txt
@@ -18,5 +18,7 @@ set(account_DATA
set_dist_list(SK_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/sk)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/sk)
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/sk/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/sv_AX/CMakeLists.txt b/data/accounts/sv_AX/CMakeLists.txt
index 70b98f4be..5c2135465 100644
--- a/data/accounts/sv_AX/CMakeLists.txt
+++ b/data/accounts/sv_AX/CMakeLists.txt
@@ -6,5 +6,7 @@ set(account_DATA
set_dist_list(SV_AX_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/sv_AX)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/sv_AX)
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/sv_AX/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/sv_FI/CMakeLists.txt b/data/accounts/sv_FI/CMakeLists.txt
index ea99c3d19..ca53fa20b 100644
--- a/data/accounts/sv_FI/CMakeLists.txt
+++ b/data/accounts/sv_FI/CMakeLists.txt
@@ -6,4 +6,7 @@ set(account_DATA
set_dist_list(SV_FI_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/sv_FI)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/sv_FI)
\ No newline at end of file
+
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/sv_FI/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/sv_SE/CMakeLists.txt b/data/accounts/sv_SE/CMakeLists.txt
index 83180b28d..963b5a1f3 100644
--- a/data/accounts/sv_SE/CMakeLists.txt
+++ b/data/accounts/sv_SE/CMakeLists.txt
@@ -6,4 +6,7 @@ set(account_DATA
set_dist_list(SV_SE_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/sv_SE)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/sv_SE)
+
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/sv_SE/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/tr_TR/CMakeLists.txt b/data/accounts/tr_TR/CMakeLists.txt
index adcb95561..674f3eb6c 100644
--- a/data/accounts/tr_TR/CMakeLists.txt
+++ b/data/accounts/tr_TR/CMakeLists.txt
@@ -11,4 +11,7 @@ set(account_DATA
set_dist_list(TR_TR_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/tr_TR)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/tr_TR)
+
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/tr_TR/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/zh_CN/CMakeLists.txt b/data/accounts/zh_CN/CMakeLists.txt
index 8244d65b9..3503a97d7 100644
--- a/data/accounts/zh_CN/CMakeLists.txt
+++ b/data/accounts/zh_CN/CMakeLists.txt
@@ -19,4 +19,7 @@ set(account_DATA
set_dist_list(ZH_CN_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/zh_CN)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/zn_CN)
+
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/zh_CN/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/zh_HK/CMakeLists.txt b/data/accounts/zh_HK/CMakeLists.txt
index 03cae9b78..d8f1ed046 100644
--- a/data/accounts/zh_HK/CMakeLists.txt
+++ b/data/accounts/zh_HK/CMakeLists.txt
@@ -3,4 +3,7 @@ set(account_DATA acctchrt_business.gnucash-xea)
set_dist_list(ZH_HK_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/zh_HK)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/zh_HK)
+
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/zh_HK/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/accounts/zh_TW/CMakeLists.txt b/data/accounts/zh_TW/CMakeLists.txt
index 2eefcafe4..3fb62b5fb 100644
--- a/data/accounts/zh_TW/CMakeLists.txt
+++ b/data/accounts/zh_TW/CMakeLists.txt
@@ -3,4 +3,7 @@ set(account_DATA acctchrt_business.gnucash-xea)
set_dist_list(ZH_TW_DIST ${account_DATA} CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/zh_TW)
-file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/zh_TW)
+
+foreach(acct_file ${account_DATA})
+ configure_file(${acct_file} ${ACCOUNTS_BUILD_DIR}/zh_TW/${acct_file} COPYONLY)
+endforeach()
diff --git a/data/checks/CMakeLists.txt b/data/checks/CMakeLists.txt
index 65d1d33f7..5f8ccf48f 100644
--- a/data/checks/CMakeLists.txt
+++ b/data/checks/CMakeLists.txt
@@ -10,6 +10,8 @@ set(checks_DATA
install(FILES ${checks_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/checks)
-file(COPY ${checks_DATA} DESTINATION ${DATADIR_BUILD}/gnucash/checks)
+foreach(check_file ${checks_DATA})
+ configure_file(${check_file} ${DATADIR_BUILD}/gnucash/checks/${check_file} COPYONLY)
+endforeach()
set_dist_list(checks_DIST CMakeLists.txt ${checks_DATA})
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 233dd64d8..ddc194b00 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -28,7 +28,9 @@ install(FILES ${doc_DATA} DESTINATION ${CMAKE_INSTALL_DOCDIR})
set_local_dist(doc_DIST_local ${doc_DATA} ${doc_noinst_DATA})
set(doc_DIST ${doc_DIST_local} ${examples_DIST} PARENT_SCOPE)
-file(COPY ${doc_DATA} DESTINATION ${DATADIR_BUILD}/doc/gnucash)
+foreach(doc_file ${doc_DATA})
+ configure_file(${doc_file} ${DATADIR_BUILD}/doc/gnucash/${doc_file} COPYONLY)
+endforeach()
# Generate the tip of the day file.
diff --git a/doc/tip_of_the_day.list.c b/doc/tip_of_the_day.list.c
index a69da038f..ed421a661 100644
--- a/doc/tip_of_the_day.list.c
+++ b/doc/tip_of_the_day.list.c
@@ -1,4 +1,4 @@
- N_( "The GnuCash online manual has lots of helpful information. \
+ N_( "1The GnuCash online manual has lots of helpful information. \
You can access the manual under the Help menu.")
N_( "The GnuCash developers are easy to contact. As well \
diff --git a/gnucash/gtkbuilder/CMakeLists.txt b/gnucash/gtkbuilder/CMakeLists.txt
index f998c0023..83d17dce1 100644
--- a/gnucash/gtkbuilder/CMakeLists.txt
+++ b/gnucash/gtkbuilder/CMakeLists.txt
@@ -64,7 +64,9 @@ set (gtkbuilder_SOURCES
window-reconcile.glade
)
-file (COPY ${gtkbuilder_SOURCES} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
+foreach (gtkbuilder_file ${gtkbuilder_SOURCES})
+ configure_file (${gtkbuilder_file} ${DATADIR_BUILD}/gnucash/gtkbuilder/${gtkbuilder_file} COPYONLY)
+endforeach()
install (FILES ${gtkbuilder_SOURCES} DESTINATION share/gnucash/gtkbuilder)
diff --git a/gnucash/import-export/aqb/CMakeLists.txt b/gnucash/import-export/aqb/CMakeLists.txt
index 0d070f86e..726abc980 100644
--- a/gnucash/import-export/aqb/CMakeLists.txt
+++ b/gnucash/import-export/aqb/CMakeLists.txt
@@ -85,10 +85,13 @@ endif()
install(FILES ${aqbanking_UI} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
- file(COPY ${aqbanking_UI}
- DESTINATION ${DATADIR_BUILD}/gnucash/ui)
- file(COPY ${aqbanking_GLADE}
- DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
+ foreach(ui_file ${aqbanking_UI})
+ configure_file(${ui_file} ${DATADIR_BUILD}/gnucash/ui/${ui_file} COPYONLY)
+ endforeach()
+
+ foreach(glade_file ${aqbanking_GLADE})
+ configure_file(${glade_file} ${DATADIR_BUILD}/gnucash/gtkbuilder/${glade_file} COPYONLY)
+ endforeach()
endif()
set_local_dist(aqbanking_DIST_local CMakeLists.txt
diff --git a/gnucash/import-export/ofx/CMakeLists.txt b/gnucash/import-export/ofx/CMakeLists.txt
index 0bf5375c2..07f8b9ab0 100644
--- a/gnucash/import-export/ofx/CMakeLists.txt
+++ b/gnucash/import-export/ofx/CMakeLists.txt
@@ -38,8 +38,9 @@ endif()
install(FILES ${ofx_UI} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
- file(COPY ${ofx_UI}
- DESTINATION ${DATADIR_BUILD}/gnucash/ui)
+ foreach(ui_file ${ofx_UI})
+ configure_file(${ui_file} ${DATADIR_BUILD}/gnucash/ui/${ui_file} COPYONLY)
+ endforeach()
endif()
set_local_dist(ofx_DIST_local CMakeLists.txt ${ofx_SOURCES} ${ofx_noinst_HEADERS} ${ofx_UI})
diff --git a/gnucash/python/CMakeLists.txt b/gnucash/python/CMakeLists.txt
index 7ec9f37c1..9f3c30400 100644
--- a/gnucash/python/CMakeLists.txt
+++ b/gnucash/python/CMakeLists.txt
@@ -31,8 +31,10 @@ endif()
install(FILES ${pycons_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/python/pycons)
install(FILES init.py DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/python)
- file(COPY ${pycons_DATA} DESTINATION ${CMAKE_BINARY_DIR}/share/gnucash/python/pycons)
- file(COPY init.py DESTINATION ${CMAKE_BINARY_DIR}/share/gnucash/python)
+ file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/share/gnucash/python/pycons)
+ foreach(py_file ${pycons_DATA} init.py)
+ configure_file(${py_file} ${CMAKE_BINARY_DIR}/share/gnucash/python/${py_file} COPYONLY)
+ endforeach()
endif()
set_local_dist(pycons_DIST ${pycons_DATA})
diff --git a/gnucash/ui/CMakeLists.txt b/gnucash/ui/CMakeLists.txt
index 0429c7dd0..0ac651135 100644
--- a/gnucash/ui/CMakeLists.txt
+++ b/gnucash/ui/CMakeLists.txt
@@ -34,7 +34,9 @@ set (ui_SOURCES
gnc-windows-menu-ui.xml
osx_accel_map)
-file (COPY ${ui_SOURCES} DESTINATION ${DATADIR_BUILD}/gnucash/ui)
+foreach (ui_file ${ui_SOURCES})
+ configure_file (${ui_file} ${DATADIR_BUILD}/gnucash/ui/${ui_file} COPYONLY)
+endforeach()
install (FILES ${ui_SOURCES} DESTINATION share/gnucash/ui)
commit 261bff125058f394f3b2dd86859f7b14ddfbd730
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sun Apr 19 18:22:59 2020 +0200
Drop unused module file in xml backend
diff --git a/libgnucash/backend/xml/gncmod-backend-xml.cpp b/libgnucash/backend/xml/gncmod-backend-xml.cpp
deleted file mode 100644
index 5743fa31d..000000000
--- a/libgnucash/backend/xml/gncmod-backend-xml.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*********************************************************************
- * gncmod-backend-xml.c
- * module definition/initialization for the file backend module
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
- *********************************************************************/
-/********************************************************************\
- * This program is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License as *
- * published by the Free Software Foundation; either version 2 of *
- * the License, or (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact: *
- * *
- * Free Software Foundation Voice: +1-617-542-5942 *
- * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
- * Boston, MA 02110-1301, USA gnu at gnu.org *
- * *
-\********************************************************************/
-
-extern "C"
-{
-#include <stdio.h>
-#include <gmodule.h>
- /* #include <glib-gobject.h> */
-
-#include "gnc-module.h"
-#include "gnc-module-api.h"
-
- GNC_MODULE_API_DECL (libgncmod_backend_file)
-
- /* version of the gnc module system interface we require */
- int libgnc_backend_file_utils_gnc_module_system_interface = 0;
-
- /* module versioning uses libtool semantics. */
- int libgncmod_backend_file_gnc_module_current = 0;
- int libgncmod_backend_file_gnc_module_revision = 0;
- int libgncmod_backend_file_gnc_module_age = 0;
-
- static GNCModule engine;
-
-
-
- char*
- libgncmod_backend_file_gnc_module_path (void)
- {
- return g_strdup ("gnucash/backend/file");
- }
-
- char*
- libgncmod_backend_file_gnc_module_description (void)
- {
- return g_strdup ("The binary and XML (v1 and v2) backends for GnuCash");
- }
-
- int
- libgncmod_backend_file_gnc_module_init (int refcount)
- {
- return TRUE;
- }
-
- int
- libgncmod_backend_file_gnc_module_end (int refcount)
- {
- int unload = TRUE;
-
- if (engine)
- unload = libgnc_backend_file_utils_gnc_module_unload (engine);
-
- if (refcount == 0)
- engine = NULL;
-
- return unload;
- }
-} //extern "C"
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 2711f3d27..d39aa195c 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,6 +1,5 @@
# These are files that we don't want to translate, because they are
# not distributed.
-libgnucash/backend/xml/gncmod-backend-xml.cpp
gnucash/gnome-utils/gnc-tree-model-selection.c
# This file is only an example for programmers and never called:
commit 9d96097032f7f1cdd89dd4ef71cd7000ad86979f
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sun Apr 19 20:07:17 2020 +0200
Convert gncmod-generic-import module into ordinary shared library gnc-generic-import
diff --git a/gnucash/gnome-utils/dialog-preferences.c b/gnucash/gnome-utils/dialog-preferences.c
index 4a6e26484..af3c04201 100644
--- a/gnucash/gnome-utils/dialog-preferences.c
+++ b/gnucash/gnome-utils/dialog-preferences.c
@@ -1250,6 +1250,10 @@ gnc_preferences_dialog_create(GtkWindow *parent)
gnc_builder_add_from_file (builder, "dialog-preferences.glade", "retain_days_adj");
gnc_builder_add_from_file (builder, "dialog-preferences.glade", "tab_width_adj");
gnc_builder_add_from_file (builder, "dialog-preferences.glade", "date_formats");
+ gnc_builder_add_from_file (builder, "dialog-preferences.glade", "atm_fee_adj");
+ gnc_builder_add_from_file (builder, "dialog-preferences.glade", "auto_add_adj");
+ gnc_builder_add_from_file (builder, "dialog-preferences.glade", "auto_clear_adj");
+ gnc_builder_add_from_file (builder, "dialog-preferences.glade", "match_adj");
gnc_builder_add_from_file (builder, "dialog-preferences.glade", "gnucash_preferences_dialog");
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "gnucash_preferences_dialog"));
diff --git a/gnucash/gtkbuilder/dialog-import.glade b/gnucash/gtkbuilder/dialog-import.glade
index f92ab72a8..1490defd8 100644
--- a/gnucash/gtkbuilder/dialog-import.glade
+++ b/gnucash/gtkbuilder/dialog-import.glade
@@ -168,26 +168,6 @@
<action-widget response="-5">okbutton</action-widget>
</action-widgets>
</object>
- <object class="GtkAdjustment" id="atm_fee_adj">
- <property name="upper">1000</property>
- <property name="value">2</property>
- <property name="step_increment">0.01</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="auto_add_adj">
- <property name="lower">1</property>
- <property name="upper">6</property>
- <property name="value">1</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="auto_clear_adj">
- <property name="lower">6</property>
- <property name="upper">12</property>
- <property name="value">6</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
<object class="GtkDialog" id="format_picker_dialog">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Choose a format</property>
@@ -317,268 +297,6 @@
<action-widget response="-5">okbutton1</action-widget>
</action-widgets>
</object>
- <object class="GtkAdjustment" id="match_adj">
- <property name="upper">6</property>
- <property name="value">1</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkWindow" id="Preferences">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="title" translatable="yes">Preferences</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkGrid" id="matcher_prefs">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">3</property>
- <property name="column_spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="pref/dialogs.import.generic/enable-skip">
- <property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Enable skip transaction action</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">Enable the SKIP action in the transaction matcher. If enabled, a transaction whose best match's score is in the yellow zone (above the Auto-ADD threshold but below the Auto-CLEAR threshold) will be skipped by default.</property>
- <property name="tooltip_text" translatable="yes">Enable the SKIP action in the transaction matcher. If enabled, a transaction whose best match's score is in the yellow zone (above the Auto-ADD threshold but below the Auto-CLEAR threshold) will be skipped by default.</property>
- <property name="halign">start</property>
- <property name="margin_left">12</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="pref/dialogs.import.generic/enable-update">
- <property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Enable update match action</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">Enable the UPDATE AND RECONCILE action in the transaction matcher. If enabled, a transaction whose best match's score is above the Auto-CLEAR threshold and has a different date or amount than the matching existing transaction will cause the existing transaction to be updated and cleared by default.</property>
- <property name="tooltip_text" translatable="yes">Enable the UPDATE AND RECONCILE action in the transaction matcher. If enabled, a transaction whose best match's score is above the Auto-CLEAR threshold and has a different date or amount than the matching existing transaction will cause the existing transaction to be updated and cleared by default.</property>
- <property name="halign">start</property>
- <property name="margin_left">12</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label847785">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes"><b>Generic Importer</b></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="pref/dialogs.import.generic/atm-fee-threshold">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup">In some places commercial ATMs (not belonging to a financial institution) are installed in places like convenience stores. These ATMs add their fee directly to the amount instead of showing up as a separate transaction or in your monthly banking fees. For example, you withdraw $100, and you are charged $101,50 plus Interac fees. If you manually entered that $100, the amounts won't match. You should set this to whatever is the maximum such fee in your area (in units of your local currency), so the transaction will be recognised as a match.</property>
- <property name="tooltip_text" translatable="yes">In some places commercial ATMs (not belonging to a financial institution) are installed in places like convenience stores. These ATMs add their fee directly to the amount instead of showing up as a separate transaction or in your monthly banking fees. For example, you withdraw $100, and you are charged $101,50 plus Interac fees. If you manually entered that $100, the amounts won't match. You should set this to whatever is the maximum such fee in your area (in units of your local currency), so the transaction will be recognised as a match.</property>
- <property name="invisible_char">â—</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="adjustment">atm_fee_adj</property>
- <property name="climb_rate">1</property>
- <property name="digits">2</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">7</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="pref/dialogs.import.generic/auto-clear-threshold">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup">A transaction whose best match's score is in the green zone (above or equal to the Auto-CLEAR threshold) will be CLEARed by default.</property>
- <property name="tooltip_text" translatable="yes">A transaction whose best match's score is in the green zone (above or equal to the Auto-CLEAR threshold) will be CLEARed by default.</property>
- <property name="invisible_char">â—</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="adjustment">auto_clear_adj</property>
- <property name="climb_rate">1</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="pref/dialogs.import.generic/auto-add-threshold">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup">A transaction whose best match's score is in the red zone (above the display threshold but below or equal to the Auto-ADD threshold) will be ADDed by default.</property>
- <property name="tooltip_text" translatable="yes">A transaction whose best match's score is in the red zone (above the display threshold but below or equal to the Auto-ADD threshold) will be ADDed by default.</property>
- <property name="invisible_char">â—</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="adjustment">auto_add_adj</property>
- <property name="climb_rate">1</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="pref/dialogs.import.generic/match-threshold">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup">The minimum score a potential match must have to be displayed in the match list.</property>
- <property name="tooltip_text" translatable="yes">The minimum score a potential match must have to be displayed in the match list.</property>
- <property name="invisible_char">â—</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="adjustment">match_adj</property>
- <property name="climb_rate">1</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label847789">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="margin_left">12</property>
- <property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Commercial ATM _fees threshold</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">pref/dialogs.import.generic/atm-fee-threshold</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">7</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label847788">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="margin_left">12</property>
- <property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Auto-c_lear threshold</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">pref/dialogs.import.generic/auto-clear-threshold</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label847787">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="margin_left">12</property>
- <property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Auto-_add threshold</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">pref/dialogs.import.generic/auto-add-threshold</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label847786">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="margin_left">12</property>
- <property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Match _display threshold</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">pref/dialogs.import.generic/match-threshold</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="pref/dialogs.import.generic/use-bayes">
- <property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Use _bayesian matching</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">Use bayesian algorithms to match new transactions with existing accounts.</property>
- <property name="tooltip_text" translatable="yes">Use bayesian algorithms to match new transactions with existing accounts.</property>
- <property name="halign">start</property>
- <property name="margin_left">12</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="pref/dialogs.import.generic/auto-create-commodity">
- <property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Automatically create new commodities</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 the automatic creation of new commodities if any unknown commodity is encountered during import. Otherwise the user will be asked what to do with each unknown commodity.</property>
- <property name="tooltip_text" translatable="yes">Enables the automatic creation of new commodities if any unknown commodity is encountered during import. Otherwise the user will be asked what to do with each unknown commodity.</property>
- <property name="halign">start</property>
- <property name="margin_left">12</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">9</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- </object>
<object class="GtkDialog" id="match_picker_dialog">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Select matching existing transaction</property>
diff --git a/gnucash/gtkbuilder/dialog-preferences.glade b/gnucash/gtkbuilder/dialog-preferences.glade
index 4d95fc8da..2bc5f23ab 100644
--- a/gnucash/gtkbuilder/dialog-preferences.glade
+++ b/gnucash/gtkbuilder/dialog-preferences.glade
@@ -2,6 +2,23 @@
<!-- Generated with glade 3.22.1 -->
<interface>
<requires lib="gtk+" version="3.10"/>
+ <object class="GtkAdjustment" id="atm_fee_adj">
+ <property name="upper">1000</property>
+ <property name="step_increment">0.01</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="auto_add_adj">
+ <property name="lower">1</property>
+ <property name="upper">6</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="auto_clear_adj">
+ <property name="lower">6</property>
+ <property name="upper">12</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkAdjustment" id="auto_decimal_places_adj">
<property name="lower">1</property>
<property name="upper">8</property>
@@ -65,36 +82,8 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkAdjustment" id="max_transactions_adj">
- <property name="upper">999999</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="new_search_limit_adj">
- <property name="lower">1</property>
- <property name="upper">100</property>
- <property name="value">1</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="retain_days_adj">
- <property name="lower">1</property>
- <property name="upper">99999</property>
- <property name="value">30</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="save_on_close_adj">
- <property name="lower">1</property>
- <property name="upper">300</property>
- <property name="value">20</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="tab_width_adj">
- <property name="lower">1</property>
- <property name="upper">100</property>
- <property name="value">30</property>
+ <object class="GtkAdjustment" id="match_adj">
+ <property name="upper">6</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
@@ -109,12 +98,12 @@
<placeholder/>
</child>
<child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox2">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area2">
+ <object class="GtkButtonBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
@@ -194,7 +183,6 @@
<property name="tooltip_markup">Show a grand total of all accounts converted to the default report currency.</property>
<property name="tooltip_text" translatable="yes">Show a grand total of all accounts converted to the default report currency.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -213,7 +201,6 @@
<property name="tooltip_markup">If checked, non-currency commodities will be shown in the summary bar. If clear, only currencies will be shown.</property>
<property name="tooltip_text" translatable="yes">If checked, non-currency commodities will be shown in the summary bar. If clear, only currencies will be shown.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -258,7 +245,6 @@
<property name="tooltip_markup">Use the specified relative starting date for profit/loss calculations.</property>
<property name="tooltip_text" translatable="yes">Use the specified relative starting date for profit/loss calculations.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -278,7 +264,6 @@
<property name="tooltip_markup">Use the specified absolute starting date for profit/loss calculations.</property>
<property name="tooltip_text" translatable="yes">Use the specified absolute starting date for profit/loss calculations.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">pref/window.pages.account-tree.summary/start-choice-relative</property>
@@ -298,7 +283,6 @@
<property name="tooltip_markup">Use the specified relative ending date for profit/loss calculations. Also use this date for net assets calculations.</property>
<property name="tooltip_text" translatable="yes">Use the specified relative ending date for profit/loss calculations. Also use this date for net assets calculations.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -318,7 +302,6 @@
<property name="tooltip_markup">Use the specified absolute ending date for profit/loss calculations. Also use this date for net assets calculations.</property>
<property name="tooltip_text" translatable="yes">Use the specified absolute ending date for profit/loss calculations. Also use this date for net assets calculations.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">pref/window.pages.account-tree.summary/end-choice-relative</property>
@@ -464,7 +447,6 @@
<property name="tooltip_markup">Use only 'debit' and 'credit' instead of informal synonyms.</property>
<property name="tooltip_text" translatable="yes">Use only 'debit' and 'credit' instead of informal synonyms.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -506,7 +488,6 @@
<property name="tooltip_markup">Don't sign reverse any accounts.</property>
<property name="tooltip_text" translatable="yes">Don't sign reverse any accounts.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -526,7 +507,6 @@
<property name="tooltip_markup">Sign reverse balances on the following: Credit Card, Payable, Liability, Equity, and Income.</property>
<property name="tooltip_text" translatable="yes">Sign reverse balances on the following: Credit Card, Payable, Liability, Equity, and Income.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">pref/general/reversed-accounts-none</property>
@@ -546,7 +526,6 @@
<property name="tooltip_markup">Sign reverse balances on income and expense accounts.</property>
<property name="tooltip_text" translatable="yes">Sign reverse balances on income and expense accounts.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">pref/general/reversed-accounts-none</property>
@@ -630,7 +609,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="label" translatable="yes">Character</property>
</object>
<packing>
@@ -643,7 +621,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="label" translatable="yes">Sample</property>
</object>
<packing>
@@ -686,7 +663,6 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup">Show the Account Color as Account Name Background.</property>
<property name="tooltip_text" translatable="yes">Show the Account Color as Account Name Background.</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -715,7 +691,6 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup">Show the Account Color as tab background.</property>
<property name="tooltip_text" translatable="yes">Show the Account Color as tab background.</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -777,8 +752,8 @@
<property name="tooltip_markup">Use the specified currency for all newly created accounts.</property>
<property name="tooltip_text" translatable="yes">Use the specified currency for all newly created accounts.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
+ <property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -796,7 +771,6 @@
<property name="tooltip_markup">Use the system locale currency for all newly created accounts.</property>
<property name="tooltip_text" translatable="yes">Use the system locale currency for all newly created accounts.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -937,7 +911,6 @@
<property name="tooltip_markup">Use a 24 hour (instead of a 12 hour) time format.</property>
<property name="tooltip_text" translatable="yes">Use a 24 hour (instead of a 12 hour) time format.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -964,7 +937,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="label" translatable="yes">When a date is entered without year, it should be taken:</property>
<property name="use_markup">True</property>
</object>
@@ -983,7 +955,6 @@
<property name="tooltip_markup">Dates will be completed so that they are within the current calendar year.</property>
<property name="tooltip_text" translatable="yes">Dates will be completed so that they are within the current calendar year.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -1004,7 +975,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Dates will be completed so that they are close to the current date. Enter the maximum number of months to go backwards in time when completing dates.</property>
<property name="tooltip_text" translatable="yes">Dates will be completed so that they are close to the current date. Enter the maximum number of months to go backwards in time when completing dates.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">pref/general/date-completion-thisyear</property>
@@ -1023,10 +993,12 @@ many months before the current month:</property>
<property name="tooltip_text" translatable="yes">Enter number of months.</property>
<property name="halign">start</property>
<property name="invisible_char">â—</property>
+ <property name="text" translatable="yes">6</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="adjustment">date_backmonth_adj</property>
<property name="climb_rate">1</property>
+ <property name="value">6</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -1040,7 +1012,6 @@ many months before the current month:</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup">Use the date format specified by the system locale.</property>
<property name="tooltip_text" translatable="yes">Use the date format specified by the system locale.</property>
- <property name="margin_left">12</property>
<property name="model">date_formats</property>
<property name="active">3</property>
<child>
@@ -1144,7 +1115,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Present the new account list dialog when you choose File->New File.</property>
<property name="tooltip_text" translatable="yes">Present the new account list dialog when you choose File->New File.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1163,7 +1133,6 @@ many months before the current month:</property>
<property name="tooltip_markup">If selected, the default book option for new files is set so that the "Num" cell on registers shows/updates the split "action" field and the transaction "num" field is shown on the second line in double line mode (and is not visible in single line mode). Otherwise, the default book option for new files is set so that the "Num" cell on registers shows/updates the transaction "num" field.</property>
<property name="tooltip_text" translatable="yes">If selected, the default book option for new files is set so that the 'Num' cell on registers shows/updates the split 'action' field and the transaction 'num' field is shown on the second line in double line mode (and is not visible in single line mode). Otherwise, the default book option for new files is set so that the 'Num' cell on registers shows/updates the transaction 'num' field.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1183,7 +1152,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Display hints for using GnuCash at startup.</property>
<property name="tooltip_text" translatable="yes">Display hints for using GnuCash at startup.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1205,10 +1173,12 @@ many months before the current month:</property>
<property name="tooltip_markup">How many days to keep old log/backup files.</property>
<property name="tooltip_text" translatable="yes">How many days to keep old log/backup files.</property>
<property name="invisible_char">â—</property>
+ <property name="text" translatable="yes">30</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="adjustment">retain_days_adj</property>
<property name="climb_rate">1</property>
+ <property name="value">30</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1259,7 +1229,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Compress the data file with gzip when saving it to disk.</property>
<property name="tooltip_text" translatable="yes">Compress the data file with gzip when saving it to disk.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1296,7 +1265,6 @@ many months before the current month:</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="label" translatable="yes">_Decimal places:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pref/general/auto-decimal-places</property>
@@ -1314,10 +1282,12 @@ many months before the current month:</property>
<property name="tooltip_markup">How many automatic decimal places will be filled in.</property>
<property name="tooltip_text" translatable="yes">How many automatic decimal places will be filled in.</property>
<property name="invisible_char">â—</property>
+ <property name="text" translatable="yes">2</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="adjustment">auto_decimal_places_adj</property>
<property name="climb_rate">1</property>
+ <property name="value">2</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -1334,7 +1304,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Automatically insert a decimal point into values that are entered without one.</property>
<property name="tooltip_text" translatable="yes">Automatically insert a decimal point into values that are entered without one.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1353,7 +1322,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Display negative amounts in red.</property>
<property name="tooltip_text" translatable="yes">Display negative amounts in red.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1372,7 +1340,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Force prices to display as decimals even if they must be rounded.</property>
<property name="tooltip_text" translatable="yes">If active, GnuCash will round prices as necessary to display them as decimals instead of displaying the exact fraction if the fractional part cannot be exactly represented as a decimal.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1422,7 +1389,6 @@ many months before the current month:</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="label" translatable="yes">New search _limit</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pref/dialogs.search/new-search-limit</property>
@@ -1440,10 +1406,12 @@ many months before the current month:</property>
<property name="tooltip_markup">Default to 'new search' if fewer than this number of items is returned.</property>
<property name="tooltip_text" translatable="yes">Default to 'new search' if fewer than this number of items is returned.</property>
<property name="invisible_char">â—</property>
+ <property name="text" translatable="yes">1</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="adjustment">new_search_limit_adj</property>
<property name="climb_rate">1</property>
+ <property name="value">1</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -1460,7 +1428,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Show splash screen at startup.</property>
<property name="tooltip_text" translatable="yes">Show splash screen at startup.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1474,7 +1441,6 @@ many months before the current month:</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="label" translatable="yes">Auto-save time _interval</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pref/general/autosave-interval-minutes</property>
@@ -1497,10 +1463,12 @@ many months before the current month:</property>
<property name="tooltip_markup">The number of minutes until saving of the data file to harddisk will be started automatically. If zero, no saving will be started automatically.</property>
<property name="tooltip_text" translatable="yes">The number of minutes until saving of the data file to harddisk will be started automatically. If zero, no saving will be started automatically.</property>
<property name="invisible_char">â—</property>
+ <property name="text" translatable="yes">3</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="adjustment">autosave_interval_minutes_adj</property>
<property name="climb_rate">1</property>
+ <property name="value">3</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1536,7 +1504,6 @@ many months before the current month:</property>
<property name="tooltip_markup">If active, GnuCash shows a confirmation question each time the auto-save feature is started. Otherwise no extra explanation is shown.</property>
<property name="tooltip_text" translatable="yes">If active, GnuCash shows a confirmation question each time the auto-save feature is started. Otherwise no extra explanation is shown.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1565,7 +1532,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Do not create log/backup files.</property>
<property name="tooltip_text" translatable="yes">Do not create log/backup files.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="draw_indicator">True</property>
<property name="group">pref/general/retain-type-days</property>
</object>
@@ -1584,7 +1550,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Delete old log/backup files after this many days (0 = never).</property>
<property name="tooltip_text" translatable="yes">Delete old log/backup files after this many days (0 = never).</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1603,7 +1568,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Do not delete log/backup files.</property>
<property name="tooltip_text" translatable="yes">Do not delete log/backup files.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="draw_indicator">True</property>
<property name="group">pref/general/retain-type-days</property>
</object>
@@ -1620,7 +1584,6 @@ many months before the current month:</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">If enabled, the "Save changes on closing" question will only wait a limited number of seconds for an answer. If the user didn't answer within that time, the changes will be saved automatically and the question window closed.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="gnc_save_on_close_expires_cb" swapped="no"/>
@@ -1635,7 +1598,6 @@ many months before the current month:</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="label" translatable="yes">Time to _wait for answer</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pref/general/autosave-interval-minutes</property>
@@ -1656,10 +1618,12 @@ many months before the current month:</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">The number of seconds to wait before the question window will be closed and the changes saved automatically.</property>
<property name="invisible_char">â—</property>
+ <property name="text" translatable="yes">20</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="adjustment">save_on_close_adj</property>
<property name="climb_rate">1</property>
+ <property name="value">20</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1730,7 +1694,6 @@ many months before the current month:</property>
<object class="GtkImage" id="path_head_error">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
<property name="icon_name">dialog-warning</property>
</object>
<packing>
@@ -1753,7 +1716,6 @@ many months before the current month:</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Enable horizontal grid lines on table displays. These will mainly be tree views like the Accounts page.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1771,7 +1733,6 @@ many months before the current month:</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Enable vertical grid lines on table displays. These will mainly be tree views like the Accounts page.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1867,6 +1828,269 @@ many months before the current month:</property>
<property name="tab_fill">False</property>
</packing>
</child>
+ <child>
+ <object class="GtkGrid" id="matcher_prefs">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">3</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="pref/dialogs.import.generic/enable-skip">
+ <property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Enable skip transaction action</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">Enable the SKIP action in the transaction matcher. If enabled, a transaction whose best match's score is in the yellow zone (above the Auto-ADD threshold but below the Auto-CLEAR threshold) will be skipped by default.</property>
+ <property name="tooltip_text" translatable="yes">Enable the SKIP action in the transaction matcher. If enabled, a transaction whose best match's score is in the yellow zone (above the Auto-ADD threshold but below the Auto-CLEAR threshold) will be skipped by default.</property>
+ <property name="halign">start</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="pref/dialogs.import.generic/enable-update">
+ <property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Enable update match action</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">Enable the UPDATE AND RECONCILE action in the transaction matcher. If enabled, a transaction whose best match's score is above the Auto-CLEAR threshold and has a different date or amount than the matching existing transaction will cause the existing transaction to be updated and cleared by default.</property>
+ <property name="tooltip_text" translatable="yes">Enable the UPDATE AND RECONCILE action in the transaction matcher. If enabled, a transaction whose best match's score is above the Auto-CLEAR threshold and has a different date or amount than the matching existing transaction will cause the existing transaction to be updated and cleared by default.</property>
+ <property name="halign">start</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label847785">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes"><b>General</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="pref/dialogs.import.generic/atm-fee-threshold">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">In some places commercial ATMs (not belonging to a financial institution) are installed in places like convenience stores. These ATMs add their fee directly to the amount instead of showing up as a separate transaction or in your monthly banking fees. For example, you withdraw $100, and you are charged $101,50 plus Interac fees. If you manually entered that $100, the amounts won't match. You should set this to whatever is the maximum such fee in your area (in units of your local currency), so the transaction will be recognised as a match.</property>
+ <property name="tooltip_text" translatable="yes">In some places commercial ATMs (not belonging to a financial institution) are installed in places like convenience stores. These ATMs add their fee directly to the amount instead of showing up as a separate transaction or in your monthly banking fees. For example, you withdraw $100, and you are charged $101,50 plus Interac fees. If you manually entered that $100, the amounts won't match. You should set this to whatever is the maximum such fee in your area (in units of your local currency), so the transaction will be recognised as a match.</property>
+ <property name="invisible_char">â—</property>
+ <property name="text" translatable="yes">2,00</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">atm_fee_adj</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">2</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
+ <property name="value">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="pref/dialogs.import.generic/auto-clear-threshold">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">A transaction whose best match's score is in the green zone (above or equal to the Auto-CLEAR threshold) will be CLEARed by default.</property>
+ <property name="tooltip_text" translatable="yes">A transaction whose best match's score is in the green zone (above or equal to the Auto-CLEAR threshold) will be CLEARed by default.</property>
+ <property name="invisible_char">â—</property>
+ <property name="text" translatable="yes">6</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">auto_clear_adj</property>
+ <property name="climb_rate">1</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
+ <property name="value">6</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="pref/dialogs.import.generic/auto-add-threshold">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">A transaction whose best match's score is in the red zone (above the display threshold but below or equal to the Auto-ADD threshold) will be ADDed by default.</property>
+ <property name="tooltip_text" translatable="yes">A transaction whose best match's score is in the red zone (above the display threshold but below or equal to the Auto-ADD threshold) will be ADDed by default.</property>
+ <property name="invisible_char">â—</property>
+ <property name="text" translatable="yes">1</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">auto_add_adj</property>
+ <property name="climb_rate">1</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
+ <property name="value">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="pref/dialogs.import.generic/match-threshold">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">The minimum score a potential match must have to be displayed in the match list.</property>
+ <property name="tooltip_text" translatable="yes">The minimum score a potential match must have to be displayed in the match list.</property>
+ <property name="invisible_char">â—</property>
+ <property name="text" translatable="yes">1</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">match_adj</property>
+ <property name="climb_rate">1</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
+ <property name="value">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label847789">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Commercial ATM _fees threshold</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">pref/dialogs.import.generic/atm-fee-threshold</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label847788">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Auto-c_lear threshold</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">pref/dialogs.import.generic/auto-clear-threshold</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label847787">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Auto-_add threshold</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">pref/dialogs.import.generic/auto-add-threshold</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label847786">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Match _display threshold</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">pref/dialogs.import.generic/match-threshold</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="pref/dialogs.import.generic/use-bayes">
+ <property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Use _bayesian matching</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">Use bayesian algorithms to match new transactions with existing accounts.</property>
+ <property name="tooltip_text" translatable="yes">Use bayesian algorithms to match new transactions with existing accounts.</property>
+ <property name="halign">start</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="pref/dialogs.import.generic/auto-create-commodity">
+ <property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Automatically create new commodities</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 the automatic creation of new commodities if any unknown commodity is encountered during import. Otherwise the user will be asked what to do with each unknown commodity.</property>
+ <property name="tooltip_text" translatable="yes">Enables the automatic creation of new commodities if any unknown commodity is encountered during import. Otherwise the user will be asked what to do with each unknown commodity.</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">8</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Import</property>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
<child>
<object class="GtkGrid" id="table11">
<property name="visible">True</property>
@@ -1912,7 +2136,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Below the actual date, print the format of that date in 8 point type.</property>
<property name="tooltip_text" translatable="yes">Below the actual date, print the format of that date in 8 point type.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1931,7 +2154,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Print '***' before and after each text field on the check.</property>
<property name="tooltip_text" translatable="yes">Print '***' before and after each text field on the check.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1945,7 +2167,6 @@ many months before the current month:</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="label" translatable="yes">Default _font</property>
<property name="use_markup">True</property>
<property name="use_underline">True</property>
@@ -1967,7 +2188,7 @@ many months before the current month:</property>
</child>
</object>
<packing>
- <property name="position">4</property>
+ <property name="position">5</property>
</packing>
</child>
<child type="tab">
@@ -1978,7 +2199,7 @@ many months before the current month:</property>
<property name="label" translatable="yes">Printing</property>
</object>
<packing>
- <property name="position">4</property>
+ <property name="position">5</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -2012,7 +2233,6 @@ many months before the current month:</property>
<property name="tooltip_markup">If checked, pressing the 'Enter' key will move to the location of the blank transaction in the register. If clear, pressing the 'Enter' key will move down one row.</property>
<property name="tooltip_text" translatable="yes">If checked, pressing the 'Enter' key will move to the location of the blank transaction in the register. If clear, pressing the 'Enter' key will move down one row.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -2031,7 +2251,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Automatically raise the list of accounts or actions during input.</property>
<property name="tooltip_text" translatable="yes">Automatically raise the list of accounts or actions during input.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -2050,7 +2269,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Move to Transfer field when memorised transaction auto filled.</property>
<property name="tooltip_text" translatable="yes">Move to Transfer field when memorised transaction auto filled.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -2092,7 +2310,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Pre-check cleared transactions when creating a reconcile dialog.</property>
<property name="tooltip_text" translatable="yes">Pre-check cleared transactions when creating a reconcile dialog.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -2111,7 +2328,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Prior to reconciling an account which charges or pays interest, prompt the user to enter a transaction for the interest charge or payment. Currently only enabled for Bank, Credit, Mutual, Asset, Receivable, Payable, and Liability accounts.</property>
<property name="tooltip_text" translatable="yes">Prior to reconciling an account which charges or pays interest, prompt the user to enter a transaction for the interest charge or payment. Currently only enabled for Bank, Credit, Mutual, Asset, Receivable, Payable, and Liability accounts.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -2130,7 +2346,6 @@ many months before the current month:</property>
<property name="tooltip_markup">After reconciling a credit card statement, prompt the user to enter a credit card payment.</property>
<property name="tooltip_text" translatable="yes">After reconciling a credit card statement, prompt the user to enter a credit card payment.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -2149,7 +2364,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Always open the reconcile dialog using today's date for the statement date, regardless of previous reconciliations.</property>
<property name="tooltip_text" translatable="yes">Always open the reconcile dialog using today's date for the statement date, regardless of previous reconciliations.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -2191,7 +2405,6 @@ many months before the current month:</property>
<property name="tooltip_markup">GnuCash uses a yellow/green theme by default for register windows. Uncheck this if you want to use the system color theme instead.</property>
<property name="tooltip_text" translatable="yes">GnuCash uses a yellow/green theme by default for register windows. Uncheck this if you want to use the system color theme instead.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -2210,7 +2423,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Alternate the primary and secondary colors by transaction instead of by alternating by row.</property>
<property name="tooltip_text" translatable="yes">Alternate the primary and secondary colors by transaction instead of by alternating by row.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -2229,7 +2441,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Show horizontal borders on the cells.</property>
<property name="tooltip_text" translatable="yes">Show horizontal borders on the cells.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -2248,7 +2459,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Show vertical borders on the cells.</property>
<property name="tooltip_text" translatable="yes">Show vertical borders on the cells.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -2290,7 +2500,6 @@ many months before the current month:</property>
<property name="tooltip_markup">If checked, transactions with a date in the future will be displayed at the bottom of the register after the blank transaction. If clear, the blank transaction will be at the bottom of the register after all transactions.</property>
<property name="tooltip_text" translatable="yes">If checked, transactions with a date in the future will be displayed at the bottom of the register after the blank transaction. If clear, the blank transaction will be at the bottom of the register after all transactions.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -2301,7 +2510,7 @@ many months before the current month:</property>
</child>
</object>
<packing>
- <property name="position">5</property>
+ <property name="position">6</property>
</packing>
</child>
<child type="tab">
@@ -2312,7 +2521,7 @@ many months before the current month:</property>
<property name="label" translatable="yes">Register</property>
</object>
<packing>
- <property name="position">5</property>
+ <property name="position">6</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -2369,7 +2578,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Show all transactions on one line. (Two in double line mode.)</property>
<property name="tooltip_text" translatable="yes">Show all transactions on one line. (Two in double line mode.)</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -2389,7 +2597,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Automatically expand the current transaction to show all splits. All other transactions are shown on one line. (Two in double line mode.)</property>
<property name="tooltip_text" translatable="yes">Automatically expand the current transaction to show all splits. All other transactions are shown on one line. (Two in double line mode.)</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">pref/general.register/default-style-ledger</property>
@@ -2409,7 +2616,6 @@ many months before the current month:</property>
<property name="tooltip_markup">All transactions are expanded to show all splits.</property>
<property name="tooltip_text" translatable="yes">All transactions are expanded to show all splits.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">pref/general.register/default-style-ledger</property>
@@ -2424,7 +2630,6 @@ many months before the current month:</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="label" translatable="yes">Number of _transactions</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pref/general.register/max-transactions</property>
@@ -2442,6 +2647,7 @@ many months before the current month:</property>
<property name="tooltip_markup">Show this many transactions in a register. A value of zero means show all transactions.</property>
<property name="tooltip_text" translatable="yes">Show this many transactions in a register. A value of zero means show all transactions.</property>
<property name="invisible_char">â—</property>
+ <property name="text" translatable="yes">0</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="adjustment">max_transactions_adj</property>
@@ -2465,7 +2671,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Show two lines of information for each transaction instead of one. Does not affect expanded transactions.</property>
<property name="tooltip_text" translatable="yes">Show two lines of information for each transaction instead of one. Does not affect expanded transactions.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -2484,7 +2689,6 @@ many months before the current month:</property>
<property name="tooltip_markup">If checked, each register will be opened in its own top level window. If clear, the register will be opened in the current window.</property>
<property name="tooltip_text" translatable="yes">If checked, each register will be opened in its own top level window. If clear, the register will be opened in the current window.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -2503,7 +2707,6 @@ many months before the current month:</property>
<property name="tooltip_markup">If checked, only the names of the leaf accounts are displayed in the register and in the account selection popup. The default behaviour is to display the full name, including the path in the account tree. Checking this option implies that you use unique leaf names.</property>
<property name="tooltip_text" translatable="yes">If checked, only the names of the leaf accounts are displayed in the register and in the account selection popup. The default behaviour is to display the full name, including the path in the account tree. Checking this option implies that you use unique leaf names.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -2517,7 +2720,6 @@ many months before the current month:</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="label" translatable="yes" comments="Register2 feature">Number of _characters for auto complete</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pref/general.register/key-length</property>
@@ -2535,6 +2737,7 @@ many months before the current month:</property>
<property name="tooltip_markup">This sets the number of characters before auto complete starts for description, notes and memo fields.</property>
<property name="tooltip_text" translatable="yes" comments="Register2 feature">This sets the number of characters before auto complete starts for description, notes and memo fields.</property>
<property name="invisible_char">â—</property>
+ <property name="text" translatable="yes">2</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="adjustment">key_length_adj</property>
@@ -2542,6 +2745,7 @@ many months before the current month:</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
<property name="update_policy">if-valid</property>
+ <property name="value">2</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -2556,7 +2760,6 @@ many months before the current month:</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Show the date when the transaction was entered below the posted date and reconciled date on split row.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -2573,7 +2776,6 @@ many months before the current month:</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Show the calendar buttons Cancel, Today and Select.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -2590,7 +2792,6 @@ many months before the current month:</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">This will move the selection to the blank split when the transaction is expanded.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -2607,7 +2808,6 @@ many months before the current month:</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Show the entered date and reconciled date on transaction selection.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -2657,7 +2857,7 @@ many months before the current month:</property>
</child>
</object>
<packing>
- <property name="position">6</property>
+ <property name="position">7</property>
</packing>
</child>
<child type="tab">
@@ -2668,7 +2868,7 @@ many months before the current month:</property>
<property name="label" translatable="yes">Register Defaults</property>
</object>
<packing>
- <property name="position">6</property>
+ <property name="position">7</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -2737,7 +2937,6 @@ many months before the current month:</property>
<property name="tooltip_markup">If checked, each report will be opened in its own top level window. If clear, the report will be opened in the current window.</property>
<property name="tooltip_text" translatable="yes">If checked, each report will be opened in its own top level window. If clear, the report will be opened in the current window.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -2783,8 +2982,9 @@ many months before the current month:</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">On high resolution screens reports tend to be hard to read. This option allows you to scale reports up by the set factor. For example setting this to 2.0 will display reports at twice their typical size.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
+ <property name="text" translatable="yes">1</property>
<property name="adjustment">default_zoom_adj</property>
+ <property name="value">1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -2818,7 +3018,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Use the specified currency for all newly created reports.</property>
<property name="tooltip_text" translatable="yes">Use the specified currency for all newly created reports.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -2838,8 +3037,8 @@ many months before the current month:</property>
<property name="tooltip_markup">Use the system locale currency for all newly created reports.</property>
<property name="tooltip_text" translatable="yes">Use the system locale currency for all newly created reports.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
+ <property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -2870,7 +3069,7 @@ many months before the current month:</property>
</child>
</object>
<packing>
- <property name="position">7</property>
+ <property name="position">8</property>
</packing>
</child>
<child type="tab">
@@ -2881,7 +3080,7 @@ many months before the current month:</property>
<property name="label" translatable="yes">Reports</property>
</object>
<packing>
- <property name="position">7</property>
+ <property name="position">8</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -2925,7 +3124,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Save window size and location when it is closed.</property>
<property name="tooltip_text" translatable="yes">Save window size and location when it is closed.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -2945,7 +3143,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Closing a tab moves to the most recently visited tab.</property>
<property name="tooltip_text" translatable="yes">Closing a tab moves to the most recently visited tab.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -2988,7 +3185,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Display the notebook tabs at the top of the window.</property>
<property name="tooltip_text" translatable="yes">Display the notebook tabs at the top of the window.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -3008,7 +3204,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Display the notebook tabs at the bottom of the window.</property>
<property name="tooltip_text" translatable="yes">Display the notebook tabs at the bottom of the window.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">pref/general/tab-position-top</property>
@@ -3028,7 +3223,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Display the notebook tabs at the left of the window.</property>
<property name="tooltip_text" translatable="yes">Display the notebook tabs at the left of the window.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">pref/general/tab-position-top</property>
@@ -3048,7 +3242,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Display the notebook tabs at the right of the window.</property>
<property name="tooltip_text" translatable="yes">Display the notebook tabs at the right of the window.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">pref/general/tab-position-top</property>
@@ -3081,7 +3274,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Display the summary bar at the top of the page.</property>
<property name="tooltip_text" translatable="yes">Display the summary bar at the top of the page.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -3101,7 +3293,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Display the summary bar at the bottom of the page.</property>
<property name="tooltip_text" translatable="yes">Display the summary bar at the bottom of the page.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">pref/general/summarybar-position-top</property>
@@ -3144,7 +3335,6 @@ many months before the current month:</property>
<property name="tooltip_markup">Show a close button on each notebook tab. These function identically to the 'Close' menu item.</property>
<property name="tooltip_text" translatable="yes">Show a close button on each notebook tab. These function identically to the 'Close' menu item.</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -3166,11 +3356,13 @@ many months before the current month:</property>
<property name="tooltip_markup">If the text in the tab is longer than this value (the test is approximate) then the tab label will have the middle cut and replaced with an ellipsis.</property>
<property name="tooltip_text" translatable="yes">If the text in the tab is longer than this value (the test is approximate) then the tab label will have the middle cut and replaced with an ellipsis.</property>
<property name="invisible_char">â—</property>
+ <property name="text" translatable="yes">30</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="adjustment">tab_width_adj</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
+ <property name="value">30</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3201,7 +3393,6 @@ many months before the current month:</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="margin_left">12</property>
<property name="label" translatable="yes">_Width</property>
<property name="use_underline">True</property>
<property name="ellipsize">middle</property>
@@ -3231,7 +3422,7 @@ many months before the current month:</property>
</child>
</object>
<packing>
- <property name="position">8</property>
+ <property name="position">9</property>
</packing>
</child>
<child type="tab">
@@ -3242,7 +3433,7 @@ many months before the current month:</property>
<property name="label" translatable="yes">Windows</property>
</object>
<packing>
- <property name="position">8</property>
+ <property name="position">9</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -3279,7 +3470,7 @@ many months before the current month:</property>
</child>
</object>
<packing>
- <property name="position">9</property>
+ <property name="position">10</property>
</packing>
</child>
<child type="tab">
@@ -3290,7 +3481,7 @@ many months before the current month:</property>
<property name="label" translatable="yes">Online Quotes</property>
</object>
<packing>
- <property name="position">9</property>
+ <property name="position">10</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -3308,4 +3499,37 @@ many months before the current month:</property>
<action-widget response="-7">closebutton2</action-widget>
</action-widgets>
</object>
+ <object class="GtkAdjustment" id="max_transactions_adj">
+ <property name="upper">999999</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="new_search_limit_adj">
+ <property name="lower">1</property>
+ <property name="upper">100</property>
+ <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="retain_days_adj">
+ <property name="lower">1</property>
+ <property name="upper">99999</property>
+ <property name="value">30</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="save_on_close_adj">
+ <property name="lower">1</property>
+ <property name="upper">300</property>
+ <property name="value">20</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="tab_width_adj">
+ <property name="lower">1</property>
+ <property name="upper">100</property>
+ <property name="value">30</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
</interface>
diff --git a/gnucash/import-export/CMakeLists.txt b/gnucash/import-export/CMakeLists.txt
index cddad2994..84b49c8c8 100644
--- a/gnucash/import-export/CMakeLists.txt
+++ b/gnucash/import-export/CMakeLists.txt
@@ -24,7 +24,6 @@ set (generic_import_SOURCES
import-settings.c
import-main-matcher.c
import-pending-matches.c
- gncmod-generic-import.c
)
# Add dependency on config.h
@@ -45,26 +44,26 @@ set (generic_import_noinst_HEADERS
import-utilities.h
)
-add_library (gncmod-generic-import
+add_library (gnc-generic-import
${generic_import_SOURCES}
${generic_import_HEADERS}
${generic_import_noinst_HEADERS}
)
-target_link_libraries(gncmod-generic-import gncmod-gnome-utils gnc-engine PkgConfig::GTK3 ${GLIB2_LDFLAGS})
+target_link_libraries(gnc-generic-import gncmod-gnome-utils gnc-engine PkgConfig::GTK3 ${GLIB2_LDFLAGS})
-target_compile_definitions (gncmod-generic-import PRIVATE -DG_LOG_DOMAIN=\"gnc.import\")
+target_compile_definitions (gnc-generic-import PRIVATE -DG_LOG_DOMAIN=\"gnc.import\")
-target_include_directories(gncmod-generic-import PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(gnc-generic-import PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
if (APPLE)
- set_target_properties (gncmod-generic-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+ set_target_properties (gnc-generic-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
endif()
-install(TARGETS gncmod-generic-import
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
+install(TARGETS gnc-generic-import
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)
diff --git a/gnucash/import-export/aqb/CMakeLists.txt b/gnucash/import-export/aqb/CMakeLists.txt
index 30b7a481c..0d070f86e 100644
--- a/gnucash/import-export/aqb/CMakeLists.txt
+++ b/gnucash/import-export/aqb/CMakeLists.txt
@@ -55,7 +55,7 @@ if(WITH_AQBANKING)
endif()
target_link_libraries(gncmod-aqbanking gnc-gnome gncmod-gnome-utils
- gncmod-generic-import gncmod-register-core
+ gnc-generic-import gncmod-register-core
gncmod-register-gnome gncmod-ledger-core gnc-engine gwengui-gtk3
${AQB_EXPORT_SYMBOLS} ${AQBANKING_LDFLAGS}
${GWENHYWFAR_LDFLAGS} ${GWEN_GTK3_LDFLAGS}
diff --git a/gnucash/import-export/aqb/gncmod-aqbanking.c b/gnucash/import-export/aqb/gncmod-aqbanking.c
index dc288500c..e149acfe2 100644
--- a/gnucash/import-export/aqb/gncmod-aqbanking.c
+++ b/gnucash/import-export/aqb/gncmod-aqbanking.c
@@ -62,8 +62,7 @@ gint
libgncmod_aqbanking_gnc_module_init(gint refcount)
{
/* Load modules we depend on */
- if (!gnc_module_load("gnucash/gnome-utils", 0)
- || !gnc_module_load("gnucash/import-export", 0))
+ if (!gnc_module_load("gnucash/gnome-utils", 0))
{
return FALSE;
}
diff --git a/gnucash/import-export/aqb/test/CMakeLists.txt b/gnucash/import-export/aqb/test/CMakeLists.txt
index 1c35189c0..8dc2b2854 100644
--- a/gnucash/import-export/aqb/test/CMakeLists.txt
+++ b/gnucash/import-export/aqb/test/CMakeLists.txt
@@ -20,7 +20,7 @@ set(test_aqb_INCLUDE_DIRS
)
set(test_aqb_LIBS
- gncmod-aqbanking gncmod-generic-import gnc-gnome gncmod-gnome-utils
+ gncmod-aqbanking gnc-generic-import gnc-gnome gncmod-gnome-utils
gncmod-ledger-core gnc-app-utils
gncmod-backend-xml-utils gnc-engine gnc-core-utils gnc-module
${GLIB2_LDFLAGS}
diff --git a/gnucash/import-export/csv-exp/gncmod-csv-export.c b/gnucash/import-export/csv-exp/gncmod-csv-export.c
index 1435bf904..b868b15ce 100644
--- a/gnucash/import-export/csv-exp/gncmod-csv-export.c
+++ b/gnucash/import-export/csv-exp/gncmod-csv-export.c
@@ -63,10 +63,6 @@ libgncmod_csv_export_gnc_module_init(int refcount)
{
return FALSE;
}
- if (!gnc_module_load("gnucash/import-export", 0))
- {
- return FALSE;
- }
/* Add menu items with C callbacks */
gnc_plugin_csv_export_create_plugin();
diff --git a/gnucash/import-export/csv-imp/CMakeLists.txt b/gnucash/import-export/csv-imp/CMakeLists.txt
index 446c45e1d..92f6ff894 100644
--- a/gnucash/import-export/csv-imp/CMakeLists.txt
+++ b/gnucash/import-export/csv-imp/CMakeLists.txt
@@ -66,7 +66,7 @@ target_link_libraries(
gncmod-csv-import
${Boost_LIBRARIES}
${ICU4C_I18N_LDFLAGS}
- gncmod-generic-import
+ gnc-generic-import
gncmod-gnome-utils
gnc-app-utils
gnc-engine
diff --git a/gnucash/import-export/csv-imp/gncmod-csv-import.c b/gnucash/import-export/csv-imp/gncmod-csv-import.c
index e92cc5696..14992f64c 100644
--- a/gnucash/import-export/csv-imp/gncmod-csv-import.c
+++ b/gnucash/import-export/csv-imp/gncmod-csv-import.c
@@ -63,10 +63,6 @@ libgncmod_csv_import_gnc_module_init(int refcount)
{
return FALSE;
}
- if (!gnc_module_load("gnucash/import-export", 0))
- {
- return FALSE;
- }
/* Add menu items with C callbacks */
gnc_plugin_csv_import_create_plugin();
diff --git a/gnucash/import-export/gncmod-generic-import.c b/gnucash/import-export/gncmod-generic-import.c
deleted file mode 100644
index f1f1cd5dd..000000000
--- a/gnucash/import-export/gncmod-generic-import.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/**@internal
- at file
-\brief module definition/initialization for the generic import infrastructure
-\author Copyright (c) 2002 Benoit Grégoire bock at step.polymtl.ca
-*/
-/********************************************************************\
- * This program is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License as *
- * published by the Free Software Foundation; either version 2 of *
- * the License, or (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact: *
- * *
- * Free Software Foundation Voice: +1-617-542-5942 *
- * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
- * Boston, MA 02110-1301, USA gnu at gnu.org *
- * *
-\********************************************************************/
-
-
-#include <config.h>
-#include <gmodule.h>
-#include <glib/gi18n.h>
-
-#include "dialog-preferences.h"
-
-#include "gnc-module.h"
-#include "gnc-module-api.h"
-
-GNC_MODULE_API_DECL(libgncmod_generic_import)
-
-/* version of the gnc module system interface we require */
-int libgncmod_generic_import_gnc_module_system_interface = 0;
-
-/* module versioning uses libtool semantics. */
-int libgncmod_generic_import_gnc_module_current = 0;
-int libgncmod_generic_import_gnc_module_revision = 0;
-int libgncmod_generic_import_gnc_module_age = 0;
-
-char *
-libgncmod_generic_import_gnc_module_path(void)
-{
- return g_strdup("gnucash/import-export");
-}
-
-char *
-libgncmod_generic_import_gnc_module_description(void)
-{
- return g_strdup("Gnome GUI and C code for the generic import functions");
-}
-
-int
-libgncmod_generic_import_gnc_module_init(int refcount)
-{
- if (!gnc_module_load("gnucash/gnome-utils", 0))
- {
- return FALSE;
- }
-
- if (!refcount)
- {
- /* Add to preferences under Online Banking */
- /* The parameters are; glade file, items to add from glade file - last being the dialog, preference tab name */
- gnc_preferences_add_to_page("dialog-import.glade", "atm_fee_adj,auto_add_adj,auto_clear_adj,match_adj,matcher_prefs",
- _("Online Banking"));
- }
-
- return TRUE;
-}
-
-int
-libgncmod_generic_import_gnc_module_end(int refcount)
-{
- return TRUE;
-}
diff --git a/gnucash/import-export/log-replay/gncmod-log-replay.c b/gnucash/import-export/log-replay/gncmod-log-replay.c
index 777a41ece..ef5871c0f 100644
--- a/gnucash/import-export/log-replay/gncmod-log-replay.c
+++ b/gnucash/import-export/log-replay/gncmod-log-replay.c
@@ -65,10 +65,6 @@ libgncmod_log_replay_gnc_module_init(int refcount)
{
return FALSE;
}
- if (!gnc_module_load("gnucash/import-export", 0))
- {
- return FALSE;
- }
/* Add menu items with C callbacks */
gnc_plugin_log_replay_create_plugin();
diff --git a/gnucash/import-export/ofx/CMakeLists.txt b/gnucash/import-export/ofx/CMakeLists.txt
index 862190983..0bf5375c2 100644
--- a/gnucash/import-export/ofx/CMakeLists.txt
+++ b/gnucash/import-export/ofx/CMakeLists.txt
@@ -20,7 +20,7 @@ set(ofx_UI gnc-plugin-ofx-ui.xml)
if (WITH_OFX)
add_library(gncmod-ofx ${ofx_SOURCES} ${ofx_noinst_HEADERS})
- target_link_libraries(gncmod-ofx gncmod-generic-import gnc-engine gnc-app-utils gnc-core-utils
+ target_link_libraries(gncmod-ofx gnc-generic-import gnc-engine gnc-app-utils gnc-core-utils
gncmod-gnome-utils ${LIBOFX_LDFLAGS})
target_compile_definitions(gncmod-ofx PRIVATE -DG_LOG_DOMAIN=\"gnc.import.ofx\")
diff --git a/gnucash/import-export/ofx/gncmod-ofx-import.c b/gnucash/import-export/ofx/gncmod-ofx-import.c
index 9796cd87c..be0dd78fb 100644
--- a/gnucash/import-export/ofx/gncmod-ofx-import.c
+++ b/gnucash/import-export/ofx/gncmod-ofx-import.c
@@ -65,10 +65,6 @@ libgncmod_ofx_gnc_module_init(int refcount)
{
return FALSE;
}
- if (!gnc_module_load("gnucash/import-export", 0))
- {
- return FALSE;
- }
/* Add menu items with C callbacks */
gnc_plugin_ofx_create_plugin();
diff --git a/gnucash/import-export/qif-imp/gnc-plugin-qif-import.c b/gnucash/import-export/qif-imp/gnc-plugin-qif-import.c
index ccf568af9..756cf7c37 100644
--- a/gnucash/import-export/qif-imp/gnc-plugin-qif-import.c
+++ b/gnucash/import-export/qif-imp/gnc-plugin-qif-import.c
@@ -131,5 +131,5 @@ gnc_plugin_qif_import_create_plugin (void)
/* Add to preferences under Online Banking */
/* The parameters are; glade file, items to add from glade file - last being the dialog, preference tab name */
gnc_preferences_add_to_page ("dialog-account-picker.glade", "prefs_table",
- _("Online Banking"));
+ _("Import"));
}
diff --git a/gnucash/import-export/test/CMakeLists.txt b/gnucash/import-export/test/CMakeLists.txt
index 23688ea42..edbab9f3d 100644
--- a/gnucash/import-export/test/CMakeLists.txt
+++ b/gnucash/import-export/test/CMakeLists.txt
@@ -11,7 +11,7 @@ set(GENERIC_IMPORT_TEST_INCLUDE_DIRS
${GUILE_INCLUDE_DIRS}
)
-set(GENERIC_IMPORT_TEST_LIBS gncmod-generic-import gncmod-test-engine test-core)
+set(GENERIC_IMPORT_TEST_LIBS gnc-generic-import gncmod-test-engine test-core)
gnc_add_test_with_guile(test-import-parse test-import-parse.c
GENERIC_IMPORT_TEST_INCLUDE_DIRS GENERIC_IMPORT_TEST_LIBS
@@ -34,7 +34,7 @@ set(IMPORT_ACCOUNT_MATCHER_TEST_INCLUDE_DIRS
${GTEST_INCLUDE_DIR}
)
-set(IMPORT_ACCOUNT_MATCHER_TEST_LIBS gncmod-generic-import gnc-engine test-core gtest)
+set(IMPORT_ACCOUNT_MATCHER_TEST_LIBS gnc-generic-import gnc-engine test-core gtest)
gnc_add_test(test-import-account-matcher gtest-import-account-matcher.cpp
IMPORT_ACCOUNT_MATCHER_TEST_INCLUDE_DIRS IMPORT_ACCOUNT_MATCHER_TEST_LIBS)
diff --git a/gnucash/import-export/test/test-import-parse.c b/gnucash/import-export/test/test-import-parse.c
index 22d9880fd..89118c63c 100644
--- a/gnucash/import-export/test/test-import-parse.c
+++ b/gnucash/import-export/test/test-import-parse.c
@@ -177,7 +177,7 @@ static void
main_helper(void *closure, int argc, char **argv)
{
gnc_module_system_init ();
- gnc_module_load("gnucash/import-export", 0);
+ gnc_module_load("gnucash/gnome-utils", 0);
test_import_parse();
print_test_results();
exit(get_rv());
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0b27402aa..9680c4a69 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -323,7 +323,6 @@ gnucash/import-export/customer-import/dialog-customer-import.c
gnucash/import-export/customer-import/dialog-customer-import-gui.c
gnucash/import-export/customer-import/gncmod-customer-import.c
gnucash/import-export/customer-import/gnc-plugin-customer-import.c
-gnucash/import-export/gncmod-generic-import.c
gnucash/import-export/import-account-matcher.c
gnucash/import-export/import-backend.c
gnucash/import-export/import-commodity-matcher.c
commit 954c1a001d9b05a0d2fa14c04f399400727becf1
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Apr 18 18:16:13 2020 +0200
Convert gncmod-html module into ordinary shared library gnc-html
The module wasn't being used.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6735977ee..f34331761 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -883,7 +883,7 @@ if (WITH_SQL)
endif()
if (WITH_GNUCASH)
- list(APPEND _MODULES gnc-gnome)
+ list(APPEND _MODULES gnc-gnome gnc-html)
endif()
set_target_properties(${_MODULES} PROPERTIES
diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index 152383741..82347be81 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -139,12 +139,12 @@ add_library (gnc-gnome ${gnc_gnome_SOURCES} ${gnc_gnome_noinst_HEADERS} ${SWIG_G
target_link_libraries(gnc-gnome
gncmod-gnome-search
gncmod-ledger-core
- gncmod-html
gncmod-report
gncmod-register-gnome
gncmod-register-core
gncmod-gnome-utils
gnc-engine
+ gnc-html
gnc-locale-tax
gnucash-guile
${Boost_LIBRARIES}
diff --git a/gnucash/html/CMakeLists.txt b/gnucash/html/CMakeLists.txt
index d5b07a730..ff978ff6e 100644
--- a/gnucash/html/CMakeLists.txt
+++ b/gnucash/html/CMakeLists.txt
@@ -12,11 +12,10 @@ set (html_HEADERS
# Command to generate the swig-gnc-html.c wrapper file
gnc_add_swig_guile_command (swig-gnc-html-c
SWIG_GNC_HTML_C swig-gnc-html.c
- ${CMAKE_CURRENT_SOURCE_DIR}/gnc-html.i "" "${gncmod_html_HEADERS}"
+ ${CMAKE_CURRENT_SOURCE_DIR}/gnc-html.i "" "${html_HEADERS}"
)
set (html_SOURCES
- gncmod-html.c
gnc-html.c
gnc-html-history.c
gnc-html-factory.c
@@ -37,7 +36,7 @@ endif()
set (gnc_html_SCHEME html.scm)
set(GUILE_OUTPUT_DIR gnucash)
-set(GUILE_DEPENDS gncmod-html gnucash-guile)
+set(GUILE_DEPENDS gnc-html gnucash-guile)
gnc_add_scheme_targets(scm-gnc-html
SOURCES "${gnc_html_SCHEME}"
@@ -46,28 +45,28 @@ gnc_add_scheme_targets(scm-gnc-html
set_dist_list(html_DIST CMakeLists.txt ${html_HEADERS} ${html_SOURCES} gnc-html.i ${html_EXTRA_DIST} html.scm)
-add_library (gncmod-html
+add_library (gnc-html
${html_SOURCES}
${SWIG_GNC_HTML_C}
${html_HEADERS}
)
-target_link_libraries(gncmod-html gnc-engine gnc-module gncmod-gnome-utils
+target_link_libraries(gnc-html gnc-engine gnc-module gncmod-gnome-utils
PkgConfig::GTK3 PkgConfig::WEBKIT ${GUILE_LDFLAGS})
-target_compile_definitions(gncmod-html PRIVATE -DG_LOG_DOMAIN=\"gnc.html\")
+target_compile_definitions(gnc-html PRIVATE -DG_LOG_DOMAIN=\"gnc.html\")
-target_include_directories (gncmod-html
+target_include_directories (gnc-html
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
if (APPLE)
- set_target_properties (gncmod-html PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+ set_target_properties (gnc-html PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
endif()
-install(TARGETS gncmod-html
+install(TARGETS gnc-html
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/gnucash/html/gncmod-html.c b/gnucash/html/gncmod-html.c
deleted file mode 100644
index 31629d009..000000000
--- a/gnucash/html/gncmod-html.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*********************************************************************
- * gncmod-html.c
- * module definition/initialization for the html utilities
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
- *********************************************************************/
-/********************************************************************\
- * This program is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License as *
- * published by the Free Software Foundation; either version 2 of *
- * the License, or (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact: *
- * *
- * Free Software Foundation Voice: +1-617-542-5942 *
- * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
- * Boston, MA 02110-1301, USA gnu at gnu.org *
- * *
-\********************************************************************/
-
-
-#include <config.h>
-
-#include <gmodule.h>
-#include <libguile.h>
-#include <gtk/gtk.h>
-
-#include "gnc-module.h"
-#include "gnc-module-api.h"
-
-#include "gnc-html.h"
-#include "qof.h"
-
-GNC_MODULE_API_DECL(libgncmod_html)
-
-/* version of the gnc module system interface we require */
-int libgncmod_html_gnc_module_system_interface = 0;
-
-/* module versioning uses libtool semantics. */
-int libgncmod_html_gnc_module_current = 0;
-int libgncmod_html_gnc_module_revision = 0;
-int libgncmod_html_gnc_module_age = 0;
-
-
-char *
-libgncmod_html_gnc_module_path( void )
-{
- return g_strdup( "gnucash/html" );
-}
-
-char *
-libgncmod_html_gnc_module_description( void )
-{
- return g_strdup( "Utilities for using HTML with GnuCash" );
-}
-
-extern SCM scm_init_sw_gnc_html_module( void );
-
-int
-libgncmod_html_gnc_module_init( int refcount )
-{
- scm_init_sw_gnc_html_module();
- gnc_html_initialize();
- scm_c_use_module( "sw_gnc_html" );
-
- return TRUE;
-}
-
-int
-libgncmod_html_gnc_module_end( int refcount )
-{
- return TRUE;
-}
diff --git a/gnucash/html/html.scm b/gnucash/html/html.scm
index 6e39da28d..5d6d2a81a 100644
--- a/gnucash/html/html.scm
+++ b/gnucash/html/html.scm
@@ -29,7 +29,7 @@
;; Guile 2 needs to find the symbols from the extension at compile time already
(eval-when
(compile load eval expand)
- (load-extension "libgncmod-html" "scm_init_sw_gnc_html_module"))
+ (load-extension "libgnc-html" "scm_init_sw_gnc_html_module"))
(use-modules (sw_gnc_html))
; Export the swig-wrapped symbols in the public interface of this module
diff --git a/gnucash/report/stylesheets/CMakeLists.txt b/gnucash/report/stylesheets/CMakeLists.txt
index 991a12d7a..1dae163cc 100644
--- a/gnucash/report/stylesheets/CMakeLists.txt
+++ b/gnucash/report/stylesheets/CMakeLists.txt
@@ -11,7 +11,7 @@ set(GUILE_DEPENDS
scm-core-utils
scm-core-utils
scm-engine
- gncmod-html
+ gnc-html
scm-report
)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4fa177a6c..0b27402aa 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -273,7 +273,6 @@ gnucash/html/gnc-html-factory.c
gnucash/html/gnc-html-history.c
gnucash/html/gnc-html-webkit1.c
gnucash/html/gnc-html-webkit2.c
-gnucash/html/gncmod-html.c
gnucash/html/html.scm
gnucash/import-export/aqb/assistant-ab-initial.c
gnucash/import-export/aqb/assistant-ab-initial.glade
commit 6cedd0d7a677475bfe21265c683a05375c4dc923
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Apr 18 17:44:29 2020 +0200
Drop stray inclusion of (gnucash gnc-module)
Scheme code is no longer using gnc-module functionality
diff --git a/gnucash/price-quotes.scm b/gnucash/price-quotes.scm
index c86f047d1..c562987e9 100644
--- a/gnucash/price-quotes.scm
+++ b/gnucash/price-quotes.scm
@@ -27,7 +27,6 @@
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
-(use-modules (gnucash gnc-module))
(use-modules (gnucash core-utils))
(use-modules (gnucash app-utils))
(use-modules (gnucash gnome-utils))
Summary of changes:
CMakeLists.txt | 2 +-
bindings/python/CMakeLists.txt | 4 +-
cmake/configure-manpage.cmake | 3 +-
data/accounts/C/CMakeLists.txt | 4 +-
data/accounts/ca/CMakeLists.txt | 5 +-
data/accounts/cs/CMakeLists.txt | 5 +-
data/accounts/da/CMakeLists.txt | 5 +-
data/accounts/de_AT/CMakeLists.txt | 5 +-
data/accounts/de_CH/CMakeLists.txt | 5 +-
data/accounts/de_DE/CMakeLists.txt | 5 +-
data/accounts/el_GR/CMakeLists.txt | 5 +-
data/accounts/en_GB/CMakeLists.txt | 5 +-
data/accounts/en_IN/CMakeLists.txt | 4 +-
data/accounts/es_ES/CMakeLists.txt | 5 +-
data/accounts/es_MX/CMakeLists.txt | 4 +-
data/accounts/fi_FI/CMakeLists.txt | 5 +-
data/accounts/fr_BE/CMakeLists.txt | 5 +-
data/accounts/fr_CA/CMakeLists.txt | 4 +-
data/accounts/fr_CH/CMakeLists.txt | 5 +-
data/accounts/fr_FR/CMakeLists.txt | 5 +-
data/accounts/he/CMakeLists.txt | 4 +-
data/accounts/hr/CMakeLists.txt | 4 +-
data/accounts/hu/CMakeLists.txt | 4 +-
data/accounts/it/CMakeLists.txt | 5 +-
data/accounts/ja/CMakeLists.txt | 4 +-
data/accounts/ko/CMakeLists.txt | 5 +-
data/accounts/lt/CMakeLists.txt | 5 +-
data/accounts/lv/CMakeLists.txt | 5 +-
data/accounts/nb/CMakeLists.txt | 5 +-
data/accounts/nl/CMakeLists.txt | 5 +-
data/accounts/pl/CMakeLists.txt | 5 +-
data/accounts/pt_BR/CMakeLists.txt | 4 +-
data/accounts/pt_PT/CMakeLists.txt | 4 +-
data/accounts/ru/CMakeLists.txt | 4 +-
data/accounts/sk/CMakeLists.txt | 4 +-
data/accounts/sv_AX/CMakeLists.txt | 4 +-
data/accounts/sv_FI/CMakeLists.txt | 5 +-
data/accounts/sv_SE/CMakeLists.txt | 5 +-
data/accounts/tr_TR/CMakeLists.txt | 5 +-
data/accounts/zh_CN/CMakeLists.txt | 5 +-
data/accounts/zh_HK/CMakeLists.txt | 5 +-
data/accounts/zh_TW/CMakeLists.txt | 5 +-
data/checks/CMakeLists.txt | 4 +-
doc/CMakeLists.txt | 4 +-
doc/tip_of_the_day.list.c | 2 +-
gnucash/gnome-utils/dialog-preferences.c | 4 +
gnucash/gnome/CMakeLists.txt | 2 +-
gnucash/gtkbuilder/CMakeLists.txt | 4 +-
gnucash/gtkbuilder/dialog-import.glade | 282 ------------
gnucash/gtkbuilder/dialog-preferences.glade | 476 +++++++++++++++------
gnucash/html/CMakeLists.txt | 17 +-
gnucash/html/gncmod-html.c | 79 ----
gnucash/html/html.scm | 2 +-
gnucash/import-export/CMakeLists.txt | 17 +-
gnucash/import-export/aqb/CMakeLists.txt | 13 +-
gnucash/import-export/aqb/gncmod-aqbanking.c | 3 +-
gnucash/import-export/aqb/test/CMakeLists.txt | 2 +-
gnucash/import-export/csv-exp/gncmod-csv-export.c | 4 -
gnucash/import-export/csv-imp/CMakeLists.txt | 2 +-
gnucash/import-export/csv-imp/gncmod-csv-import.c | 4 -
gnucash/import-export/gncmod-generic-import.c | 81 ----
.../import-export/log-replay/gncmod-log-replay.c | 4 -
gnucash/import-export/ofx/CMakeLists.txt | 7 +-
gnucash/import-export/ofx/gncmod-ofx-import.c | 4 -
.../import-export/qif-imp/gnc-plugin-qif-import.c | 2 +-
gnucash/import-export/test/CMakeLists.txt | 4 +-
gnucash/import-export/test/test-import-parse.c | 2 +-
gnucash/price-quotes.scm | 1 -
gnucash/python/CMakeLists.txt | 6 +-
gnucash/report/stylesheets/CMakeLists.txt | 2 +-
gnucash/ui/CMakeLists.txt | 4 +-
libgnucash/backend/xml/gncmod-backend-xml.cpp | 81 ----
po/POTFILES.in | 2 -
po/POTFILES.skip | 1 -
74 files changed, 557 insertions(+), 756 deletions(-)
delete mode 100644 gnucash/html/gncmod-html.c
delete mode 100644 gnucash/import-export/gncmod-generic-import.c
delete mode 100644 libgnucash/backend/xml/gncmod-backend-xml.cpp
More information about the gnucash-changes
mailing list