gnucash master: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Wed Jun 12 09:26:07 EDT 2019
Updated via https://github.com/Gnucash/gnucash/commit/3d150de1 (commit)
via https://github.com/Gnucash/gnucash/commit/c1324304 (commit)
via https://github.com/Gnucash/gnucash/commit/d3e03ff6 (commit)
via https://github.com/Gnucash/gnucash/commit/8aa69622 (commit)
from https://github.com/Gnucash/gnucash/commit/9ec5eab7 (commit)
commit 3d150de16f7104da7107a0715505a871033fafe0
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Jun 8 15:01:41 2019 +0200
Bump minimum Gtk version to 3.18
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0724673b5..0b4645867 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -225,7 +225,7 @@ if (WITH_GNUCASH)
endif (NOT WEBKIT2_4_FOUND)
endif (WIN32 OR APPLE)
- pkg_check_modules (GTK3 REQUIRED gtk+-3.0>=3.10.0)
+ pkg_check_modules (GTK3 REQUIRED gtk+-3.0>=3.18.0)
endif (WITH_GNUCASH)
pkg_check_modules (ZLIB REQUIRED zlib)
diff --git a/borrowed/goffice/go-optionmenu.c b/borrowed/goffice/go-optionmenu.c
index 3636decc9..e4b350bc4 100644
--- a/borrowed/goffice/go-optionmenu.c
+++ b/borrowed/goffice/go-optionmenu.c
@@ -428,16 +428,8 @@ static void go_option_menu_init(GOOptionMenu *option_menu)
option_menu->button_label = GTK_LABEL(gtk_label_new(""));
gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(option_menu->button_label), FALSE, TRUE, 0);
-#if GTK_CHECK_VERSION(3,14,0)
arrow = gtk_image_new_from_icon_name ("go-down", GTK_ICON_SIZE_BUTTON);
-#else
- arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
-#endif
-#if GTK_CHECK_VERSION(3,12,0)
gtk_widget_set_margin_start (GTK_WIDGET(arrow), 5);
-#else
- gtk_widget_set_margin_left (GTK_WIDGET(arrow), 5);
-#endif
gtk_box_pack_end(GTK_BOX(box), arrow, FALSE, FALSE, 0);
diff --git a/gnucash/gnome-utils/dialog-options.c b/gnucash/gnome-utils/dialog-options.c
index 4b22bdefe..3e44c3ab2 100644
--- a/gnucash/gnome-utils/dialog-options.c
+++ b/gnucash/gnome-utils/dialog-options.c
@@ -1219,11 +1219,7 @@ gnc_option_create_currency_accounting_widget (char *name, GNCOption *option)
gtk_widget_set_halign (GTK_WIDGET(vbox), GTK_ALIGN_FILL);
gtk_widget_set_hexpand (GTK_WIDGET(vbox), TRUE);
-#if GTK_CHECK_VERSION(3,12,0)
gtk_widget_set_margin_end (GTK_WIDGET(vbox), 12);
-#else
- gtk_widget_set_margin_right (GTK_WIDGET(vbox), 12);
-#endif
gtk_widget_set_margin_bottom (GTK_WIDGET(vbox), 12);
/* Iterate over the three options and create a radio button for each one */
@@ -1309,11 +1305,7 @@ gnc_option_create_currency_accounting_widget (char *name, GNCOption *option)
gtk_box_pack_start (GTK_BOX (book_currency_data->book_currency_vbox),
book_currency_data->book_currency_table,
TRUE, TRUE, 0);
-#if GTK_CHECK_VERSION(3,12,0)
gtk_widget_set_margin_start (GTK_WIDGET(book_currency_data->book_currency_table), 12);
-#else
- gtk_widget_set_margin_left (GTK_WIDGET(book_currency_data->book_currency_table), 12);
-#endif
gtk_grid_set_row_spacing (GTK_GRID (policy_table), 6);
gtk_grid_set_column_spacing (GTK_GRID (policy_table), 6);
@@ -1336,11 +1328,7 @@ gnc_option_create_currency_accounting_widget (char *name, GNCOption *option)
gtk_box_pack_start (GTK_BOX (book_currency_data->book_currency_vbox),
policy_table, TRUE, TRUE, 0);
-#if GTK_CHECK_VERSION(3,12,0)
gtk_widget_set_margin_start (GTK_WIDGET(policy_table), 12);
-#else
- gtk_widget_set_margin_left (GTK_WIDGET(policy_table), 12);
-#endif
book_currency_data->gain_loss_account_table = gtk_grid_new ();
gtk_grid_set_row_spacing (GTK_GRID (book_currency_data->gain_loss_account_table), 6);
gtk_grid_set_column_spacing (GTK_GRID (book_currency_data->gain_loss_account_table), 6);
@@ -1358,11 +1346,7 @@ gnc_option_create_currency_accounting_widget (char *name, GNCOption *option)
gtk_box_pack_start (GTK_BOX (book_currency_data->book_currency_vbox),
book_currency_data->gain_loss_account_table,
TRUE, TRUE, 0);
-#if GTK_CHECK_VERSION(3,12,0)
gtk_widget_set_margin_start (GTK_WIDGET(book_currency_data->gain_loss_account_table), 12);
-#else
- gtk_widget_set_margin_left (GTK_WIDGET(book_currency_data->gain_loss_account_table), 12);
-#endif
gtk_grid_attach (GTK_GRID(table), book_currency_data->book_currency_vbox, 1, 2, 1, 1);
}
else /* trading or neither */
diff --git a/gnucash/gnome-utils/dialog-utils.c b/gnucash/gnome-utils/dialog-utils.c
index b1e94e999..39d307ef5 100644
--- a/gnucash/gnome-utils/dialog-utils.c
+++ b/gnucash/gnome-utils/dialog-utils.c
@@ -325,12 +325,8 @@ gnc_window_adjust_for_screen(GtkWindow * window)
void
gnc_label_set_alignment (GtkWidget *widget, gfloat xalign, gfloat yalign)
{
-#if GTK_CHECK_VERSION(3,16,0)
gtk_label_set_xalign (GTK_LABEL (widget), xalign);
gtk_label_set_yalign (GTK_LABEL (widget), yalign);
-#else
- gtk_misc_set_alignment (GTK_MISC (widget), xalign, yalign);
-#endif
}
/********************************************************************\
diff --git a/gnucash/gnome-utils/gnc-combott.c b/gnucash/gnome-utils/gnc-combott.c
index 9f2af1ce4..74515e849 100644
--- a/gnucash/gnome-utils/gnc-combott.c
+++ b/gnucash/gnome-utils/gnc-combott.c
@@ -204,11 +204,7 @@ gnc_combott_init (GncCombott *combott)
g_signal_connect (G_OBJECT (arrow), "draw",
G_CALLBACK (gnc_draw_arrow_cb), GINT_TO_POINTER(1));
-#if GTK_CHECK_VERSION(3,12,0)
gtk_widget_set_margin_start (GTK_WIDGET(arrow), 5);
-#else
- gtk_widget_set_margin_left (GTK_WIDGET(arrow), 5);
-#endif
gtk_box_pack_end (GTK_BOX (hbox), arrow, FALSE, FALSE, 0);
sep = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
diff --git a/gnucash/gnome-utils/gnc-dense-cal.c b/gnucash/gnome-utils/gnc-dense-cal.c
index eb7864d8b..371706b01 100644
--- a/gnucash/gnome-utils/gnc-dense-cal.c
+++ b/gnucash/gnome-utils/gnc-dense-cal.c
@@ -292,11 +292,7 @@ gnc_dense_cal_init(GncDenseCal *dcal)
gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE);
gtk_widget_set_halign (label, GTK_ALIGN_END);
-#if GTK_CHECK_VERSION(3,12,0)
gtk_widget_set_margin_end (label, 5);
-#else
- gtk_widget_set_margin_right (label, 5);
-#endif
gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(dcal->view_options), FALSE, FALSE, 0);
@@ -338,11 +334,7 @@ gnc_dense_cal_init(GncDenseCal *dcal)
gtk_widget_set_name (GTK_WIDGET(dcal->transPopup), "dense-cal-popup");
l = gtk_label_new(_("Date: "));
-#if GTK_CHECK_VERSION(3,12,0)
gtk_widget_set_margin_start (l, 5);
-#else
- gtk_widget_set_margin_left (l, 5);
-#endif
gtk_container_add(GTK_CONTAINER(hbox), l);
l = gtk_label_new("YY/MM/DD");
g_object_set_data(G_OBJECT(dcal->transPopup), "dateLabel", l);
diff --git a/gnucash/gnome-utils/gnc-gnome-utils.c b/gnucash/gnome-utils/gnc-gnome-utils.c
index b9066ab35..87631690f 100644
--- a/gnucash/gnome-utils/gnc-gnome-utils.c
+++ b/gnucash/gnome-utils/gnc-gnome-utils.c
@@ -166,33 +166,6 @@ gnc_configure_date_completion (void)
qof_date_completion_set(dc, backmonths);
}
-/* This function was copied from GTK3.22 as it was only introduced in
- * version 3.16 */
-#if !GTK_CHECK_VERSION(3,16,0)
-static void
-gtk_css_provider_load_from_resource (GtkCssProvider *css_provider,
- const gchar *resource_path)
-{
- GFile *file;
- gchar *uri, *escaped;
-
- g_return_if_fail (GTK_IS_CSS_PROVIDER (css_provider));
- g_return_if_fail (resource_path != NULL);
-
- escaped = g_uri_escape_string (resource_path,
- G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, FALSE);
- uri = g_strconcat ("resource://", escaped, NULL);
- g_free (escaped);
-
- file = g_file_new_for_uri (uri);
- g_free (uri);
-
- gtk_css_provider_load_from_file (css_provider, file, NULL);
-
- g_object_unref (file);
-}
-#endif
-
void
gnc_add_css_file (void)
{
diff --git a/gnucash/gnome-utils/gnc-main-window.c b/gnucash/gnome-utils/gnc-main-window.c
index bc9a38e36..fc0fea38f 100644
--- a/gnucash/gnome-utils/gnc-main-window.c
+++ b/gnucash/gnome-utils/gnc-main-window.c
@@ -2949,11 +2949,7 @@ gnc_main_window_open_page (GncMainWindow *window,
image = gtk_image_new_from_icon_name (icon, GTK_ICON_SIZE_MENU);
gtk_widget_show (image);
gtk_box_pack_start (GTK_BOX (tab_hbox), image, FALSE, FALSE, 0);
-#if GTK_CHECK_VERSION(3,12,0)
gtk_widget_set_margin_start (GTK_WIDGET(image), 5);
-#else
- gtk_widget_set_margin_left (GTK_WIDGET(image), 5);
-#endif
gtk_box_pack_start (GTK_BOX (tab_hbox), label, TRUE, TRUE, 0);
}
else
@@ -3003,11 +2999,7 @@ gnc_main_window_open_page (GncMainWindow *window,
G_CALLBACK(gnc_main_window_close_page), page);
gtk_box_pack_start (GTK_BOX (tab_hbox), close_button, FALSE, FALSE, 0);
-#if GTK_CHECK_VERSION(3,12,0)
gtk_widget_set_margin_end (GTK_WIDGET(close_button), 5);
-#else
- gtk_widget_set_margin_right (GTK_WIDGET(close_button), 5);
-#endif
g_object_set_data (G_OBJECT (page), PLUGIN_PAGE_CLOSE_BUTTON, close_button);
}
diff --git a/gnucash/gnome-utils/gnc-period-select.c b/gnucash/gnome-utils/gnc-period-select.c
index fe27a54f5..c9368fa86 100644
--- a/gnucash/gnome-utils/gnc-period-select.c
+++ b/gnucash/gnome-utils/gnc-period-select.c
@@ -329,11 +329,7 @@ gnc_period_select_set_date_common (GncPeriodSelect *period, const GDate *date)
if (priv->date_label == NULL)
{
priv->date_label = gtk_label_new("");
-#if GTK_CHECK_VERSION(3,12,0)
gtk_widget_set_margin_start (GTK_WIDGET(priv->date_label), 6);
-#else
- gtk_widget_set_margin_left (GTK_WIDGET(priv->date_label), 6);
-#endif
gtk_box_pack_start(GTK_BOX(period), priv->date_label, TRUE, TRUE, 0);
gtk_widget_show_all(priv->date_label);
}
diff --git a/gnucash/gnome/assistant-loan.cpp b/gnucash/gnome/assistant-loan.cpp
index 5c84a2c4a..97419d6f7 100644
--- a/gnucash/gnome/assistant-loan.cpp
+++ b/gnucash/gnome/assistant-loan.cpp
@@ -753,12 +753,7 @@ gnc_loan_assistant_create( LoanAssistantData *ldd )
rouid = ldd->repayOptsUI[i];
vb = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
gtk_box_set_homogeneous (GTK_BOX (vb), FALSE);
-
-#if GTK_CHECK_VERSION(3, 12, 0)
gtk_widget_set_margin_start (GTK_WIDGET(vb), 12);
-#else
- gtk_widget_set_margin_left (GTK_WIDGET(vb), 12);
-#endif
/* Add payment checkbox. */
@@ -782,12 +777,8 @@ gnc_loan_assistant_create( LoanAssistantData *ldd )
FALSE );
gtk_box_pack_start( GTK_BOX(vb), GTK_WIDGET(rouid->escrowCb), FALSE, FALSE, 2 );
-
-#if GTK_CHECK_VERSION(3, 12, 0)
gtk_widget_set_margin_start (GTK_WIDGET(rouid->escrowCb), 12);
-#else
- gtk_widget_set_margin_left (GTK_WIDGET(rouid->escrowCb), 12);
-#endif
+
g_signal_connect( rouid->optCb, "toggled",
G_CALLBACK(loan_opt_toggled_cb),
rouid );
diff --git a/gnucash/gnome/window-reconcile.c b/gnucash/gnome/window-reconcile.c
index cdec7b93a..c622b6979 100644
--- a/gnucash/gnome/window-reconcile.c
+++ b/gnucash/gnome/window-reconcile.c
@@ -1202,12 +1202,7 @@ gnc_reconcile_window_create_view_box(Account *account,
label = gtk_label_new("");
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
*total_save = label;
-
-#if GTK_CHECK_VERSION(3,12,0)
gtk_widget_set_margin_end (GTK_WIDGET(label), 10 + nat_sb.width);
-#else
- gtk_widget_set_margin_right (GTK_WIDGET(label), 10 + nat_sb.width);
-#endif
return vbox;
}
@@ -1973,13 +1968,8 @@ recnWindowWithBalance (GtkWidget *parent, Account *account, gnc_numeric new_endi
gint recn_widthc = gnc_reconcile_view_get_column_width (GNC_RECONCILE_VIEW(recnData->credit), REC_RECN);
gint recn_widthd = gnc_reconcile_view_get_column_width (GNC_RECONCILE_VIEW(recnData->debit), REC_RECN);
-#if GTK_CHECK_VERSION(3,12,0)
gtk_widget_set_margin_end (GTK_WIDGET(recnData->total_credit), 10 + recn_widthc);
gtk_widget_set_margin_end (GTK_WIDGET(recnData->total_debit), 10 + recn_widthd);
-#else
- gtk_widget_set_margin_right (GTK_WIDGET(recnData->total_credit), 10 + recn_widthc);
- gtk_widget_set_margin_right (GTK_WIDGET(recnData->total_debit), 10 + recn_widthd);
-#endif
}
return recnData;
}
diff --git a/gnucash/gnome/window-reconcile2.c b/gnucash/gnome/window-reconcile2.c
index 96648f564..b9118cd12 100644
--- a/gnucash/gnome/window-reconcile2.c
+++ b/gnucash/gnome/window-reconcile2.c
@@ -1153,11 +1153,7 @@ gnc_reconcile_window_create_view_box (Account *account,
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
*total_save = label;
-#if GTK_CHECK_VERSION(3,12,0)
gtk_widget_set_margin_end (GTK_WIDGET(label), 10);
-#else
- gtk_widget_set_margin_right (GTK_WIDGET(label), 10);
-#endif
return vbox;
}
diff --git a/gnucash/register/register-gnome/gnucash-item-edit.c b/gnucash/register/register-gnome/gnucash-item-edit.c
index f57f49fd3..8e86919d7 100644
--- a/gnucash/register/register-gnome/gnucash-item-edit.c
+++ b/gnucash/register/register-gnome/gnucash-item-edit.c
@@ -854,17 +854,10 @@ gnc_item_edit_new (GnucashSheet *sheet)
gtk_entry_set_has_frame (GTK_ENTRY(item_edit->editor), FALSE);
#if !GTK_CHECK_VERSION(3,20,0)
-#if GTK_CHECK_VERSION(3,12,0)
gtk_widget_set_margin_start (GTK_WIDGET(item_edit->editor),
gnc_item_edit_get_margin (item_edit, left));
gtk_widget_set_margin_end (GTK_WIDGET(item_edit->editor),
gnc_item_edit_get_margin (item_edit, right));
-#else
- gtk_widget_set_margin_left (GTK_WIDGET(item_edit->editor),
- gnc_item_edit_get_margin (item_edit, left));
- gtk_widget_set_margin_right (GTK_WIDGET(item_edit->editor),
- gnc_item_edit_get_margin (item_edit, right));
-#endif
gtk_widget_set_margin_top (GTK_WIDGET(item_edit->editor),
gnc_item_edit_get_margin (item_edit, top));
gtk_widget_set_margin_bottom (GTK_WIDGET(item_edit->editor),
commit c1324304cadd3ed270ab00999121d26b0ec69ee4
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Jun 8 14:38:17 2019 +0200
Use Ubuntu 16.04 as oldest testbed on travis
This needed a few tweaks to the docker file worth mentioning:
- tzdata is not installed by default, resulting in test-gnc-timezone to fail
- there were a couple of debconf warnings
* missing apt-utils package => added it to the list
* no interactive terminal for autoremove => forced non-interactive mode
- in addition I have made building the docker file more verbose in order
to catch such issues more easily in the future. If this turns out to be
too distracting I can undo that part again.
diff --git a/.travis.yml b/.travis.yml
index 31c025abb..9372a44ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ language: c++
compiler: gcc
env:
- BUILDENV=arch BUILDTYPE=cmake-ninja
- - BUILDENV=ubuntu-14.04 BUILDTYPE=cmake-make
+ - BUILDENV=ubuntu-16.04 BUILDTYPE=cmake-make
services:
- docker
install:
diff --git a/util/ci/ubuntu-14.04-docker b/util/ci/ubuntu-14.04-docker
deleted file mode 100644
index f78833185..000000000
--- a/util/ci/ubuntu-14.04-docker
+++ /dev/null
@@ -1,10 +0,0 @@
-from ubuntu:14.04
-run sed -i"" "s/^# deb-src/deb-src/" /etc/apt/sources.list
-run apt-get update -qq
-run apt-get build-dep -qq gnucash > /dev/null
-run apt-get install -qq git bash-completion cmake3 make swig xsltproc libdbd-sqlite3 texinfo ninja-build libboost-all-dev libgtk-3-dev libwebkit2gtk-3.0-dev > /dev/null
-run apt-get --reinstall install -qq language-pack-en language-pack-fr
-run git clone https://github.com/google/googletest -b release-1.8.0 gtest
-copy ubuntu-14.04-testscript afterfailure commonbuild /
-run chmod +x /ubuntu-14.04-testscript /afterfailure /commonbuild
-entrypoint /ubuntu-14.04-testscript
diff --git a/util/ci/ubuntu-16.04-docker b/util/ci/ubuntu-16.04-docker
new file mode 100644
index 000000000..5f2a79d42
--- /dev/null
+++ b/util/ci/ubuntu-16.04-docker
@@ -0,0 +1,19 @@
+from ubuntu:16.04
+# Travis' ubuntu docker images don't have any package sources enabled by default
+# So start by enabling what we need
+run sed -i"" "s/^# deb-src/deb-src/" /etc/apt/sources.list
+run apt-get update -y
+# Note all apt-get commands will be run with DEBIAN_FRONTEND=noninteractive
+# to silence a bunch of warnings
+# See https://stackoverflow.com/questions/22466255/is-it-possible-to-answer-dialog-questions-when-installing-under-docker for details
+# And install apt-utils to silence another set of warnings
+# See https://github.com/phusion/baseimage-docker/issues/319 for a similar discussion
+run DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends apt-utils
+run DEBIAN_FRONTEND=noninteractive apt-get upgrade -y
+run DEBIAN_FRONTEND=noninteractive apt-get build-dep -y gnucash
+run DEBIAN_FRONTEND=noninteractive apt-get install -y git bash-completion cmake make swig xsltproc libdbd-sqlite3 texinfo ninja-build libboost-all-dev libgtk-3-dev libwebkit2gtk-3.0-dev tzdata
+run DEBIAN_FRONTEND=noninteractive apt-get --reinstall install -y language-pack-en language-pack-fr
+run git clone https://github.com/google/googletest -b release-1.8.0 gtest
+copy ubuntu-16.04-testscript afterfailure commonbuild /
+run chmod +x /ubuntu-16.04-testscript /afterfailure /commonbuild
+entrypoint /ubuntu-16.04-testscript
diff --git a/util/ci/ubuntu-14.04-testscript b/util/ci/ubuntu-16.04-testscript
similarity index 100%
rename from util/ci/ubuntu-14.04-testscript
rename to util/ci/ubuntu-16.04-testscript
commit d3e03ff6629e3f9bfd80cba1d8d02c0e9d6c8ff7
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Jun 8 15:54:41 2019 +0200
Drop code to migrate preferences from gconf to gsettings
This change was introduced in 2.6. Anyone wishing to migrate from 2.4 to 4 should
first pass via 2.6 and/or 3 anyway so this code will never be used again for 4.x
diff --git a/gnucash/gschemas/org.gnucash.gschema.xml.in b/gnucash/gschemas/org.gnucash.gschema.xml.in
index 5ac217e0d..99acfcf4c 100644
--- a/gnucash/gschemas/org.gnucash.gschema.xml.in
+++ b/gnucash/gschemas/org.gnucash.gschema.xml.in
@@ -70,11 +70,6 @@
<summary>Force prices to display as decimals even if they must be rounded.</summary>
<description>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.</description>
</key>
- <key name="migrate-prefs-done" type="b">
- <default>false</default>
- <summary>Tool to migrate preferences from old backend (GConf) to new one (GSettings) has run successfully.</summary>
- <description>GnuCash switched to another backend to store user preferences between 2.4 and 2.6. To smooth the transition, most preferences will be migrated the first time a 2.6 version of GnuCash is run. This migration should only run once. This preference keeps track whether or not this migration tool has run successfully.</description>
- </key>
<key name="retain-type-never" type="b">
<default>false</default>
<summary>Do not create log/backup files.</summary>
diff --git a/gnucash/import-export/aqb/CMakeLists.txt b/gnucash/import-export/aqb/CMakeLists.txt
index 3c37b75d5..74cc2d327 100644
--- a/gnucash/import-export/aqb/CMakeLists.txt
+++ b/gnucash/import-export/aqb/CMakeLists.txt
@@ -91,7 +91,7 @@ endif()
DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
endif(WITH_AQBANKING)
-set_local_dist(aqbanking_DIST_local CMakeLists.txt migratable-prefs-aqbanking.xml
+set_local_dist(aqbanking_DIST_local CMakeLists.txt
${aqbanking_SOURCES} ${aqbanking_noinst_HEADERS} ${aqbanking_EXTRA_DIST}
${aqbanking_GLADE} ${aqbanking_UI})
diff --git a/gnucash/import-export/aqb/migratable-prefs-aqbanking.xml b/gnucash/import-export/aqb/migratable-prefs-aqbanking.xml
deleted file mode 100644
index 25805fa77..000000000
--- a/gnucash/import-export/aqb/migratable-prefs-aqbanking.xml
+++ /dev/null
@@ -1,45 +0,0 @@
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.import.hbci</gschemaid>
- <gconfpath>dialogs-import-hbci.xml</gconfpath>
-
- <pref>
- <gschemaname>close-on-finish</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>close_on_finish</gconfkey>
- </pref>
- <pref>
- <gschemaname>remember-pin</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>remember_pin</gconfkey>
- </pref>
- <pref>
- <gschemaname>verbose-debug</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>verbose_debug</gconfkey>
- </pref>
- <pref>
- <gschemaname>format-dtaus</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>format_dtaus</gconfkey>
- </pref>
- <pref>
- <gschemaname>format-csv</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>format_csv</gconfkey>
- </pref>
- <pref>
- <gschemaname>format-swift-mt940</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>format_swift_mt940</gconfkey>
- </pref>
- <pref>
- <gschemaname>format-swift-mt942</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>format_swift_mt942</gconfkey>
- </pref>
- <pref>
- <gschemaname>last-path</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>last_path</gconfkey>
- </pref>
- </prefsgroup>
diff --git a/gnucash/import-export/ofx/CMakeLists.txt b/gnucash/import-export/ofx/CMakeLists.txt
index 0d1ea93b0..2d968e735 100644
--- a/gnucash/import-export/ofx/CMakeLists.txt
+++ b/gnucash/import-export/ofx/CMakeLists.txt
@@ -42,5 +42,5 @@ endif()
DESTINATION ${DATADIR_BUILD}/gnucash/ui)
endif()
-set_local_dist(ofx_DIST_local CMakeLists.txt migratable-prefs-ofx.xml ${ofx_SOURCES} ${ofx_noinst_HEADERS} ${ofx_UI})
+set_local_dist(ofx_DIST_local CMakeLists.txt ${ofx_SOURCES} ${ofx_noinst_HEADERS} ${ofx_UI})
set(ofx_DIST ${ofx_DIST_local} ${test_ofx_DIST} ${ofx_gschema_DIST} PARENT_SCOPE)
diff --git a/gnucash/import-export/ofx/migratable-prefs-ofx.xml b/gnucash/import-export/ofx/migratable-prefs-ofx.xml
deleted file mode 100644
index 39f89b289..000000000
--- a/gnucash/import-export/ofx/migratable-prefs-ofx.xml
+++ /dev/null
@@ -1,10 +0,0 @@
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.import.ofx</gschemaid>
- <gconfpath>dialogs-import-ofx.xml</gconfpath>
-
- <pref>
- <gschemaname>last-path</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>last_path</gconfkey>
- </pref>
- </prefsgroup>
diff --git a/libgnucash/app-utils/CMakeLists.txt b/libgnucash/app-utils/CMakeLists.txt
index e293ea476..fd156c8fd 100644
--- a/libgnucash/app-utils/CMakeLists.txt
+++ b/libgnucash/app-utils/CMakeLists.txt
@@ -149,22 +149,6 @@ endif()
install(FILES ${app_utils_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnucash)
-if (WITH_OFX)
- file(READ ${CMAKE_SOURCE_DIR}/gnucash/import-export/ofx/migratable-prefs-ofx.xml MIGRATABLE_PREFS_OFX)
-endif()
-
-if (WITH_AQBANKING)
- file(READ ${CMAKE_SOURCE_DIR}/gnucash/import-export/aqb/migratable-prefs-aqbanking.xml MIGRATABLE_PREFS_AQBANKING)
-endif()
-
-set(MIGRATABLE_PREFS_XML ${DATADIR_BUILD}/gnucash/migratable-prefs.xml)
-file(COPY make-prefs-migration-script.xsl DESTINATION ${DATADIR_BUILD}/gnucash)
-
-configure_file(migratable-prefs.xml.in ${MIGRATABLE_PREFS_XML})
-
-install(FILES ${MIGRATABLE_PREFS_XML} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash)
-install(FILES make-prefs-migration-script.xsl DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash)
-
# And now handle scheme files
set (app_utils_SCHEME_2
@@ -176,7 +160,6 @@ set (app_utils_SCHEME_1
business-options.scm
c-interface.scm
date-utilities.scm
- migrate-prefs.scm
options.scm
prefs.scm
simple-obj.scm
@@ -227,6 +210,5 @@ add_custom_target(scm-app-utils ALL DEPENDS scm-app-utils-3 scm-app-utils-2 scm-
set_local_dist(app_utils_DIST_local
${app_utils_ALL_SOURCES} gettext.scm ${app_utils_SCHEME_1} ${app_utils_SCHEME_2} ${app_utils_SCHEME_3}
- app-utils.i CMakeLists.txt gnc-help-utils.c
- make-prefs-migration-script.xsl migratable-prefs.xml.in README)
+ app-utils.i CMakeLists.txt gnc-help-utils.c README)
set(app_utils_DIST ${app_utils_DIST_local} ${test_app_utils_DIST} PARENT_SCOPE)
diff --git a/libgnucash/app-utils/gnc-gsettings.c b/libgnucash/app-utils/gnc-gsettings.c
index 9c144aa7c..f93e8d335 100644
--- a/libgnucash/app-utils/gnc-gsettings.c
+++ b/libgnucash/app-utils/gnc-gsettings.c
@@ -47,8 +47,6 @@
#define CLIENT_TAG "%s-%s-client"
#define NOTIFY_TAG "%s-%s-notify_id"
-#define GNC_PREF_MIGRATE_PREFS_DONE "migrate-prefs-done"
-
static GHashTable *schema_hash = NULL;
static const gchar *gsettings_prefix;
static xmlExternalEntityLoader defaultEntityLoader = NULL;
@@ -658,228 +656,6 @@ void gnc_gsettings_load_backend (void)
LEAVE("Prefsbackend bind = %p", prefsbackend->bind);
}
-/* Attempt to migrate preferences from gconf files
- to gsettings if not already done so */
-
-/* This snippet is borrowed from the xsltproc source
- * and adapted to help the xsl transform find our temporary
- * files in $HOME/.gnc-migration-tmp/
- */
-static xmlParserInputPtr
-xsltprocExternalEntityLoader(const char *URL, const char *ID,
- xmlParserCtxtPtr ctxt)
-{
- xmlParserInputPtr ret;
- warningSAXFunc warning = NULL;
- xmlChar *newURL;
- gchar *tmpdir = g_build_filename (g_get_home_dir (), ".gnc-migration-tmp", NULL);
-
- const char *lastsegment = URL;
- const char *iter = URL;
-
- while (*iter != 0)
- {
- if (*iter == '/')
- lastsegment = iter + 1;
- iter++;
- }
-
- if ((ctxt != NULL) && (ctxt->sax != NULL))
- {
- warning = ctxt->sax->warning;
- ctxt->sax->warning = NULL;
- }
-
- if (defaultEntityLoader != NULL)
- {
- ret = defaultEntityLoader(URL, ID, ctxt);
- if (ret != NULL)
- {
- if (warning != NULL)
- ctxt->sax->warning = warning;
- return(ret);
- }
- }
-
- newURL = xmlStrdup((const xmlChar *) tmpdir);
- newURL = xmlStrcat(newURL, (const xmlChar *) "/");
- newURL = xmlStrcat(newURL, (const xmlChar *) lastsegment);
- g_free (tmpdir);
- if (newURL != NULL)
- {
- ret = defaultEntityLoader((const char *)newURL, ID, ctxt);
- if (ret != NULL)
- {
- if (warning != NULL)
- ctxt->sax->warning = warning;
- xmlFree(newURL);
- return(ret);
- }
- xmlFree(newURL);
- }
- if (warning != NULL)
- {
- ctxt->sax->warning = warning;
- if (URL != NULL)
- DEBUG ("External entity \"%s\" not loaded", URL);
- else if (ID != NULL)
- DEBUG ("External entity \"%s\" not loaded", ID);
- }
- return(NULL);
-}
-
-/* Tool to migrate existing user settings from GConf to GSettings
- *
- * This tool will first run some sanity checks to see if migration
- * is necessary/possible. The actual migration works directly from
- * the GConf .xml files. Using an xsl transform it will convert them
- * in a guile script to set most settings found.
- *
- * Notes:
- * - due to some limitations in the xslt code, all the gconf xml files are
- * first copied into a temporary directory. After the migration has finished,
- * that temporary directory and its contents are removed.
- * - not all settings can be migrated. All the important ones are though.
- * The ones that are missing are mostly with respect to window position
- * and size.
- * - column widths/visibilities, sorting orders,... are no longer stored
- * in gsettings, so these will obviously not be migrated either.
- * - upon a successful run, a flag will be set to prevent the migration
- * from running again. So in normal circumstances the migration will
- * be executed only once.
- */
-static void gnc_gsettings_migrate_from_gconf (void)
-{
- gchar *pkgdatadir, *stylesheet, *input, *output, *command;
- gchar *gconf_root, *gconf_apps, *gconf_gnucash;
- gchar *base_dir, *iter;
- SCM migr_script;
- xsltStylesheetPtr stylesheetptr = NULL;
- xmlDocPtr inputxml, transformedxml;
- FILE *outfile;
- gboolean migration_ok = FALSE;
-
- ENTER ();
-
- base_dir = g_strdup (g_get_home_dir ());
- for (iter = base_dir; *iter != 0; iter++)
- {
- if ( *iter == '\\')
- *iter = '/';
- }
-
- /* Only attempt to migrate if there is something to migrate */
- gconf_root = g_build_filename(base_dir, ".gconf", NULL);
- gconf_apps = g_build_filename(gconf_root, "apps", NULL);
- gconf_gnucash = g_build_filename(gconf_apps, "gnucash", NULL);
- migration_ok = (g_file_test (gconf_root, G_FILE_TEST_IS_DIR) &&
- g_file_test (gconf_apps, G_FILE_TEST_IS_DIR) &&
- g_file_test (gconf_gnucash, G_FILE_TEST_IS_DIR));
- g_free (gconf_root);
- g_free (gconf_apps);
- g_free (gconf_gnucash);
- if (!migration_ok)
- {
- g_free (base_dir);
- gnc_gsettings_set_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_MIGRATE_PREFS_DONE, TRUE);
- PINFO ("No pre-existing GConf gnucash section found.\n"
- "Most likely this system never ran GnuCash before.\n"
- "Assume migration is not needed.");
- LEAVE ();
- return;
- }
-
- pkgdatadir = gnc_path_get_pkgdatadir();
- stylesheet = g_build_filename(pkgdatadir, "make-prefs-migration-script.xsl", NULL);
- input = g_build_filename(pkgdatadir, "migratable-prefs.xml", NULL);
- g_free (pkgdatadir);
-
- migration_ok = (g_file_test (stylesheet, G_FILE_TEST_IS_REGULAR) &&
- g_file_test (input, G_FILE_TEST_IS_REGULAR));
- if (!migration_ok)
- {
- /* Critical files not found, abort migration */
- g_free (base_dir);
- g_free (stylesheet);
- g_free (input);
- PWARN ("Migration input file and stylesheet missing. Skip migration.");
- return;
- }
-
- command = g_strconcat ("(use-modules (migrate-prefs))(migration-prepare \"",
- base_dir, "\")", NULL);
- DEBUG ("command = %s", command);
- migration_ok = scm_is_true (scm_eval_string (scm_from_utf8_string (command)));
- g_free (command);
- if (!migration_ok)
- {
- /* Preparation step failed */
- g_free (base_dir);
- g_free (stylesheet);
- g_free (input);
- PWARN ("Migration preparation step failed. Skip migration.");
- LEAVE ();
- return;
- }
-
- output = g_build_filename(base_dir, ".gnc-migration-tmp", "migrate-prefs-user.scm", NULL);
- xmlSubstituteEntitiesDefault(1);
- xmlLoadExtDtdDefaultValue = 1;
- defaultEntityLoader = xmlGetExternalEntityLoader();
- xmlSetExternalEntityLoader(xsltprocExternalEntityLoader);
- stylesheetptr = xsltParseStylesheetFile((const xmlChar *)stylesheet);
- inputxml = xmlParseFile(input);
- transformedxml = xsltApplyStylesheet(stylesheetptr, inputxml, NULL);
-
- outfile = fopen(output, "w");
- xsltSaveResultToFile(outfile, transformedxml, stylesheetptr);
- fclose(outfile);
-
- xsltFreeStylesheet(stylesheetptr);
- xmlFreeDoc(inputxml);
- xmlFreeDoc(transformedxml);
-
- xsltCleanupGlobals();
- xmlCleanupParser();
- g_free (stylesheet);
- g_free (input);
-
- migr_script = scm_from_locale_string (output);
- scm_primitive_load (migr_script);
- g_free (output);
-
- migration_ok = scm_is_true (scm_c_eval_string ("(use-modules (migrate-prefs-user))(run-migration)"));
- if (!migration_ok)
- {
- /* Actual migration step failed */
- g_free (base_dir);
- PWARN ("Actual migration step failed. Skip migration.");
- LEAVE ();
- return;
- }
-
- /* If we got here, the preferences were migrated successfully
- * Mark this success in gsettings, so we won't run the migration again.
- */
- gnc_gsettings_set_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_MIGRATE_PREFS_DONE, TRUE);
-
- /* All that is left now is to cleanup... */
- command = g_strconcat ("(use-modules (migrate-prefs))(migration-cleanup \"",
- base_dir, "\")", NULL);
- DEBUG ("command = %s", command);
- migration_ok = scm_is_true (scm_eval_string (scm_from_utf8_string (command)));
- g_free (command);
- if (!migration_ok) /* Cleanup step failed, not critical */
- PWARN ("Cleanup step failed. You may need to delete %s/.gnc-migration-tmp manually.", base_dir);
- else
- PINFO ("Preferences migration completed successfully");
-
- LEAVE ("");
- g_free (base_dir);
-
-}
-
-
void gnc_gsettings_version_upgrade (void)
{
/* Use versioning to ensure this routine will only sync once for each
@@ -887,10 +663,6 @@ void gnc_gsettings_version_upgrade (void)
int old_maj_min = gnc_gsettings_get_int (GNC_PREFS_GROUP_GENERAL, GNC_PREF_VERSION);
int cur_maj_min = GNUCASH_MAJOR_VERSION * 100 + GNUCASH_MINOR_VERSION;
- /* Migrate preferences from gconf to gsettings */
- if (!gnc_gsettings_get_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_MIGRATE_PREFS_DONE))
- gnc_gsettings_migrate_from_gconf ();
-
/* Convert settings to 3.0 compatibility level */
if (old_maj_min < 207)
{
diff --git a/libgnucash/app-utils/make-prefs-migration-script.xsl b/libgnucash/app-utils/make-prefs-migration-script.xsl
deleted file mode 100644
index 8fccf5cd3..000000000
--- a/libgnucash/app-utils/make-prefs-migration-script.xsl
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:df="http://dateformats.data">
-<xsl:output method="text" encoding="UTF8"/>
-
-<!-- Configure lookup table for date format -->
-<xsl:key name="datefmt-lookup" match="df:dateformat" use="df:name"/>
-<xsl:variable name="dateformats-top" select="document('')/*/df:dateformats"/>
-
-<!-- Primary template - process each prefence group -->
-<xsl:template match="/">
-<!-- Write file header -->
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; migrate-prefs.scm
-;;; Custom generated script to migrate user preferences from
-;;; gconf to gsettings. This should only be run once -
-;;; when running GnuCash 2.6.x for the first time.
-;;;
-;;; Copyright 2013 Geert Janssens <geert at kobaltwit.be>
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define-module (migrate-prefs-user))
-
-(use-modules (gnucash core-utils))
-;(use-modules (gnucash gnc-module))
-;; Guile 2 needs to find the symbols from the c module at compile time already
-;(eval-when
-; (compile load eval)
-; (load-extension "libgnc-core-utils" "scm_init_sw_core_utils_module"))
-;(use-modules (sw_core_utils))
-
-(define (run-migration-internal)
- <xsl:for-each select="//prefsgroup">
- <xsl:if test="document(gconfpath)//entry">
-;; Processing preferences in group <xsl:value-of select="gschemaid"/>
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
- <xsl:variable name="gconf-top" select="document(gconfpath)/gconf"/>
- <xsl:apply-templates select="./pref"/>
- </xsl:if>
- </xsl:for-each>
-
-(display "Preference migration has finished")(newline)
-)
-
-(define (run-migration)
- (catch #t
- run-migration-internal
- (lambda args
- (display (string-append
- "An error occurred while migrating preferences."
- (newline) "The error is: "
- (symbol->string key) " - " (car (caddr args)) "."))
- #f))
-)
-
-(export run-migration)
-</xsl:template>
-
-<!-- Process one prefence -->
-<xsl:template match="pref">
- <xsl:variable name="gconf-top" select="document(../gconfpath)/gconf"/>
- <xsl:apply-templates select="$gconf-top">
- <xsl:with-param name="curr-pref" select="."/>
- </xsl:apply-templates>
-</xsl:template>
-
-<!-- Find the equivalent entry in gconf -->
-<xsl:template match="gconf">
- <xsl:param name="curr-pref"/>
- <xsl:for-each select="entry">
- <xsl:if test="@name = $curr-pref/gconfkey">
-;; Processing preference <xsl:value-of select="$curr-pref/gschemaname"/>
- <xsl:apply-templates select=".">
- <xsl:with-param name="curr-pref" select="$curr-pref"/>
- </xsl:apply-templates>
- </xsl:if>
- </xsl:for-each>
-</xsl:template>
-
-<!-- Determine next action based on preference type -->
-<xsl:template match="entry">
- <xsl:param name="curr-pref"/>
- <xsl:choose>
- <xsl:when test="$curr-pref/gschematype = 'b'"><xsl:if test="./@value">
-;; Gconf value (boolean): <xsl:value-of select="./@value"/>
-(gnc-prefs-set-bool
- ; preference group
- "<xsl:value-of select="$curr-pref/../gschemaid"/>"
- ; preference name
- "<xsl:value-of select="$curr-pref/gschemaname"/>"
- ; preference value
- <xsl:if test="./@value = 'true'">#t</xsl:if>
- <xsl:if test="./@value = 'false'">#f</xsl:if>
-)
- </xsl:if></xsl:when>
-
-
- <xsl:when test="$curr-pref/gschematype = 'datefmt'"><xsl:if test="./stringvalue">
-;; Gconf value (string): "<xsl:value-of select="./stringvalue"/>" -> gsettings (integer)
-(gnc-prefs-set-int
- ; preference group
- "<xsl:value-of select="$curr-pref/../gschemaid"/>"
- ; preference name
- "<xsl:value-of select="$curr-pref/gschemaname"/>"
- ; preference value
- <xsl:apply-templates select="$dateformats-top">
- <xsl:with-param name="curr-entry" select="."/>
- </xsl:apply-templates>
-)
- </xsl:if></xsl:when>
-
-
- <xsl:when test="$curr-pref/gschematype = '(dd)'">
-;; Type: pair of decimals (stored in Gconf as list of floats)
-(let ((coords '()))
- <xsl:for-each select="./li">
- (set! coords (append coords '(<xsl:value-of select="./@value"/>)))
- </xsl:for-each>
- (if (> (length coords) 1)
- (gnc-prefs-set-coords
- ; preference group
- "<xsl:value-of select="$curr-pref/../gschemaid"/>"
- ; preference name
- "<xsl:value-of select="$curr-pref/gschemaname"/>"
- ; x coord
- (car coords)
- ; y coord
- (cadr coords))))
- </xsl:when>
-
-
- <xsl:when test="$curr-pref/gschematype = 'd'"><xsl:if test="./@value">
-;; Gconf value (decimal): <xsl:value-of select="./@value"/>
-(gnc-prefs-set-float
- ; preference group
- "<xsl:value-of select="$curr-pref/../gschemaid"/>"
- ; preference name
- "<xsl:value-of select="$curr-pref/gschemaname"/>"
- ; preference value
- <xsl:value-of select="./@value"/>
-)
- </xsl:if></xsl:when>
-
-
- <xsl:when test="$curr-pref/gschematype = 'i'"><xsl:if test="./@value">
-;; Gconf value (integer): <xsl:value-of select="./@value"/>
-(gnc-prefs-set-int
- ; preference group
- "<xsl:value-of select="$curr-pref/../gschemaid"/>"
- ; preference name
- "<xsl:value-of select="$curr-pref/gschemaname"/>"
- ; preference value
- <xsl:value-of select="./@value"/>
-)
- </xsl:if></xsl:when>
-
-
- <xsl:when test="$curr-pref/gschematype = 's2b'"><xsl:if test="./stringvalue">
-;; Gconf value (string): "<xsl:value-of select="./stringvalue"/>" -> gsettings (boolean)
-(let ((suffix (string-delete "<xsl:value-of select="./stringvalue"/>" #\_)))
- (gnc-prefs-set-bool
- ; preference group
- "<xsl:value-of select="$curr-pref/../gschemaid"/>"
- ; preference name
- "<xsl:value-of select="$curr-pref/gschemaname"/>"
- ; preference value
- (string-suffix? (string-append "-" suffix) "<xsl:value-of select="$curr-pref/gschemaname"/>")))
- </xsl:if></xsl:when>
-
-
- <xsl:when test="$curr-pref/gschematype = 's'"><xsl:if test="./stringvalue">
-;; Gconf value (string): "<xsl:value-of select="./stringvalue"/>"
-(gnc-prefs-set-string
- ; preference group
- "<xsl:value-of select="$curr-pref/../gschemaid"/>"
- ; preference name
- "<xsl:value-of select="$curr-pref/gschemaname"/>"
- ; preference value
- "<xsl:value-of select="translate(./stringvalue, $win, $mingw)"/>"
-)
- </xsl:if></xsl:when>
-
-
- <xsl:when test="$curr-pref/gschematype = 'x'"><xsl:if test="./@value">
-;; Gconf value (64bit integer): <xsl:value-of select="./@value"/>
-(gnc-prefs-set-int64
- ; preference group
- "<xsl:value-of select="$curr-pref/../gschemaid"/>"
- ; preference name
- "<xsl:value-of select="$curr-pref/gschemaname"/>"
- ; preference value
- <xsl:value-of select="./@value"/>
-)
- </xsl:if></xsl:when>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="df:dateformats">
- <xsl:param name="curr-entry"/>
- <xsl:value-of select="key('datefmt-lookup', $curr-entry/stringvalue)/df:index"/>
-</xsl:template>
-
-<xsl:variable name="win" select="'\'" />
-<xsl:variable name="mingw" select="'/'" />
-
-
-<df:dateformats>
- <df:dateformat><df:name>us</df:name><df:index>0</df:index></df:dateformat>
- <df:dateformat><df:name>uk</df:name><df:index>1</df:index></df:dateformat>
- <df:dateformat><df:name>ce</df:name><df:index>2</df:index></df:dateformat>
- <df:dateformat><df:name>iso</df:name><df:index>3</df:index></df:dateformat>
- <df:dateformat><df:name>locale</df:name><df:index>4</df:index></df:dateformat>
-</df:dateformats>
-
-</xsl:stylesheet>
diff --git a/libgnucash/app-utils/migratable-prefs.xml.in b/libgnucash/app-utils/migratable-prefs.xml.in
deleted file mode 100644
index fdb9f14c9..000000000
--- a/libgnucash/app-utils/migratable-prefs.xml.in
+++ /dev/null
@@ -1,1006 +0,0 @@
-<prefs>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.commodities</gschemaid>
- <gconfpath>dialogs-edit_commodities.xml</gconfpath>
-
- <pref>
- <gschemaname>include-iso</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>include_iso</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.totd</gschemaid>
- <gconfpath>dialogs-tip_of_the_day.xml</gconfpath>
-
- <pref>
- <gschemaname>current-tip</gschemaname>
- <gschematype>i</gschematype>
- <gconfkey>current_tip</gconfkey>
- </pref>
- <pref>
- <gschemaname>show-at-startup</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>show_at_startup</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.reconcile</gschemaid>
- <gconfpath>dialogs-reconcile.xml</gconfpath>
-
- <pref>
- <gschemaname>check-cleared</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>check_cleared</gconfkey>
- </pref>
- <pref>
- <gschemaname>auto-interest-transfer</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>auto_interest_transfer</gconfkey>
- </pref>
- <pref>
- <gschemaname>auto-cc-payment</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>auto_cc_payment</gconfkey>
- </pref>
- <pref>
- <gschemaname>always-reconcile-to-today</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>always_reconcile_to_today</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.tax-info</gschemaid>
- <gconfpath>dialogs-tax_info.xml</gconfpath>
-
- <pref>
- <gschemaname>paned-position</gschemaname>
- <gschematype>i</gschematype>
- <gconfkey>paned_position</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.find</gschemaid>
- <gconfpath>dialogs-find.xml</gconfpath>
-
- <pref>
- <gschemaname>search-for-active-only</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>search_for_active_only</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.export-accounts</gschemaid>
- <gconfpath>dialogs-export_accounts.xml</gconfpath>
-
- <pref>
- <gschemaname>last-path</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>last_path</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.log-replay</gschemaid>
- <gconfpath>dialogs-log_replay.xml</gconfpath>
-
- <pref>
- <gschemaname>last-path</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>last_path</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.open-save</gschemaid>
- <gconfpath>dialogs-open_save.xml</gconfpath>
-
- <pref>
- <gschemaname>last-path</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>last_path</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.report</gschemaid>
- <gconfpath>dialogs-report.xml</gconfpath>
-
- <pref>
- <gschemaname>last-path</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>last_path</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.lot-viewer</gschemaid>
- <gconfpath>dialogs-lot_viewer.xml</gconfpath>
-
- <pref>
- <gschemaname>hpane-position</gschemaname>
- <gschematype>i</gschematype>
- <gconfkey>hpane_position</gconfkey>
- </pref>
- <pref>
- <gschemaname>vpane-position</gschemaname>
- <gschematype>i</gschematype>
- <gconfkey>vpane_position</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.new-user</gschemaid>
- <gconfpath>dialogs-new_user.xml</gconfpath>
-
- <pref>
- <gschemaname>first-startup</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>first_startup</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.new-hierarchy</gschemaid>
- <gconfpath>dialogs-new_hierarchy.xml</gconfpath>
-
- <pref>
- <gschemaname>show-on-new-file</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>show_on_new_file</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.search</gschemaid>
- <gconfpath>dialogs-search.xml</gconfpath>
-
- <pref>
- <gschemaname>new-search-limit</gschemaname>
- <gschematype>d</gschematype>
- <gconfkey>new_search_limit</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.sxs.since-last-run</gschemaid>
- <gconfpath>dialogs-scheduled_trans-since_last_run.xml</gconfpath>
-
- <pref>
- <gschemaname>show-at-file-open</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>show_at_file_open</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.sxs.transaction-editor</gschemaid>
- <gconfpath>dialogs-scheduled_trans-transaction_editor.xml</gconfpath>
-
- <pref>
- <gschemaname>create-auto</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>create_auto</gconfkey>
- </pref>
- <pref>
- <gschemaname>create-days</gschemaname>
- <gschematype>d</gschematype>
- <gconfkey>create_days</gconfkey>
- </pref>
- <pref>
- <gschemaname>notify</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>notify</gconfkey>
- </pref>
- <pref>
- <gschemaname>remind-days</gschemaname>
- <gschematype>d</gschematype>
- <gconfkey>remind_days</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.window.pages.account-tree.summary</gschemaid>
- <gconfpath>window-pages-account_tree-summary.xml</gconfpath>
-
- <pref>
- <gschemaname>grand-total</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>grand_total</gconfkey>
- </pref>
- <pref>
- <gschemaname>non-currency</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>non_currency</gconfkey>
- </pref>
- <pref>
- <gschemaname>start-choice-relative</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>start_choice</gconfkey>
- </pref>
- <pref>
- <gschemaname>start-choice-absolute</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>start_choice</gconfkey>
- </pref>
- <pref>
- <gschemaname>start-date</gschemaname>
- <gschematype>x</gschematype>
- <gconfkey>start_date</gconfkey>
- </pref>
- <pref>
- <gschemaname>start-period</gschemaname>
- <gschematype>i</gschematype>
- <gconfkey>start_period</gconfkey>
- </pref>
- <pref>
- <gschemaname>end-choice-relative</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>end_choice</gconfkey>
- </pref>
- <pref>
- <gschemaname>end-choice-absolute</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>end_choice</gconfkey>
- </pref>
- <pref>
- <gschemaname>end-date</gschemaname>
- <gschematype>x</gschematype>
- <gconfkey>end_date</gconfkey>
- </pref>
- <pref>
- <gschemaname>end-period</gschemaname>
- <gschematype>i</gschematype>
- <gconfkey>end_period</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.general</gschemaid>
- <gconfpath>general.xml</gconfpath>
-
- <pref>
- <gschemaname>save-window-geometry</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>save_window_geometry</gconfkey>
- </pref>
- <pref>
- <gschemaname>account-separator</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>account_separator</gconfkey>
- </pref>
- <pref>
- <gschemaname>file-compression</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>file_compression</gconfkey>
- </pref>
- <pref>
- <gschemaname>autosave-show-explanation</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>autosave_show_explanation</gconfkey>
- </pref>
- <pref>
- <gschemaname>autosave-interval-minutes</gschemaname>
- <gschematype>d</gschematype>
- <gconfkey>autosave_interval_minutes</gconfkey>
- </pref>
- <pref>
- <gschemaname>negative-in-red</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>negative_in_red</gconfkey>
- </pref>
- <pref>
- <gschemaname>auto-decimal-point</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>auto_decimal_point</gconfkey>
- </pref>
- <pref>
- <gschemaname>auto-decimal-places</gschemaname>
- <gschematype>i</gschematype>
- <gconfkey>auto_decimal_places</gconfkey>
- </pref>
- <pref>
- <gschemaname>retain-type-never</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>retain_type</gconfkey>
- </pref>
- <pref>
- <gschemaname>retain-type-days</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>retain_type</gconfkey>
- </pref>
- <pref>
- <gschemaname>retain-type-forever</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>retain_type</gconfkey>
- </pref>
- <pref>
- <gschemaname>retain-days</gschemaname>
- <gschematype>d</gschematype>
- <gconfkey>retain_days</gconfkey>
- </pref>
- <pref>
- <gschemaname>reversed-accounts-none</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>reversed_accounts</gconfkey>
- </pref>
- <pref>
- <gschemaname>reversed-accounts-credit</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>reversed_accounts</gconfkey>
- </pref>
- <pref>
- <gschemaname>reversed-accounts-incomeexpense</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>reversed_accounts</gconfkey>
- </pref>
- <pref>
- <gschemaname>show-account-color</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>show_account_color</gconfkey>
- </pref>
- <pref>
- <gschemaname>show-account-color-tabs</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>show_account_color_tabs</gconfkey>
- </pref>
- <pref>
- <gschemaname>use-accounting-labels</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>use_accounting_labels</gconfkey>
- </pref>
- <pref>
- <gschemaname>tab-close-buttons</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>tab_close_buttons</gconfkey>
- </pref>
- <pref>
- <gschemaname>tab-width</gschemaname>
- <gschematype>d</gschematype>
- <gconfkey>tab_width</gconfkey>
- </pref>
- <pref>
- <gschemaname>currency-choice-locale</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>currency_choice</gconfkey>
- </pref>
- <pref>
- <gschemaname>currency-choice-other</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>currency_choice</gconfkey>
- </pref>
- <pref>
- <gschemaname>currency-other</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>currency_other</gconfkey>
- </pref>
- <pref>
- <gschemaname>clock-24h</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>24hour_clock</gconfkey>
- </pref>
- <pref>
- <gschemaname>date-format</gschemaname>
- <gschematype>datefmt</gschematype>
- <gconfkey>date_format</gconfkey>
- </pref>
- <pref>
- <gschemaname>date-completion-thisyear</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>date_completion</gconfkey>
- </pref>
- <pref>
- <gschemaname>date-completion-sliding</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>date_completion</gconfkey>
- </pref>
- <pref>
- <gschemaname>date-backmonths</gschemaname>
- <gschematype>d</gschematype>
- <gconfkey>date_backmonths</gconfkey>
- </pref>
- <pref>
- <gschemaname>show-splash-screen</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>show_splash_screen</gconfkey>
- </pref>
- <pref>
- <gschemaname>tab-position-top</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>tab_position</gconfkey>
- </pref>
- <pref>
- <gschemaname>tab-position-bottom</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>tab_position</gconfkey>
- </pref>
- <pref>
- <gschemaname>tab-position-left</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>tab_position</gconfkey>
- </pref>
- <pref>
- <gschemaname>tab-position-right</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>tab_position</gconfkey>
- </pref>
- <pref>
- <gschemaname>summarybar-position-top</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>summarybar_position</gconfkey>
- </pref>
- <pref>
- <gschemaname>summarybar-position-bottom</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>summarybar_position</gconfkey>
- </pref>
- <pref>
- <gschemaname>tab-next-recent</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>tab_next_recent</gconfkey>
- </pref>
- <pref>
- <gschemaname>num-source</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>num_source</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.general.register</gschemaid>
- <gconfpath>general-register.xml</gconfpath>
-
- <pref>
- <gschemaname>use-theme-colors</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>use_theme_colors</gconfkey>
- </pref>
- <pref>
- <gschemaname>enter-moves-to-end</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>enter_moves_to_end</gconfkey>
- </pref>
- <pref>
- <gschemaname>auto-raise-lists</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>auto_raise_lists</gconfkey>
- </pref>
- <pref>
- <gschemaname>tab-to-transfer-on-memorised</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>tab_includes_transfer_on_memorised</gconfkey>
- </pref>
- <pref>
- <gschemaname>use-new-window</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>use_new_window</gconfkey>
- </pref>
- <pref>
- <gschemaname>alternate-color-by-transaction</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>alternate_color_by_transaction</gconfkey>
- </pref>
- <pref>
- <gschemaname>draw-horizontal-lines</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>draw_horizontal_lines</gconfkey>
- </pref>
- <pref>
- <gschemaname>draw-vertical-lines</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>draw_vertical_lines</gconfkey>
- </pref>
- <pref>
- <gschemaname>default-style-ledger</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>default_style</gconfkey>
- </pref>
- <pref>
- <gschemaname>default-style-autoledger</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>default_style</gconfkey>
- </pref>
- <pref>
- <gschemaname>default-style-journal</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>default_style</gconfkey>
- </pref>
- <pref>
- <gschemaname>double-line-mode</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>double_line_mode</gconfkey>
- </pref>
- <pref>
- <gschemaname>show-leaf-account-names</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>show_leaf_account_names</gconfkey>
- </pref>
- <pref>
- <gschemaname>show-extra-dates</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>show_extra_dates</gconfkey>
- </pref>
- <pref>
- <gschemaname>show-extra-dates-on-selection</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>show_extra_dates_on_selection</gconfkey>
- </pref>
- <pref>
- <gschemaname>show-calendar-buttons</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>show_calendar_buttons</gconfkey>
- </pref>
- <pref>
- <gschemaname>selection-to-blank-on-expand</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>selection_to_blank_on_expand</gconfkey>
- </pref>
- <pref>
- <gschemaname>max-transactions</gschemaname>
- <gschematype>d</gschematype>
- <gconfkey>max_transactions</gconfkey>
- </pref>
- <pref>
- <gschemaname>key-length</gschemaname>
- <gschematype>d</gschematype>
- <gconfkey>key_length</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.general.report</gschemaid>
- <gconfpath>general-report.xml</gconfpath>
-
- <pref>
- <gschemaname>use-new-window</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>use_new_window</gconfkey>
- </pref>
- <pref>
- <gschemaname>currency-choice-locale</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>currency_choice</gconfkey>
- </pref>
- <pref>
- <gschemaname>currency-choice-other</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>currency_choice</gconfkey>
- </pref>
- <pref>
- <gschemaname>currency-other</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>currency_other</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.general.report.pdf-export</gschemaid>
- <gconfpath>general-report-pdf_export.xml</gconfpath>
-
- <pref>
- <gschemaname>filename-format</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>filename_format</gconfkey>
- </pref>
- <pref>
- <gschemaname>filename-date-format</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>filename_date_format</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dev</gschemaid>
- <gconfpath>dev.xml</gconfpath>
-
- <pref>
- <gschemaname>allow-file-incompatibility</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>allow_file_incompatibility</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.checkprinting</gschemaid>
- <gconfpath>dialogs-print_checks.xml</gconfpath>
-
- <pref>
- <gschemaname>check-format-guid</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>check_format_guid</gconfkey>
- </pref>
- <pref>
- <gschemaname>check-position</gschemaname>
- <gschematype>i</gschematype>
- <gconfkey>check_position</gconfkey>
- </pref>
- <pref>
- <gschemaname>first-page-count</gschemaname>
- <gschematype>i</gschematype>
- <gconfkey>first_page_count</gconfkey>
- </pref>
- <pref>
- <gschemaname>date-format</gschemaname>
- <gschematype>i</gschematype>
- <gconfkey>date_format</gconfkey>
- </pref>
- <pref>
- <gschemaname>date-format-user</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>date_format_user</gconfkey>
- </pref>
- <pref>
- <gschemaname>custom-units</gschemaname>
- <gschematype>i</gschematype>
- <gconfkey>custom_units</gconfkey>
- </pref>
- <pref>
- <gschemaname>custom-payee</gschemaname>
- <gschematype>(dd)</gschematype>
- <gconfkey>custom_payee</gconfkey>
- </pref>
- <pref>
- <gschemaname>custom-date</gschemaname>
- <gschematype>(dd)</gschematype>
- <gconfkey>custom_date</gconfkey>
- </pref>
- <pref>
- <gschemaname>custom-amount-words</gschemaname>
- <gschematype>(dd)</gschematype>
- <gconfkey>custom_amount_words</gconfkey>
- </pref>
- <pref>
- <gschemaname>custom-amount-number</gschemaname>
- <gschematype>(dd)</gschematype>
- <gconfkey>custom_amount_number</gconfkey>
- </pref>
- <pref>
- <gschemaname>custom-address</gschemaname>
- <gschematype>(dd)</gschematype>
- <gconfkey>custom_address</gconfkey>
- </pref>
- <pref>
- <gschemaname>custom-notes</gschemaname>
- <gschematype>(dd)</gschematype>
- <gconfkey>custom_notes</gconfkey>
- </pref>
- <pref>
- <gschemaname>custom-memo</gschemaname>
- <gschematype>(dd)</gschematype>
- <gconfkey>custom_memo</gconfkey>
- </pref>
- <pref>
- <gschemaname>custom-translation</gschemaname>
- <gschematype>(dd)</gschematype>
- <gconfkey>custom_translation</gconfkey>
- </pref>
- <pref>
- <gschemaname>custom-rotation</gschemaname>
- <gschematype>d</gschematype>
- <gconfkey>custom_rotation</gconfkey>
- </pref>
- <pref>
- <gschemaname>splits-amount</gschemaname>
- <gschematype>(dd)</gschematype>
- <gconfkey>splits_amount</gconfkey>
- </pref>
- <pref>
- <gschemaname>splits-memo</gschemaname>
- <gschematype>(dd)</gschematype>
- <gconfkey>splits_memo</gconfkey>
- </pref>
- <pref>
- <gschemaname>splits-account</gschemaname>
- <gschematype>(dd)</gschematype>
- <gconfkey>splits_account</gconfkey>
- </pref>
- <pref>
- <gschemaname>print-date-format</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>print_date_format</gconfkey>
- </pref>
- <pref>
- <gschemaname>default-font</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>default_font</gconfkey>
- </pref>
- <pref>
- <gschemaname>blocking-chars</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>blocking_chars</gconfkey>
- </pref>
- </prefsgroup>
-
- at MIGRATABLE_PREFS_OFX@
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.export.csv</gschemaid>
- <gconfpath>dialogs-export-csv.xml</gconfpath>
-
- <pref>
- <gschemaname>last-path</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>last_path</gconfkey>
- </pref>
- <pref>
- <gschemaname>paned-position</gschemaname>
- <gschematype>i</gschematype>
- <gconfkey>paned_position</gconfkey>
- </pref>
- </prefsgroup>
-
- at MIGRATABLE_PREFS_AQBANKING@
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.import.generic</gschemaid>
- <gconfpath>dialogs-import-generic-matcher.xml</gconfpath>
-
- <pref>
- <gschemaname>enable-skip</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>enable_skip</gconfkey>
- </pref>
- <pref>
- <gschemaname>enable-update</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>enable_update</gconfkey>
- </pref>
- <pref>
- <gschemaname>use-bayes</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>use_bayes</gconfkey>
- </pref>
- <pref>
- <gschemaname>match-threshold</gschemaname>
- <gschematype>d</gschematype>
- <gconfkey>match_threshold</gconfkey>
- </pref>
- <pref>
- <gschemaname>auto-add-threshold</gschemaname>
- <gschematype>d</gschematype>
- <gconfkey>auto_add_threshold</gconfkey>
- </pref>
- <pref>
- <gschemaname>auto-clear-threshold</gschemaname>
- <gschematype>d</gschematype>
- <gconfkey>auto_clear_threshold</gconfkey>
- </pref>
- <pref>
- <gschemaname>atm-fee-threshold</gschemaname>
- <gschematype>d</gschematype>
- <gconfkey>atm_fee_threshold</gconfkey>
- </pref>
- <pref>
- <gschemaname>auto-create-commodity</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>auto_create_commodity</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.import.csv</gschemaid>
- <gconfpath>dialogs-import-csv.xml</gconfpath>
-
- <pref>
- <gschemaname>last-path</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>last_path</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.import.qif</gschemaid>
- <gconfpath>dialogs-import-qif.xml</gconfpath>
-
- <pref>
- <gschemaname>default-status-notcleared</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>default_status</gconfkey>
- </pref>
- <pref>
- <gschemaname>default-status-cleared</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>default_status</gconfkey>
- </pref>
- <pref>
- <gschemaname>default-status-reconciled</gschemaname>
- <gschematype>s2b</gschematype>
- <gconfkey>default_status</gconfkey>
- </pref>
- <pref>
- <gschemaname>last-path</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>last_path</gconfkey>
- </pref>
- <pref>
- <gschemaname>show-doc</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>show_doc</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.history</gschemaid>
- <gconfpath>history.xml</gconfpath>
-
- <pref>
- <gschemaname>maxfiles</gschemaname>
- <gschematype>i</gschematype>
- <gconfkey>maxfiles</gconfkey>
- </pref>
- <pref>
- <gschemaname>file0</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>file0</gconfkey>
- </pref>
- <pref>
- <gschemaname>file1</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>file1</gconfkey>
- </pref>
- <pref>
- <gschemaname>file2</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>file2</gconfkey>
- </pref>
- <pref>
- <gschemaname>file3</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>file3</gconfkey>
- </pref>
- <pref>
- <gschemaname>file4</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>file4</gconfkey>
- </pref>
- <pref>
- <gschemaname>file5</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>file5</gconfkey>
- </pref>
- <pref>
- <gschemaname>file6</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>file6</gconfkey>
- </pref>
- <pref>
- <gschemaname>file7</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>file7</gconfkey>
- </pref>
- <pref>
- <gschemaname>file8</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>file8</gconfkey>
- </pref>
- <pref>
- <gschemaname>file9</gschemaname>
- <gschematype>s</gschematype>
- <gconfkey>file9</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.business.customer-search</gschemaid>
- <gconfpath>dialogs-business-customer_search.xml</gconfpath>
-
- <pref>
- <gschemaname>search-for-active-only</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>search_for_active_only</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.business.employee-search</gschemaid>
- <gconfpath>dialogs-business-employee_search.xml</gconfpath>
-
- <pref>
- <gschemaname>search-for-active-only</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>search_for_active_only</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.business.invoice-search</gschemaid>
- <gconfpath>dialogs-business-invoice_search.xml</gconfpath>
-
- <pref>
- <gschemaname>search-for-active-only</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>search_for_active_only</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.business.job-search</gschemaid>
- <gconfpath>dialogs-business-job_search.xml</gconfpath>
-
- <pref>
- <gschemaname>search-for-active-only</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>search_for_active_only</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.business.order-search</gschemaid>
- <gconfpath>dialogs-business-order_search.xml</gconfpath>
-
- <pref>
- <gschemaname>search-for-active-only</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>search_for_active_only</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.business.vendor-search</gschemaid>
- <gconfpath>dialogs-business-vendor_search.xml</gconfpath>
-
- <pref>
- <gschemaname>search-for-active-only</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>search_for_active_only</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.business.invoice</gschemaid>
- <gconfpath>dialogs-business-invoice.xml</gconfpath>
-
- <pref>
- <gschemaname>tax-included</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>tax_included</gconfkey>
- </pref>
- <pref>
- <gschemaname>enable-toolbuttons</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>enable_toolbuttons</gconfkey>
- </pref>
- <pref>
- <gschemaname>invoice-printreport</gschemaname>
- <gschematype>i</gschematype>
- <gconfkey>invoice_printreport</gconfkey>
- </pref>
- <pref>
- <gschemaname>use-new-window</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>use_new_window</gconfkey>
- </pref>
- <pref>
- <gschemaname>accumulate-splits</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>accumulate_splits</gconfkey>
- </pref>
- </prefsgroup>
-
- <prefsgroup>
- <gschemaid>org.gnucash.dialogs.business.bill</gschemaid>
- <gconfpath>dialogs-business-bill.xml</gconfpath>
-
- <pref>
- <gschemaname>tax-included</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>tax_included</gconfkey>
- </pref>
- <pref>
- <gschemaname>notify-when-due</gschemaname>
- <gschematype>b</gschematype>
- <gconfkey>notify_when_due</gconfkey>
- </pref>
- <pref>
- <gschemaname>days-in-advance</gschemaname>
- <gschematype>d</gschematype>
- <gconfkey>days_in_advance</gconfkey>
- </pref>
- </prefsgroup>
-</prefs>
\ No newline at end of file
diff --git a/libgnucash/app-utils/migrate-prefs.scm b/libgnucash/app-utils/migrate-prefs.scm
deleted file mode 100644
index 316907882..000000000
--- a/libgnucash/app-utils/migrate-prefs.scm
+++ /dev/null
@@ -1,144 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; migrate-prefs.scm
-;;; Functions used to migrated user preferences from gconf
-;;; to gsettings. Note that this module doesn't perform the
-;;; migration itself: it merely prepares the environment to
-;;; create the actual migration script.
-;;;
-;;; Copyright 2013 Geert Janssens <geert at kobaltwit.be>
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; 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
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-
-(define-module (migrate-prefs))
-
-(use-modules (gnucash utilities))
-
-(define gconf-dir "")
-(define prefix-length 0)
-(define migration-dir "")
-
-(define (copy-one-file filename)
-(let ((stats (stat filename))
- (base-name "")
- (slash-index 0)
- (dest-name ""))
- (gnc:debug "Processing file... " filename)
- (if (eq? (stat:type stats) 'regular)
- (begin
- (set! base-name (string-drop filename prefix-length))
- (set! slash-index (- (string-rindex base-name #\%) 1))
- (if (> slash-index 0)
- (begin
- (set! dest-name (string-take base-name (- (string-rindex base-name #\%) 1)))
- (set! dest-name (string-join (string-split dest-name #\/) "-"))
- (set! dest-name (string-append migration-dir "/" dest-name ".xml"))
- (gnc:debug "Copying " base-name " -> " dest-name)
- (copy-file filename dest-name)
- ))))
- (if (eq? (stat:type stats) 'directory)
- (apply find copy-one-file (list filename))
- )))
-
-
-(define (directory-files dir)
- (if (not (access? dir R_OK))
- '()
- (let* ((p (opendir dir))
- (filelist (do ((file (readdir p) (readdir p))
- (ls '()))
- ((eof-object? file) (closedir p) (reverse! ls))
- (if (not (string-suffix? "." file))
- (set! ls (cons file ls)))
- )))
- (sort filelist string<))))
-
-(define (find proc . dirs)
- (cond ((pair? dirs)
- (for-each proc (map (lambda (x) (string-append (car dirs) "/" x))
- (directory-files (car dirs)))))))
-
-(define (finddepth proc . dirs)
- (cond ((pair? dirs)
- (apply finddepth proc (cdr dirs))
- (for-each proc (map (lambda (x) (string-append (car dirs) "/" x))
- (directory-files (car dirs)))))))
-
-
-(define (migration-prepare-internal)
-; cleanup first if a previous migration attempt failed to do so
- (if (access? migration-dir (logior R_OK W_OK X_OK))
- (begin
- (gnc:msg "Clear previous migration tmp dir " migration-dir)
- (migration-cleanup-internal)))
- (gnc:warn "*** GnuCash switched to a new preferences system ***")
- (gnc:warn "Attempt to migrate your preferences from the old to the new system")
- (mkdir migration-dir)
- (gnc:msg "Copy all gconf files to tmp dir " migration-dir)
- (apply find copy-one-file (list gconf-dir))
- ; Indicate successful preparation
- #t
-)
-
-(define (migration-prepare base-dir)
- (set! gconf-dir (string-append base-dir "/.gconf/apps/gnucash"))
- ; Note: calling script should already have checked whether
- ; gconf-dir and its parent directories exist
- (set! prefix-length (+ (string-length gconf-dir) 1))
- (set! migration-dir (string-append base-dir "/.gnc-migration-tmp"))
- (catch #t
- migration-prepare-internal
- (lambda (key . args)
- (gnc:error "An error occurred while preparing to migrate preferences.")
- (gnc:error "The error is: "
- (symbol->string key) " - " (car (caddr args)) ".")
- #f))
-)
-
-(define (rmtree args)
- (define (zap f)
- (let ((rm (if (eq? (stat:type (stat f)) 'directory) rmdir delete-file)))
- (gnc:debug "deleting " f)
- (catch #t
- (lambda () (rm f))
- (lambda args (format #t "couldn't delete ~A\n" f)))))
- (apply finddepth zap args))
-
-(define (migration-cleanup-internal)
- (rmtree (list migration-dir))
- (rmdir migration-dir)
- ; Indicate successful cleanup
- #t)
-
-(define (migration-cleanup base-dir)
- (set! migration-dir (string-append base-dir "/.gnc-migration-tmp"))
- (if (access? migration-dir (logior R_OK W_OK X_OK))
- (begin
- (gnc:msg "Delete tmp dir " migration-dir)
- (catch #t
- migration-cleanup-internal
- (lambda (key . args)
- (gnc:error "An error occurred while cleaning up after preferences migration.")
- (gnc:error "The error is: "
- (symbol->string key) " - " (car (caddr args)) ".")
- #f))))
-)
-
-(export migration-prepare migration-cleanup)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 04585113c..7555f790f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -537,7 +537,6 @@ libgnucash/app-utils/gnc-ui-balances.c
libgnucash/app-utils/gnc-ui-util.c
libgnucash/app-utils/guile-util.c
libgnucash/app-utils/hooks.scm
-libgnucash/app-utils/migrate-prefs.scm
libgnucash/app-utils/options.scm
libgnucash/app-utils/option-util.c
libgnucash/app-utils/prefs.scm
commit 8aa696223bc01b908db31a910ab1c454a65bbdf8
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Jun 8 16:18:08 2019 +0200
Always add share/scm to GUILE_LOAD_PATH
Any scm file that will be built may need access to other scheme files that may have
been linked into that directory. As it was only scm files that would be linked
themselves would also be built with the search path set, causing other linked files
not to be found for an scm file that doesn't add a link for itself.
diff --git a/common/cmake_modules/GncAddSchemeTargets.cmake b/common/cmake_modules/GncAddSchemeTargets.cmake
index c7228c1ba..25adc8aa3 100644
--- a/common/cmake_modules/GncAddSchemeTargets.cmake
+++ b/common/cmake_modules/GncAddSchemeTargets.cmake
@@ -90,9 +90,7 @@ function(make_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
list(APPEND _GUILE_LOAD_COMPILED_PATH ${guile_load_compiled_path})
endif()
set(_GUILE_CACHE_DIR ${LIBDIR_BUILD}/gnucash/scm/ccache/${GUILE_EFFECTIVE_VERSION})
- if (MAKE_LINKS)
- list(APPEND _GUILE_LOAD_PATH "${build_datadir}/gnucash/scm")
- endif()
+ list(APPEND _GUILE_LOAD_PATH "${build_datadir}/gnucash/scm")
list(APPEND _GUILE_LOAD_COMPILED_PATH ${build_libdir}/gnucash/scm/ccache/${GUILE_EFFECTIVE_VERSION})
set(_TARGET_FILES "")
Summary of changes:
.travis.yml | 2 +-
CMakeLists.txt | 2 +-
borrowed/goffice/go-optionmenu.c | 8 -
common/cmake_modules/GncAddSchemeTargets.cmake | 4 +-
gnucash/gnome-utils/dialog-options.c | 16 -
gnucash/gnome-utils/dialog-utils.c | 4 -
gnucash/gnome-utils/gnc-combott.c | 4 -
gnucash/gnome-utils/gnc-dense-cal.c | 8 -
gnucash/gnome-utils/gnc-gnome-utils.c | 27 -
gnucash/gnome-utils/gnc-main-window.c | 8 -
gnucash/gnome-utils/gnc-period-select.c | 4 -
gnucash/gnome/assistant-loan.cpp | 11 +-
gnucash/gnome/window-reconcile.c | 10 -
gnucash/gnome/window-reconcile2.c | 4 -
gnucash/gschemas/org.gnucash.gschema.xml.in | 5 -
gnucash/import-export/aqb/CMakeLists.txt | 2 +-
.../aqb/migratable-prefs-aqbanking.xml | 45 -
gnucash/import-export/ofx/CMakeLists.txt | 2 +-
gnucash/import-export/ofx/migratable-prefs-ofx.xml | 10 -
.../register/register-gnome/gnucash-item-edit.c | 7 -
libgnucash/app-utils/CMakeLists.txt | 20 +-
libgnucash/app-utils/gnc-gsettings.c | 228 -----
.../app-utils/make-prefs-migration-script.xsl | 216 -----
libgnucash/app-utils/migratable-prefs.xml.in | 1006 --------------------
libgnucash/app-utils/migrate-prefs.scm | 144 ---
po/POTFILES.in | 1 -
util/ci/ubuntu-14.04-docker | 10 -
util/ci/ubuntu-16.04-docker | 19 +
...tu-14.04-testscript => ubuntu-16.04-testscript} | 0
29 files changed, 26 insertions(+), 1801 deletions(-)
delete mode 100644 gnucash/import-export/aqb/migratable-prefs-aqbanking.xml
delete mode 100644 gnucash/import-export/ofx/migratable-prefs-ofx.xml
delete mode 100644 libgnucash/app-utils/make-prefs-migration-script.xsl
delete mode 100644 libgnucash/app-utils/migratable-prefs.xml.in
delete mode 100644 libgnucash/app-utils/migrate-prefs.scm
delete mode 100644 util/ci/ubuntu-14.04-docker
create mode 100644 util/ci/ubuntu-16.04-docker
rename util/ci/{ubuntu-14.04-testscript => ubuntu-16.04-testscript} (100%)
More information about the gnucash-changes
mailing list