gnucash unstable: Rework source directory structure for gschema, gtkbuilder and ui files

Geert Janssens gjanssens at code.gnucash.org
Wed Feb 28 09:43:16 EST 2018


Updated	 via  https://github.com/Gnucash/gnucash/commit/c1866241 (commit)
	from  https://github.com/Gnucash/gnucash/commit/f111e595 (commit)



commit c1866241605bc6309706b2c85d5a4c9eeff8a0dd
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Feb 28 14:25:05 2018 +0100

    Rework source directory structure for gschema, gtkbuilder and ui files
    
    There is now a directory for each respective file type directly in the gnucash source directory
    (This was already started for gschema files before).
    
    In principle all files of each type should go into these global directories. The only
    exception is if such a file belongs to an optional module. In that case the file
    remains located inside that module's directory. Currently we have ui, glade and gschema file
    exceptions in aqb and ofx importers.

diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index caa5c53..7dd92c9 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -22,11 +22,13 @@ int main (int argc, char** argv) {
 ADD_SUBDIRECTORY (gnome)
 ADD_SUBDIRECTORY (gnome-utils)
 ADD_SUBDIRECTORY (gnome-search)
+ADD_SUBDIRECTORY (gtkbuilder)
 ADD_SUBDIRECTORY (html)
 ADD_SUBDIRECTORY (import-export)
 ADD_SUBDIRECTORY (python)
 ADD_SUBDIRECTORY (register)
 ADD_SUBDIRECTORY (report)
+ADD_SUBDIRECTORY (ui)
 ADD_SUBDIRECTORY (gschemas)
 
 ADD_DEFINITIONS (-DHAVE_CONFIG_H)
@@ -255,6 +257,6 @@ SET_LOCAL_DIST(gnucash_DIST_local CMakeLists.txt environment.in generate-gnc-scr
                gnucash-bin.c gnucash.rc.in gnucash-valgrind.in gnucash-gresources.xml ${gresource_files}
                ${gnucash_EXTRA_DIST})
 
-SET(gnucash_DIST ${gnucash_DIST_local} ${gschemas_DIST} ${gnome_DIST} ${gnome_search_DIST}
-             ${gnome_utils_DIST} ${html_DIST} ${import_export_DIST} ${python_DIST} ${register_DIST} ${report_DIST}
-             ${overrides_DIST} ${test_bin_DIST} PARENT_SCOPE)
+set (gnucash_DIST ${gnucash_DIST_local} ${gnome_DIST} ${gnome_search_DIST} ${gnome_utils_DIST}
+    ${gschemas_DIST} ${gtkbuilder_DIST} ${html_DIST} ${import_export_DIST} ${python_DIST} ${register_DIST}
+    ${report_DIST} ${overrides_DIST} ${test_bin_DIST} ${ui_DIST} PARENT_SCOPE)
diff --git a/gnucash/gnome-search/CMakeLists.txt b/gnucash/gnome-search/CMakeLists.txt
index 3144628..772b977 100644
--- a/gnucash/gnome-search/CMakeLists.txt
+++ b/gnucash/gnome-search/CMakeLists.txt
@@ -36,7 +36,7 @@ SET (gnome_search_noinst_HEADERS
 # Add dependency on config.h
 SET_SOURCE_FILES_PROPERTIES (${gnome_search_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
 
-SET_LOCAL_DIST(gnome_search_DIST_local CMakeLists.txt  dialog-search.glade ${gnome_search_SOURCES} ${gnome_search_HEADERS}
+SET_LOCAL_DIST(gnome_search_DIST_local CMakeLists.txt ${gnome_search_SOURCES} ${gnome_search_HEADERS}
         ${gnome_search_noinst_HEADERS})
 SET(gnome_search_DIST ${gnome_search_DIST_local} PARENT_SCOPE)
 
@@ -62,13 +62,3 @@ INSTALL(TARGETS gncmod-gnome-search
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 INSTALL(FILES ${gnome_search_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnucash)
-
-SET(gnome_search_GLADE dialog-search.glade)
-
-INSTALL(FILES ${gnome_search_GLADE} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
-
-FILE(COPY .
-    DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder
-    PATTERN Makefile.* EXCLUDE
-    PATTERN CMakeLists.txt EXCLUDE)
-
diff --git a/gnucash/gnome-utils/CMakeLists.txt b/gnucash/gnome-utils/CMakeLists.txt
index 065ec9d..855d684 100644
--- a/gnucash/gnome-utils/CMakeLists.txt
+++ b/gnucash/gnome-utils/CMakeLists.txt
@@ -1,7 +1,5 @@
 # Note that gnucash/gnome-utils CANNOT depend on gnucash/gnome!
 
-ADD_SUBDIRECTORY(gtkbuilder)
-ADD_SUBDIRECTORY(ui)
 ADD_SUBDIRECTORY(test)
 
 # Command to generate the swig-gnome-utils.c wrapper file
@@ -270,5 +268,4 @@ ADD_CUSTOM_TARGET(scm-gnome-utils ALL DEPENDS scm-gnome-utils-2 scm-gnome-utils-
 SET_LOCAL_DIST(gnome_utils_DIST_local CMakeLists.txt ${gnome_utils_SOURCES} ${gnome_utils_HEADERS}
         ${gnome_utils_noinst_HEADERS} gnome-utils.scm gnome-utils.i gnc-menu-extensions.scm
         make-gnc-warnings-c.xsl make-gnc-warnings-h.xsl)
-SET(gnome_utils_DIST ${gnome_utils_DIST_local} ${test_gnome_utils_DIST}
-        ${gnome_utils_ui_DIST} ${gnome_utils_gtkbuilder_DIST} PARENT_SCOPE)
+SET(gnome_utils_DIST ${gnome_utils_DIST_local} ${test_gnome_utils_DIST} PARENT_SCOPE)
diff --git a/gnucash/gnome-utils/gtkbuilder/CMakeLists.txt b/gnucash/gnome-utils/gtkbuilder/CMakeLists.txt
deleted file mode 100644
index 9cde018..0000000
--- a/gnucash/gnome-utils/gtkbuilder/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-SET(gnome_utils_GLADE
-        assistant-xml-encoding.glade
-        dialog-account.glade
-        dialog-book-close.glade
-        dialog-commodity.glade
-        dialog-file-access.glade
-        dialog-object-references.glade
-        dialog-options.glade
-        dialog-preferences.glade
-        dialog-query-view.glade
-        dialog-reset-warnings.glade
-        dialog-tax-table.glade
-        dialog-totd.glade
-        dialog-transfer.glade
-        dialog-userpass.glade
-        gnc-date-format.glade
-        gnc-frequency.glade
-        gnc-recurrence.glade
-        gnc-tree-view-owner.glade
-)
-
-FILE(COPY ${gnome_utils_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
-INSTALL(FILES ${gnome_utils_GLADE} DESTINATION share/gnucash/gtkbuilder)
-
-SET_DIST_LIST(gnome_utils_gtkbuilder_DIST CMakeLists.txt ${gnome_utils_GLADE})
diff --git a/gnucash/gnome-utils/ui/CMakeLists.txt b/gnucash/gnome-utils/ui/CMakeLists.txt
deleted file mode 100644
index 4320474..0000000
--- a/gnucash/gnome-utils/ui/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-set(gnome_utils_UI
-  gnc-main-window-ui.xml
-  gnc-windows-menu-ui-quartz.xml
-  gnc-windows-menu-ui.xml
-  osx_accel_map
-  )
-
-FILE(COPY ${gnome_utils_UI} DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-
-INSTALL(FILES ${gnome_utils_UI} DESTINATION share/gnucash/ui)
-
-SET(gnome_utils_ui_DIST_local
-  CMakeLists.txt
-  ${gnome_utils_UI}
-  )
-
-SET_DIST_LIST(gnome_utils_ui_DIST ${gnome_utils_ui_DIST_local})
diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index fc5f1e2..537fc60 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -1,7 +1,4 @@
 
-ADD_SUBDIRECTORY(gtkbuilder)
-ADD_SUBDIRECTORY(ui)
-
 SET (gnc_gnome_noinst_HEADERS
   assistant-acct-period.h
   assistant-hierarchy.h
@@ -216,7 +213,6 @@ ADD_CUSTOM_TARGET(gnucash-desktop ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucas
 
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnucash.desktop DESTINATION  ${CMAKE_INSTALL_DATADIR}/applications)
 
-SET_LOCAL_DIST(gnome_DIST_local
+SET_DIST_LIST(gnome_DIST
         CMakeLists.txt gnome.i gnucash.appdata.xml.in gnucash.desktop.in.in
         ${gnc_gnome_noinst_HEADERS} ${gnc_gnome_SOURCES})
-SET(gnome_DIST ${gnome_DIST_local} ${gnome_ui_DIST} ${gnome_gtkbuilder_DIST} PARENT_SCOPE)
diff --git a/gnucash/gnome/gtkbuilder/CMakeLists.txt b/gnucash/gnome/gtkbuilder/CMakeLists.txt
deleted file mode 100644
index a58db75..0000000
--- a/gnucash/gnome/gtkbuilder/CMakeLists.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-SET(gnome_GLADE
-        assistant-acct-period.glade
-        assistant-hierarchy.glade
-        assistant-loan.glade
-        assistant-stock-split.glade
-        business-options-gnome.glade
-        business-prefs.glade
-        dialog-billterms.glade
-        dialog-choose-owner.glade
-        dialog-commodities.glade
-        dialog-customer.glade
-        dialog-date-close.glade
-        dialog-employee.glade
-        dialog-fincalc.glade
-        dialog-find-account.glade
-        dialog-imap-editor.glade
-        dialog-invoice.glade
-        dialog-job.glade
-        dialog-lot-viewer.glade
-        dialog-new-user.glade
-        dialog-order.glade
-        dialog-payment.glade
-        dialog-price.glade
-        dialog-print-check.glade
-        dialog-progress.glade
-        dialog-sx.glade
-        dialog-tax-info.glade
-        dialog-trans-assoc.glade
-        dialog-vendor.glade
-        gnc-plugin-page-budget.glade
-        gnc-plugin-page-register2.glade
-        gnc-plugin-page-register.glade
-        window-autoclear.glade
-        window-reconcile.glade
-)
-
-FILE(COPY ${gnome_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
-INSTALL(FILES ${gnome_GLADE} DESTINATION share/gnucash/gtkbuilder)
-
-SET_DIST_LIST(gnome_gtkbuilder_DIST CMakeLists.txt ${gnome_GLADE})
diff --git a/gnucash/gschemas/CMakeLists.txt b/gnucash/gschemas/CMakeLists.txt
index 9c7b1e0..9f68bb7 100644
--- a/gnucash/gschemas/CMakeLists.txt
+++ b/gnucash/gschemas/CMakeLists.txt
@@ -1,14 +1,18 @@
 
 SET(gschema_SOURCES
-  org.gnucash.dialogs.gschema.xml
   org.gnucash.dialogs.business.gschema.xml
-  org.gnucash.dialogs.commodities.gschema.xml
   org.gnucash.dialogs.checkprinting.gschema.xml
+  org.gnucash.dialogs.commodities.gschema.xml
+  org.gnucash.dialogs.export.csv.gschema.xml
+  org.gnucash.dialogs.gschema.xml
+  org.gnucash.dialogs.import.csv.gschema.xml
+  org.gnucash.dialogs.import.generic.gschema.xml
+  org.gnucash.dialogs.import.qif.gschema.xml
   org.gnucash.dialogs.reconcile.gschema.xml
   org.gnucash.dialogs.sxs.gschema.xml
   org.gnucash.dialogs.totd.gschema.xml
-  org.gnucash.gschema.xml
   org.gnucash.general.finance-quote.gschema.xml
+  org.gnucash.gschema.xml
   org.gnucash.history.gschema.xml
   org.gnucash.warnings.gschema.xml
   org.gnucash.window.pages.account.tree.gschema.xml
diff --git a/gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in b/gnucash/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in
similarity index 100%
rename from gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in
rename to gnucash/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in
diff --git a/gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in b/gnucash/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in
similarity index 100%
rename from gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in
rename to gnucash/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in
diff --git a/gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in b/gnucash/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in
similarity index 100%
rename from gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in
rename to gnucash/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in
diff --git a/gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in b/gnucash/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in
similarity index 100%
rename from gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in
rename to gnucash/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in
diff --git a/gnucash/gtkbuilder/CMakeLists.txt b/gnucash/gtkbuilder/CMakeLists.txt
new file mode 100644
index 0000000..0e9667b
--- /dev/null
+++ b/gnucash/gtkbuilder/CMakeLists.txt
@@ -0,0 +1,71 @@
+set (gtkbuilder_SOURCES
+        assistant-acct-period.glade
+        assistant-csv-account-import.glade
+        assistant-csv-export.glade
+        assistant-csv-price-import.glade
+        assistant-csv-trans-import.glade
+        assistant-hierarchy.glade
+        assistant-loan.glade
+        assistant-qif-import.glade
+        assistant-stock-split.glade
+        assistant-xml-encoding.glade
+        business-options-gnome.glade
+        business-prefs.glade
+        dialog-account-picker.glade
+        dialog-account.glade
+        dialog-bi-import-gui.glade
+        dialog-billterms.glade
+        dialog-book-close.glade
+        dialog-choose-owner.glade
+        dialog-commodities.glade
+        dialog-commodity.glade
+        dialog-custom-report.glade
+        dialog-customer-import-gui.glade
+        dialog-customer.glade
+        dialog-date-close.glade
+        dialog-employee.glade
+        dialog-file-access.glade
+        dialog-fincalc.glade
+        dialog-find-account.glade
+        dialog-imap-editor.glade
+        dialog-import.glade
+        dialog-invoice.glade
+        dialog-job.glade
+        dialog-lot-viewer.glade
+        dialog-new-user.glade
+        dialog-object-references.glade
+        dialog-options.glade
+        dialog-order.glade
+        dialog-payment.glade
+        dialog-preferences.glade
+        dialog-price.glade
+        dialog-print-check.glade
+        dialog-progress.glade
+        dialog-query-view.glade
+        dialog-report.glade
+        dialog-reset-warnings.glade
+        dialog-search.glade
+        dialog-sx.glade
+        dialog-tax-info.glade
+        dialog-tax-table.glade
+        dialog-totd.glade
+        dialog-trans-assoc.glade
+        dialog-transfer.glade
+        dialog-userpass.glade
+        dialog-vendor.glade
+        gnc-date-format.glade
+        gnc-frequency.glade
+        gnc-plugin-page-budget.glade
+        gnc-plugin-page-register2.glade
+        gnc-plugin-page-register.glade
+        gnc-recurrence.glade
+        gnc-tree-view-owner.glade
+        window-autoclear.glade
+        window-reconcile.glade
+)
+
+file (COPY ${gtkbuilder_SOURCES} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
+
+install (FILES ${gtkbuilder_SOURCES} DESTINATION share/gnucash/gtkbuilder)
+
+SET_DIST_LIST(gtkbuilder_DIST CMakeLists.txt ${gtkbuilder_SOURCES})
diff --git a/gnucash/gnome/gtkbuilder/assistant-acct-period.glade b/gnucash/gtkbuilder/assistant-acct-period.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/assistant-acct-period.glade
rename to gnucash/gtkbuilder/assistant-acct-period.glade
diff --git a/gnucash/import-export/csv-imp/assistant-csv-account-import.glade b/gnucash/gtkbuilder/assistant-csv-account-import.glade
similarity index 100%
rename from gnucash/import-export/csv-imp/assistant-csv-account-import.glade
rename to gnucash/gtkbuilder/assistant-csv-account-import.glade
diff --git a/gnucash/import-export/csv-exp/assistant-csv-export.glade b/gnucash/gtkbuilder/assistant-csv-export.glade
similarity index 100%
rename from gnucash/import-export/csv-exp/assistant-csv-export.glade
rename to gnucash/gtkbuilder/assistant-csv-export.glade
diff --git a/gnucash/import-export/csv-imp/assistant-csv-price-import.glade b/gnucash/gtkbuilder/assistant-csv-price-import.glade
similarity index 100%
rename from gnucash/import-export/csv-imp/assistant-csv-price-import.glade
rename to gnucash/gtkbuilder/assistant-csv-price-import.glade
diff --git a/gnucash/import-export/csv-imp/assistant-csv-trans-import.glade b/gnucash/gtkbuilder/assistant-csv-trans-import.glade
similarity index 100%
rename from gnucash/import-export/csv-imp/assistant-csv-trans-import.glade
rename to gnucash/gtkbuilder/assistant-csv-trans-import.glade
diff --git a/gnucash/gnome/gtkbuilder/assistant-hierarchy.glade b/gnucash/gtkbuilder/assistant-hierarchy.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/assistant-hierarchy.glade
rename to gnucash/gtkbuilder/assistant-hierarchy.glade
diff --git a/gnucash/gnome/gtkbuilder/assistant-loan.glade b/gnucash/gtkbuilder/assistant-loan.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/assistant-loan.glade
rename to gnucash/gtkbuilder/assistant-loan.glade
diff --git a/gnucash/import-export/qif-imp/assistant-qif-import.glade b/gnucash/gtkbuilder/assistant-qif-import.glade
similarity index 100%
rename from gnucash/import-export/qif-imp/assistant-qif-import.glade
rename to gnucash/gtkbuilder/assistant-qif-import.glade
diff --git a/gnucash/gnome/gtkbuilder/assistant-stock-split.glade b/gnucash/gtkbuilder/assistant-stock-split.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/assistant-stock-split.glade
rename to gnucash/gtkbuilder/assistant-stock-split.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade b/gnucash/gtkbuilder/assistant-xml-encoding.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade
rename to gnucash/gtkbuilder/assistant-xml-encoding.glade
diff --git a/gnucash/gnome/gtkbuilder/business-options-gnome.glade b/gnucash/gtkbuilder/business-options-gnome.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/business-options-gnome.glade
rename to gnucash/gtkbuilder/business-options-gnome.glade
diff --git a/gnucash/gnome/gtkbuilder/business-prefs.glade b/gnucash/gtkbuilder/business-prefs.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/business-prefs.glade
rename to gnucash/gtkbuilder/business-prefs.glade
diff --git a/gnucash/import-export/qif-imp/dialog-account-picker.glade b/gnucash/gtkbuilder/dialog-account-picker.glade
similarity index 100%
rename from gnucash/import-export/qif-imp/dialog-account-picker.glade
rename to gnucash/gtkbuilder/dialog-account-picker.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-account.glade b/gnucash/gtkbuilder/dialog-account.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/dialog-account.glade
rename to gnucash/gtkbuilder/dialog-account.glade
diff --git a/gnucash/import-export/bi-import/gtkbuilder/dialog-bi-import-gui.glade b/gnucash/gtkbuilder/dialog-bi-import-gui.glade
similarity index 100%
rename from gnucash/import-export/bi-import/gtkbuilder/dialog-bi-import-gui.glade
rename to gnucash/gtkbuilder/dialog-bi-import-gui.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-billterms.glade b/gnucash/gtkbuilder/dialog-billterms.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-billterms.glade
rename to gnucash/gtkbuilder/dialog-billterms.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-book-close.glade b/gnucash/gtkbuilder/dialog-book-close.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/dialog-book-close.glade
rename to gnucash/gtkbuilder/dialog-book-close.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-choose-owner.glade b/gnucash/gtkbuilder/dialog-choose-owner.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-choose-owner.glade
rename to gnucash/gtkbuilder/dialog-choose-owner.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-commodities.glade b/gnucash/gtkbuilder/dialog-commodities.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-commodities.glade
rename to gnucash/gtkbuilder/dialog-commodities.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade b/gnucash/gtkbuilder/dialog-commodity.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade
rename to gnucash/gtkbuilder/dialog-commodity.glade
diff --git a/gnucash/report/report-gnome/dialog-custom-report.glade b/gnucash/gtkbuilder/dialog-custom-report.glade
similarity index 100%
rename from gnucash/report/report-gnome/dialog-custom-report.glade
rename to gnucash/gtkbuilder/dialog-custom-report.glade
diff --git a/gnucash/import-export/customer-import/gtkbuilder/dialog-customer-import-gui.glade b/gnucash/gtkbuilder/dialog-customer-import-gui.glade
similarity index 100%
rename from gnucash/import-export/customer-import/gtkbuilder/dialog-customer-import-gui.glade
rename to gnucash/gtkbuilder/dialog-customer-import-gui.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-customer.glade b/gnucash/gtkbuilder/dialog-customer.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-customer.glade
rename to gnucash/gtkbuilder/dialog-customer.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-date-close.glade b/gnucash/gtkbuilder/dialog-date-close.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-date-close.glade
rename to gnucash/gtkbuilder/dialog-date-close.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-employee.glade b/gnucash/gtkbuilder/dialog-employee.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-employee.glade
rename to gnucash/gtkbuilder/dialog-employee.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-file-access.glade b/gnucash/gtkbuilder/dialog-file-access.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/dialog-file-access.glade
rename to gnucash/gtkbuilder/dialog-file-access.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-fincalc.glade b/gnucash/gtkbuilder/dialog-fincalc.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-fincalc.glade
rename to gnucash/gtkbuilder/dialog-fincalc.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-find-account.glade b/gnucash/gtkbuilder/dialog-find-account.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-find-account.glade
rename to gnucash/gtkbuilder/dialog-find-account.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-imap-editor.glade b/gnucash/gtkbuilder/dialog-imap-editor.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-imap-editor.glade
rename to gnucash/gtkbuilder/dialog-imap-editor.glade
diff --git a/gnucash/import-export/dialog-import.glade b/gnucash/gtkbuilder/dialog-import.glade
similarity index 100%
rename from gnucash/import-export/dialog-import.glade
rename to gnucash/gtkbuilder/dialog-import.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-invoice.glade b/gnucash/gtkbuilder/dialog-invoice.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-invoice.glade
rename to gnucash/gtkbuilder/dialog-invoice.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-job.glade b/gnucash/gtkbuilder/dialog-job.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-job.glade
rename to gnucash/gtkbuilder/dialog-job.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade b/gnucash/gtkbuilder/dialog-lot-viewer.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade
rename to gnucash/gtkbuilder/dialog-lot-viewer.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-new-user.glade b/gnucash/gtkbuilder/dialog-new-user.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-new-user.glade
rename to gnucash/gtkbuilder/dialog-new-user.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-object-references.glade b/gnucash/gtkbuilder/dialog-object-references.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/dialog-object-references.glade
rename to gnucash/gtkbuilder/dialog-object-references.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-options.glade b/gnucash/gtkbuilder/dialog-options.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/dialog-options.glade
rename to gnucash/gtkbuilder/dialog-options.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-order.glade b/gnucash/gtkbuilder/dialog-order.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-order.glade
rename to gnucash/gtkbuilder/dialog-order.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-payment.glade b/gnucash/gtkbuilder/dialog-payment.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-payment.glade
rename to gnucash/gtkbuilder/dialog-payment.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade b/gnucash/gtkbuilder/dialog-preferences.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade
rename to gnucash/gtkbuilder/dialog-preferences.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-price.glade b/gnucash/gtkbuilder/dialog-price.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-price.glade
rename to gnucash/gtkbuilder/dialog-price.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-print-check.glade b/gnucash/gtkbuilder/dialog-print-check.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-print-check.glade
rename to gnucash/gtkbuilder/dialog-print-check.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-progress.glade b/gnucash/gtkbuilder/dialog-progress.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-progress.glade
rename to gnucash/gtkbuilder/dialog-progress.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-query-view.glade b/gnucash/gtkbuilder/dialog-query-view.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/dialog-query-view.glade
rename to gnucash/gtkbuilder/dialog-query-view.glade
diff --git a/gnucash/report/report-gnome/dialog-report.glade b/gnucash/gtkbuilder/dialog-report.glade
similarity index 100%
rename from gnucash/report/report-gnome/dialog-report.glade
rename to gnucash/gtkbuilder/dialog-report.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-reset-warnings.glade b/gnucash/gtkbuilder/dialog-reset-warnings.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/dialog-reset-warnings.glade
rename to gnucash/gtkbuilder/dialog-reset-warnings.glade
diff --git a/gnucash/gnome-search/dialog-search.glade b/gnucash/gtkbuilder/dialog-search.glade
similarity index 100%
rename from gnucash/gnome-search/dialog-search.glade
rename to gnucash/gtkbuilder/dialog-search.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-sx.glade b/gnucash/gtkbuilder/dialog-sx.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-sx.glade
rename to gnucash/gtkbuilder/dialog-sx.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-tax-info.glade b/gnucash/gtkbuilder/dialog-tax-info.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-tax-info.glade
rename to gnucash/gtkbuilder/dialog-tax-info.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade b/gnucash/gtkbuilder/dialog-tax-table.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade
rename to gnucash/gtkbuilder/dialog-tax-table.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-totd.glade b/gnucash/gtkbuilder/dialog-totd.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/dialog-totd.glade
rename to gnucash/gtkbuilder/dialog-totd.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-trans-assoc.glade b/gnucash/gtkbuilder/dialog-trans-assoc.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-trans-assoc.glade
rename to gnucash/gtkbuilder/dialog-trans-assoc.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade b/gnucash/gtkbuilder/dialog-transfer.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade
rename to gnucash/gtkbuilder/dialog-transfer.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-userpass.glade b/gnucash/gtkbuilder/dialog-userpass.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/dialog-userpass.glade
rename to gnucash/gtkbuilder/dialog-userpass.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-vendor.glade b/gnucash/gtkbuilder/dialog-vendor.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-vendor.glade
rename to gnucash/gtkbuilder/dialog-vendor.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade b/gnucash/gtkbuilder/gnc-date-format.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade
rename to gnucash/gtkbuilder/gnc-date-format.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade b/gnucash/gtkbuilder/gnc-frequency.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade
rename to gnucash/gtkbuilder/gnc-frequency.glade
diff --git a/gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade b/gnucash/gtkbuilder/gnc-plugin-page-budget.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade
rename to gnucash/gtkbuilder/gnc-plugin-page-budget.glade
diff --git a/gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade b/gnucash/gtkbuilder/gnc-plugin-page-register.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade
rename to gnucash/gtkbuilder/gnc-plugin-page-register.glade
diff --git a/gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade b/gnucash/gtkbuilder/gnc-plugin-page-register2.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade
rename to gnucash/gtkbuilder/gnc-plugin-page-register2.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade b/gnucash/gtkbuilder/gnc-recurrence.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade
rename to gnucash/gtkbuilder/gnc-recurrence.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/gnc-tree-view-owner.glade b/gnucash/gtkbuilder/gnc-tree-view-owner.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/gnc-tree-view-owner.glade
rename to gnucash/gtkbuilder/gnc-tree-view-owner.glade
diff --git a/gnucash/gnome/gtkbuilder/window-autoclear.glade b/gnucash/gtkbuilder/window-autoclear.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/window-autoclear.glade
rename to gnucash/gtkbuilder/window-autoclear.glade
diff --git a/gnucash/gnome/gtkbuilder/window-reconcile.glade b/gnucash/gtkbuilder/window-reconcile.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/window-reconcile.glade
rename to gnucash/gtkbuilder/window-reconcile.glade
diff --git a/gnucash/import-export/CMakeLists.txt b/gnucash/import-export/CMakeLists.txt
index e78a780..2a8ee1e 100644
--- a/gnucash/import-export/CMakeLists.txt
+++ b/gnucash/import-export/CMakeLists.txt
@@ -8,7 +8,6 @@ ADD_SUBDIRECTORY(bi-import)
 ADD_SUBDIRECTORY(csv-exp)
 ADD_SUBDIRECTORY(csv-imp)
 ADD_SUBDIRECTORY(customer-import)
-ADD_SUBDIRECTORY(gschemas)
 ADD_SUBDIRECTORY(log-replay)
 ADD_SUBDIRECTORY(ofx)
 ADD_SUBDIRECTORY(qif)
@@ -72,21 +71,14 @@ INSTALL(TARGETS gncmod-generic-import
 
 INSTALL(FILES ${generic_import_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnucash)
 
-SET(generic_import_GLADE dialog-import.glade)
-
-INSTALL(FILES ${generic_import_GLADE} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
-
-
-FILE(COPY ${generic_import_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
 SET(generic_import_EXTRA_DIST generic-import-design.txt)
 
 SET_LOCAL_DIST(import_export_DIST_local CMakeLists.txt ${generic_import_SOURCES}
-        ${generic_import_HEADERS} ${generic_import_GLADE} ${generic_import_noinst_HEADERS}
+        ${generic_import_HEADERS} ${generic_import_noinst_HEADERS}
         ${generic_import_EXTRA_DIST})
 
 SET(import_export_DIST ${import_export_DIST_local} ${aqbanking_DIST} ${bi_import_DIST}
         ${csv_export_DIST} ${csv_import_DIST} ${customer_import_DIST}
-        ${generic_import_gschema_DIST} ${log_report_DIST} ${ofx_DIST} ${qif_DIST} ${qif_import_DIST}
+        ${log_report_DIST} ${ofx_DIST} ${qif_DIST} ${qif_import_DIST}
         ${test_generic_import_DIST}
         PARENT_SCOPE)
diff --git a/gnucash/import-export/bi-import/CMakeLists.txt b/gnucash/import-export/bi-import/CMakeLists.txt
index 710fc5d..62d580e 100644
--- a/gnucash/import-export/bi-import/CMakeLists.txt
+++ b/gnucash/import-export/bi-import/CMakeLists.txt
@@ -1,7 +1,3 @@
-
-ADD_SUBDIRECTORY(gtkbuilder)
-ADD_SUBDIRECTORY(ui)
-
 SET(bi_import_SOURCES
   gnc-plugin-bi-import.c
   gncmod-bi-import.c
@@ -49,5 +45,4 @@ INSTALL(TARGETS gncmod-bi-import
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 # No headers to install.
 
-SET_LOCAL_DIST(bi_import_DIST_local CMakeLists.txt README ${bi_import_SOURCES} ${bi_import_noinst_HEADERS})
-SET(bi_import_DIST ${bi_import_DIST_local} ${bi_import_ui_DIST} ${bi_import_glade_DIST} PARENT_SCOPE)
+SET_DIST_LIST(bi_import_DIST CMakeLists.txt README ${bi_import_SOURCES} ${bi_import_noinst_HEADERS})
diff --git a/gnucash/import-export/bi-import/gtkbuilder/CMakeLists.txt b/gnucash/import-export/bi-import/gtkbuilder/CMakeLists.txt
deleted file mode 100644
index 7454750..0000000
--- a/gnucash/import-export/bi-import/gtkbuilder/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-set(bi_import_GLADE dialog-bi-import-gui.glade)
-
-FILE(COPY ${bi_import_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
-INSTALL(FILES ${bi_import_GLADE} DESTINATION share/gnucash/gtkbuilder)
-
-SET_DIST_LIST(bi_import_glade_DIST CMakeLists.txt ${bi_import_GLADE})
diff --git a/gnucash/import-export/bi-import/ui/CMakeLists.txt b/gnucash/import-export/bi-import/ui/CMakeLists.txt
deleted file mode 100644
index 3f75c84..0000000
--- a/gnucash/import-export/bi-import/ui/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-set(bi_import_UI gnc-plugin-bi-import-ui.xml)
-
-FILE(COPY ${bi_import_UI} DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-
-INSTALL(FILES ${bi_import_UI} DESTINATION share/gnucash/ui)
-
-SET_DIST_LIST(bi_import_ui_DIST CMakeLists.txt gnc-plugin-bi-import-ui.xml)
diff --git a/gnucash/import-export/csv-exp/CMakeLists.txt b/gnucash/import-export/csv-exp/CMakeLists.txt
index 2047651..9642b89 100644
--- a/gnucash/import-export/csv-exp/CMakeLists.txt
+++ b/gnucash/import-export/csv-exp/CMakeLists.txt
@@ -1,5 +1,3 @@
-ADD_SUBDIRECTORY(gschemas)
-
 SET(csv_export_SOURCES
   gncmod-csv-export.c
   gnc-plugin-csv-export.c
@@ -35,21 +33,5 @@ INSTALL(TARGETS gncmod-csv-export
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 # No headers to install.
 
-SET(csv_export_GLADE assistant-csv-export.glade)
-
-INSTALL(FILES ${csv_export_GLADE} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
-
-SET(csv_export_UI gnc-plugin-csv-export-ui.xml)
-
-INSTALL(FILES ${csv_export_UI} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
-
-FILE(COPY ${csv_export_UI}
-  DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-FILE(COPY ${csv_export_GLADE}
-  DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
-SET_LOCAL_DIST(csv_export_DIST_local CMakeLists.txt 
-        ${csv_export_SOURCES} ${csv_export_noinst_HEADERS}
-        ${csv_export_GLADE} ${csv_export_UI})
-SET(csv_export_DIST ${csv_export_DIST_local} ${csv_exp_gschema_DIST} PARENT_SCOPE)
-
+SET_DIST_LIST (csv_export_DIST CMakeLists.txt
+        ${csv_export_SOURCES} ${csv_export_noinst_HEADERS})
diff --git a/gnucash/import-export/csv-exp/gschemas/CMakeLists.txt b/gnucash/import-export/csv-exp/gschemas/CMakeLists.txt
deleted file mode 100644
index 8f8abd1..0000000
--- a/gnucash/import-export/csv-exp/gschemas/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-SET(csv_exp_GSCHEMA org.gnucash.dialogs.export.csv.gschema.xml)
-
-add_gschema_targets("${csv_exp_GSCHEMA}")
-
-SET_DIST_LIST(csv_exp_gschema_DIST CMakeLists.txt org.gnucash.dialogs.export.csv.gschema.xml.in)
diff --git a/gnucash/import-export/csv-imp/CMakeLists.txt b/gnucash/import-export/csv-imp/CMakeLists.txt
index 0fa66a8..a4355c6 100644
--- a/gnucash/import-export/csv-imp/CMakeLists.txt
+++ b/gnucash/import-export/csv-imp/CMakeLists.txt
@@ -1,4 +1,3 @@
-ADD_SUBDIRECTORY(gschemas)
 ADD_SUBDIRECTORY(test)
 
 SET(csv_import_remote_SOURCES
@@ -93,21 +92,6 @@ INSTALL(TARGETS gncmod-csv-import
 
 # No headers to install
 
-SET(csv_import_GLADE assistant-csv-account-import.glade
-      assistant-csv-price-import.glade assistant-csv-trans-import.glade)
-
-INSTALL(FILES ${csv_import_GLADE} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
-
-SET(csv_import_UI gnc-plugin-csv-import-ui.xml)
-
-INSTALL(FILES ${csv_import_UI} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
-
-FILE(COPY ${csv_import_UI}
-  DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-FILE(COPY ${csv_import_GLADE}
-  DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
 SET_LOCAL_DIST(csv_import_DIST_local CMakeLists.txt 
-        ${csv_import_SOURCES} ${csv_import_noinst_HEADERS}
-        ${csv_import_GLADE} ${csv_import_UI})
-SET(csv_import_DIST ${csv_import_DIST_local} ${test_csv_import_DIST} ${csv_import_gschema_DIST} PARENT_SCOPE)
+        ${csv_import_SOURCES} ${csv_import_noinst_HEADERS})
+SET(csv_import_DIST ${csv_import_DIST_local} ${test_csv_import_DIST} PARENT_SCOPE)
diff --git a/gnucash/import-export/csv-imp/gschemas/CMakeLists.txt b/gnucash/import-export/csv-imp/gschemas/CMakeLists.txt
deleted file mode 100644
index e108432..0000000
--- a/gnucash/import-export/csv-imp/gschemas/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-SET(csv_imp_GSCHEMA org.gnucash.dialogs.import.csv.gschema.xml)
-
-add_gschema_targets("${csv_imp_GSCHEMA}")
-
-SET_DIST_LIST(csv_import_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.csv.gschema.xml.in)
diff --git a/gnucash/import-export/customer-import/CMakeLists.txt b/gnucash/import-export/customer-import/CMakeLists.txt
index 7b16594..9e7dcaf 100644
--- a/gnucash/import-export/customer-import/CMakeLists.txt
+++ b/gnucash/import-export/customer-import/CMakeLists.txt
@@ -1,6 +1,3 @@
-ADD_SUBDIRECTORY(gtkbuilder)
-ADD_SUBDIRECTORY(ui)
-
 SET(customer_import_SOURCES
   gnc-plugin-customer-import.c
   gncmod-customer-import.c
@@ -40,5 +37,4 @@ INSTALL(TARGETS gncmod-customer-import
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 # No headers to install.
 
-SET_LOCAL_DIST(customer_import_DIST_local CMakeLists.txt ${customer_import_SOURCES} ${customer_import_noinst_HEADERS})
-SET(customer_import_DIST ${customer_import_DIST_local} ${customer_import_glade_DIST} ${customer_import_ui_DIST} PARENT_SCOPE)
+SET_DIST_LIST (customer_import_DIST CMakeLists.txt ${customer_import_SOURCES} ${customer_import_noinst_HEADERS})
diff --git a/gnucash/import-export/customer-import/gtkbuilder/CMakeLists.txt b/gnucash/import-export/customer-import/gtkbuilder/CMakeLists.txt
deleted file mode 100644
index 79cbf83..0000000
--- a/gnucash/import-export/customer-import/gtkbuilder/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-set(customer_import_GLADE dialog-customer-import-gui.glade)
-FILE(COPY ${customer_import_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
-INSTALL(FILES ${customer_import_GLADE} DESTINATION share/gnucash/gtkbuilder)
-
-SET_DIST_LIST(customer_import_glade_DIST CMakeLists.txt ${customer_import_GLADE})
diff --git a/gnucash/import-export/customer-import/ui/CMakeLists.txt b/gnucash/import-export/customer-import/ui/CMakeLists.txt
deleted file mode 100644
index 73a41bb..0000000
--- a/gnucash/import-export/customer-import/ui/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-set(customer_import_UI gnc-plugin-customer-import-ui.xml)
-FILE(COPY ${customer_import_UI} DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-
-INSTALL(FILES ${customer_import_UI} DESTINATION share/gnucash/ui)
-
-SET_DIST_LIST(customer_import_ui_DIST CMakeLists.txt ${customer_import_UI})
diff --git a/gnucash/import-export/gschemas/CMakeLists.txt b/gnucash/import-export/gschemas/CMakeLists.txt
deleted file mode 100644
index e5290f1..0000000
--- a/gnucash/import-export/gschemas/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-SET(generic_import_GSCHEMA org.gnucash.dialogs.import.generic.gschema.xml)
-
-add_gschema_targets("${generic_import_GSCHEMA}")
-
-SET_DIST_LIST(generic_import_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.generic.gschema.xml.in)
diff --git a/gnucash/import-export/log-replay/CMakeLists.txt b/gnucash/import-export/log-replay/CMakeLists.txt
index 4e8f39d..8009605 100644
--- a/gnucash/import-export/log-replay/CMakeLists.txt
+++ b/gnucash/import-export/log-replay/CMakeLists.txt
@@ -30,12 +30,5 @@ INSTALL(TARGETS gncmod-log-replay
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 # No headers to install.
 
-SET(log_replay_UI gnc-plugin-log-replay-ui.xml)
-
-INSTALL(FILES ${log_replay_UI} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
-
-FILE(COPY ${log_replay_UI}
-  DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-
 SET_DIST_LIST(log_report_DIST CMakeLists.txt 
-        ${log_replay_SOURCES} ${log_replay_noinst_HEADERS} ${log_replay_UI})
+        ${log_replay_SOURCES} ${log_replay_noinst_HEADERS})
diff --git a/gnucash/import-export/qif-imp/CMakeLists.txt b/gnucash/import-export/qif-imp/CMakeLists.txt
index 1b46289..ed197ef 100644
--- a/gnucash/import-export/qif-imp/CMakeLists.txt
+++ b/gnucash/import-export/qif-imp/CMakeLists.txt
@@ -1,6 +1,5 @@
 # CMakeLists.txt for gnucash/import_export/qif-imp
 
-ADD_SUBDIRECTORY(gschemas)
 ADD_SUBDIRECTORY(test)
 
 SET (qif_import_SOURCES
@@ -90,19 +89,6 @@ GNC_ADD_SCHEME_TARGETS(scm-qif-import
   FALSE
 )
 
-SET(qif_import_GLADE assistant-qif-import.glade dialog-account-picker.glade)
-
-INSTALL(FILES ${qif_import_GLADE} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
-
-SET(qif_import_UI gnc-plugin-qif-import-ui.xml)
-
-INSTALL(FILES ${qif_import_UI} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
-
-FILE(COPY ${qif_import_UI}
-  DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-FILE(COPY ${qif_import_GLADE}
-  DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
 SET_LOCAL_DIST(qif_import_DIST_local CMakeLists.txt file-format.txt ${qif_import_SOURCES} ${qif_import_noinst_HEADERS}
-        ${qif_import_SCHEME_0} ${qif_import_SCHEME} ${qif_import_SCHEME_2} ${qif_import_GLADE} ${qif_import_UI})
-SET(qif_import_DIST ${qif_import_DIST_local} ${test_qif_import_DIST} ${qif_import_gschema_DIST} PARENT_SCOPE)
+        ${qif_import_SCHEME_0} ${qif_import_SCHEME} ${qif_import_SCHEME_2})
+SET(qif_import_DIST ${qif_import_DIST_local} ${test_qif_import_DIST} PARENT_SCOPE)
diff --git a/gnucash/import-export/qif-imp/gschemas/CMakeLists.txt b/gnucash/import-export/qif-imp/gschemas/CMakeLists.txt
deleted file mode 100644
index fa15f03..0000000
--- a/gnucash/import-export/qif-imp/gschemas/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-set(qif_imp_GSCHEMA org.gnucash.dialogs.import.qif.gschema.xml)
-
-add_gschema_targets("${qif_imp_GSCHEMA}")
-
-SET_DIST_LIST(qif_import_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.qif.gschema.xml.in)
diff --git a/gnucash/report/report-gnome/CMakeLists.txt b/gnucash/report/report-gnome/CMakeLists.txt
index f587824..aa54fed 100644
--- a/gnucash/report/report-gnome/CMakeLists.txt
+++ b/gnucash/report/report-gnome/CMakeLists.txt
@@ -73,17 +73,6 @@ GNC_ADD_SCHEME_TARGETS(scm-report-gnome
     FALSE
 )
 
-SET(report_gnome_GLADE dialog-custom-report.glade dialog-report.glade)
-
-INSTALL(FILES ${report_gnome_GLADE} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
-
-SET(report_gnome_UI gnc-plugin-page-report-ui.xml)
-
-INSTALL(FILES ${report_gnome_UI} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
-
-FILE(COPY ${report_gnome_UI} DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-FILE(COPY ${report_gnome_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
-SET_LOCAL_DIST(report_gnome_DIST_local CMakeLists.txt report-gnome.i ${report_gnome_HEADERS} ${report_gnome_SOURCES}
-        ${report_gnome_SCHEME} ${report_gnome_GLADE} ${report_gnome_UI})
+SET_LOCAL_DIST(report_gnome_DIST_local CMakeLists.txt report-gnome.i ${report_gnome_HEADERS}
+    ${report_gnome_SOURCES} ${report_gnome_SCHEME})
 SET(report_gnome_DIST ${report_gnome_DIST_local} ${test_report_gnome_DIST} PARENT_SCOPE)
diff --git a/gnucash/report/stylesheets/CMakeLists.txt b/gnucash/report/stylesheets/CMakeLists.txt
index 4ece021..0ac1b97 100644
--- a/gnucash/report/stylesheets/CMakeLists.txt
+++ b/gnucash/report/stylesheets/CMakeLists.txt
@@ -73,15 +73,8 @@ GNC_ADD_SCHEME_TARGETS(scm-report-stylesheets-2
 
 ADD_CUSTOM_TARGET(scm-report-stylesheets ALL DEPENDS scm-report-stylesheets-1 scm-report-stylesheets-2)
 
-SET(stylesheets_UI gnc-plugin-stylesheets-ui.xml)
-
-INSTALL(FILES ${stylesheets_UI} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
-
-FILE(COPY ${stylesheets_UI}
-  DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-
 SET_LOCAL_DIST(stylesheets_DIST_local CMakeLists.txt 
         ${stylesheets_SOURCES} ${stylesheets_noinst_HEADERS}
-        ${stylesheets_SCHEME_1} ${stylesheets_SCHEME_2}  ${stylesheets_UI})
+        ${stylesheets_SCHEME_1} ${stylesheets_SCHEME_2})
 
 SET(stylesheets_DIST ${stylesheets_DIST_local} ${test_stylesheets_DIST} PARENT_SCOPE)
diff --git a/gnucash/gnome/ui/CMakeLists.txt b/gnucash/ui/CMakeLists.txt
similarity index 55%
rename from gnucash/gnome/ui/CMakeLists.txt
rename to gnucash/ui/CMakeLists.txt
index 75791f7..64a2df5 100644
--- a/gnucash/gnome/ui/CMakeLists.txt
+++ b/gnucash/ui/CMakeLists.txt
@@ -1,9 +1,15 @@
-SET(gnome_UI
+set (ui_SOURCES
+      gnc-main-window-ui.xml
       gnc-plugin-account-tree-ui.xml
       gnc-plugin-basic-commands-ui.xml
+      gnc-plugin-bi-import-ui.xml
       gnc-plugin-budget-ui.xml
       gnc-plugin-business-ui.xml
+      gnc-plugin-csv-export-ui.xml
+      gnc-plugin-csv-import-ui.xml
+      gnc-plugin-customer-import-ui.xml
       gnc-plugin-file-history-ui.xml
+      gnc-plugin-log-replay-ui.xml
       gnc-plugin-page-account-tree2-ui.xml
       gnc-plugin-page-account-tree-ui.xml
       gnc-plugin-page-budget-ui.xml
@@ -11,19 +17,25 @@ SET(gnome_UI
       gnc-plugin-page-owner-tree-ui.xml
       gnc-plugin-page-register2-ui.xml
       gnc-plugin-page-register-ui.xml
+      gnc-plugin-page-report-ui.xml
       gnc-plugin-page-sx-list2-ui.xml
       gnc-plugin-page-sx-list-ui.xml
       gnc-plugin-page-sxregister-ui.xml
+      gnc-plugin-qif-import-ui.xml
       gnc-plugin-register22-ui.xml
       gnc-plugin-register2-ui.xml
       gnc-plugin-register-ui.xml
+      gnc-plugin-stylesheets-ui.xml
       gnc-reconcile-window-ui.xml
       gnc-sxed-to-create-window-ui.xml
       gnc-sxed-window-ui-full.xml
-      gnc-sxed-window-ui.xml)
+      gnc-sxed-window-ui.xml
+      gnc-windows-menu-ui-quartz.xml
+      gnc-windows-menu-ui.xml
+      osx_accel_map)
 
-FILE(COPY ${gnome_UI} DESTINATION ${DATADIR_BUILD}/gnucash/ui)
+file (COPY ${ui_SOURCES} DESTINATION ${DATADIR_BUILD}/gnucash/ui)
 
-INSTALL(FILES ${gnome_UI} DESTINATION share/gnucash/ui)
+install (FILES ${ui_SOURCES} DESTINATION share/gnucash/ui)
 
-SET_DIST_LIST(gnome_ui_DIST CMakeLists.txt ${gnome_UI})
+SET_DIST_LIST(ui_DIST CMakeLists.txt ${ui_SOURCES})
diff --git a/gnucash/gnome-utils/ui/gnc-main-window-ui.xml b/gnucash/ui/gnc-main-window-ui.xml
similarity index 100%
rename from gnucash/gnome-utils/ui/gnc-main-window-ui.xml
rename to gnucash/ui/gnc-main-window-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-account-tree-ui.xml b/gnucash/ui/gnc-plugin-account-tree-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-account-tree-ui.xml
rename to gnucash/ui/gnc-plugin-account-tree-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-basic-commands-ui.xml b/gnucash/ui/gnc-plugin-basic-commands-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-basic-commands-ui.xml
rename to gnucash/ui/gnc-plugin-basic-commands-ui.xml
diff --git a/gnucash/import-export/bi-import/ui/gnc-plugin-bi-import-ui.xml b/gnucash/ui/gnc-plugin-bi-import-ui.xml
similarity index 100%
rename from gnucash/import-export/bi-import/ui/gnc-plugin-bi-import-ui.xml
rename to gnucash/ui/gnc-plugin-bi-import-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-budget-ui.xml b/gnucash/ui/gnc-plugin-budget-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-budget-ui.xml
rename to gnucash/ui/gnc-plugin-budget-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-business-ui.xml b/gnucash/ui/gnc-plugin-business-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-business-ui.xml
rename to gnucash/ui/gnc-plugin-business-ui.xml
diff --git a/gnucash/import-export/csv-exp/gnc-plugin-csv-export-ui.xml b/gnucash/ui/gnc-plugin-csv-export-ui.xml
similarity index 100%
rename from gnucash/import-export/csv-exp/gnc-plugin-csv-export-ui.xml
rename to gnucash/ui/gnc-plugin-csv-export-ui.xml
diff --git a/gnucash/import-export/csv-imp/gnc-plugin-csv-import-ui.xml b/gnucash/ui/gnc-plugin-csv-import-ui.xml
similarity index 100%
rename from gnucash/import-export/csv-imp/gnc-plugin-csv-import-ui.xml
rename to gnucash/ui/gnc-plugin-csv-import-ui.xml
diff --git a/gnucash/import-export/customer-import/ui/gnc-plugin-customer-import-ui.xml b/gnucash/ui/gnc-plugin-customer-import-ui.xml
similarity index 100%
rename from gnucash/import-export/customer-import/ui/gnc-plugin-customer-import-ui.xml
rename to gnucash/ui/gnc-plugin-customer-import-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-file-history-ui.xml b/gnucash/ui/gnc-plugin-file-history-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-file-history-ui.xml
rename to gnucash/ui/gnc-plugin-file-history-ui.xml
diff --git a/gnucash/import-export/log-replay/gnc-plugin-log-replay-ui.xml b/gnucash/ui/gnc-plugin-log-replay-ui.xml
similarity index 100%
rename from gnucash/import-export/log-replay/gnc-plugin-log-replay-ui.xml
rename to gnucash/ui/gnc-plugin-log-replay-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-page-account-tree-ui.xml b/gnucash/ui/gnc-plugin-page-account-tree-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-page-account-tree-ui.xml
rename to gnucash/ui/gnc-plugin-page-account-tree-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-page-account-tree2-ui.xml b/gnucash/ui/gnc-plugin-page-account-tree2-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-page-account-tree2-ui.xml
rename to gnucash/ui/gnc-plugin-page-account-tree2-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-page-budget-ui.xml b/gnucash/ui/gnc-plugin-page-budget-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-page-budget-ui.xml
rename to gnucash/ui/gnc-plugin-page-budget-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-page-invoice-ui.xml b/gnucash/ui/gnc-plugin-page-invoice-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-page-invoice-ui.xml
rename to gnucash/ui/gnc-plugin-page-invoice-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-page-owner-tree-ui.xml b/gnucash/ui/gnc-plugin-page-owner-tree-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-page-owner-tree-ui.xml
rename to gnucash/ui/gnc-plugin-page-owner-tree-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-page-register-ui.xml b/gnucash/ui/gnc-plugin-page-register-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-page-register-ui.xml
rename to gnucash/ui/gnc-plugin-page-register-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-page-register2-ui.xml b/gnucash/ui/gnc-plugin-page-register2-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-page-register2-ui.xml
rename to gnucash/ui/gnc-plugin-page-register2-ui.xml
diff --git a/gnucash/report/report-gnome/gnc-plugin-page-report-ui.xml b/gnucash/ui/gnc-plugin-page-report-ui.xml
similarity index 100%
rename from gnucash/report/report-gnome/gnc-plugin-page-report-ui.xml
rename to gnucash/ui/gnc-plugin-page-report-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-page-sx-list-ui.xml b/gnucash/ui/gnc-plugin-page-sx-list-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-page-sx-list-ui.xml
rename to gnucash/ui/gnc-plugin-page-sx-list-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-page-sx-list2-ui.xml b/gnucash/ui/gnc-plugin-page-sx-list2-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-page-sx-list2-ui.xml
rename to gnucash/ui/gnc-plugin-page-sx-list2-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-page-sxregister-ui.xml b/gnucash/ui/gnc-plugin-page-sxregister-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-page-sxregister-ui.xml
rename to gnucash/ui/gnc-plugin-page-sxregister-ui.xml
diff --git a/gnucash/import-export/qif-imp/gnc-plugin-qif-import-ui.xml b/gnucash/ui/gnc-plugin-qif-import-ui.xml
similarity index 100%
rename from gnucash/import-export/qif-imp/gnc-plugin-qif-import-ui.xml
rename to gnucash/ui/gnc-plugin-qif-import-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-register-ui.xml b/gnucash/ui/gnc-plugin-register-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-register-ui.xml
rename to gnucash/ui/gnc-plugin-register-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-register2-ui.xml b/gnucash/ui/gnc-plugin-register2-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-register2-ui.xml
rename to gnucash/ui/gnc-plugin-register2-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-register22-ui.xml b/gnucash/ui/gnc-plugin-register22-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-register22-ui.xml
rename to gnucash/ui/gnc-plugin-register22-ui.xml
diff --git a/gnucash/report/stylesheets/gnc-plugin-stylesheets-ui.xml b/gnucash/ui/gnc-plugin-stylesheets-ui.xml
similarity index 100%
rename from gnucash/report/stylesheets/gnc-plugin-stylesheets-ui.xml
rename to gnucash/ui/gnc-plugin-stylesheets-ui.xml
diff --git a/gnucash/gnome/ui/gnc-reconcile-window-ui.xml b/gnucash/ui/gnc-reconcile-window-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-reconcile-window-ui.xml
rename to gnucash/ui/gnc-reconcile-window-ui.xml
diff --git a/gnucash/gnome/ui/gnc-sxed-to-create-window-ui.xml b/gnucash/ui/gnc-sxed-to-create-window-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-sxed-to-create-window-ui.xml
rename to gnucash/ui/gnc-sxed-to-create-window-ui.xml
diff --git a/gnucash/gnome/ui/gnc-sxed-window-ui-full.xml b/gnucash/ui/gnc-sxed-window-ui-full.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-sxed-window-ui-full.xml
rename to gnucash/ui/gnc-sxed-window-ui-full.xml
diff --git a/gnucash/gnome/ui/gnc-sxed-window-ui.xml b/gnucash/ui/gnc-sxed-window-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-sxed-window-ui.xml
rename to gnucash/ui/gnc-sxed-window-ui.xml
diff --git a/gnucash/gnome-utils/ui/gnc-windows-menu-ui-quartz.xml b/gnucash/ui/gnc-windows-menu-ui-quartz.xml
similarity index 100%
rename from gnucash/gnome-utils/ui/gnc-windows-menu-ui-quartz.xml
rename to gnucash/ui/gnc-windows-menu-ui-quartz.xml
diff --git a/gnucash/gnome-utils/ui/gnc-windows-menu-ui.xml b/gnucash/ui/gnc-windows-menu-ui.xml
similarity index 100%
rename from gnucash/gnome-utils/ui/gnc-windows-menu-ui.xml
rename to gnucash/ui/gnc-windows-menu-ui.xml
diff --git a/gnucash/gnome-utils/ui/osx_accel_map b/gnucash/ui/osx_accel_map
similarity index 100%
rename from gnucash/gnome-utils/ui/osx_accel_map
rename to gnucash/ui/osx_accel_map
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8b0fe05..d9f7bc8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -87,39 +87,6 @@ gnucash/gnome/gnc-split-reg2.c
 gnucash/gnome/gnc-split-reg.c
 gnucash/gnome/gnucash.appdata.xml.in
 gnucash/gnome/gnucash.desktop.in.in
-gnucash/gnome/gtkbuilder/assistant-acct-period.glade
-gnucash/gnome/gtkbuilder/assistant-hierarchy.glade
-gnucash/gnome/gtkbuilder/assistant-loan.glade
-gnucash/gnome/gtkbuilder/assistant-stock-split.glade
-gnucash/gnome/gtkbuilder/business-options-gnome.glade
-gnucash/gnome/gtkbuilder/business-prefs.glade
-gnucash/gnome/gtkbuilder/dialog-billterms.glade
-gnucash/gnome/gtkbuilder/dialog-choose-owner.glade
-gnucash/gnome/gtkbuilder/dialog-commodities.glade
-gnucash/gnome/gtkbuilder/dialog-customer.glade
-gnucash/gnome/gtkbuilder/dialog-date-close.glade
-gnucash/gnome/gtkbuilder/dialog-employee.glade
-gnucash/gnome/gtkbuilder/dialog-fincalc.glade
-gnucash/gnome/gtkbuilder/dialog-find-account.glade
-gnucash/gnome/gtkbuilder/dialog-imap-editor.glade
-gnucash/gnome/gtkbuilder/dialog-invoice.glade
-gnucash/gnome/gtkbuilder/dialog-job.glade
-gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade
-gnucash/gnome/gtkbuilder/dialog-new-user.glade
-gnucash/gnome/gtkbuilder/dialog-order.glade
-gnucash/gnome/gtkbuilder/dialog-payment.glade
-gnucash/gnome/gtkbuilder/dialog-price.glade
-gnucash/gnome/gtkbuilder/dialog-print-check.glade
-gnucash/gnome/gtkbuilder/dialog-progress.glade
-gnucash/gnome/gtkbuilder/dialog-sx.glade
-gnucash/gnome/gtkbuilder/dialog-tax-info.glade
-gnucash/gnome/gtkbuilder/dialog-trans-assoc.glade
-gnucash/gnome/gtkbuilder/dialog-vendor.glade
-gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade
-gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade
-gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade
-gnucash/gnome/gtkbuilder/window-autoclear.glade
-gnucash/gnome/gtkbuilder/window-reconcile.glade
 gnucash/gnome/reconcile-view.c
 gnucash/gnome/search-owner.c
 gnucash/gnome/top-level.c
@@ -127,7 +94,6 @@ gnucash/gnome/window-autoclear.c
 gnucash/gnome/window-reconcile2.c
 gnucash/gnome/window-reconcile.c
 gnucash/gnome-search/dialog-search.c
-gnucash/gnome-search/dialog-search.glade
 gnucash/gnome-search/gnc-general-search.c
 gnucash/gnome-search/gncmod-gnome-search.c
 gnucash/gnome-search/search-account.c
@@ -217,24 +183,6 @@ gnucash/gnome-utils/gnc-tree-view-split-reg.c
 gnucash/gnome-utils/gnc-tree-view-sx-list.c
 gnucash/gnome-utils/gnc-window.c
 gnucash/gnome-utils/gnome-utils.scm
-gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade
-gnucash/gnome-utils/gtkbuilder/dialog-account.glade
-gnucash/gnome-utils/gtkbuilder/dialog-book-close.glade
-gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade
-gnucash/gnome-utils/gtkbuilder/dialog-file-access.glade
-gnucash/gnome-utils/gtkbuilder/dialog-object-references.glade
-gnucash/gnome-utils/gtkbuilder/dialog-options.glade
-gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade
-gnucash/gnome-utils/gtkbuilder/dialog-query-view.glade
-gnucash/gnome-utils/gtkbuilder/dialog-reset-warnings.glade
-gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade
-gnucash/gnome-utils/gtkbuilder/dialog-totd.glade
-gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade
-gnucash/gnome-utils/gtkbuilder/dialog-userpass.glade
-gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade
-gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade
-gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade
-gnucash/gnome-utils/gtkbuilder/gnc-tree-view-owner.glade
 gnucash/gnome-utils/misc-gnome-utils.c
 gnucash/gnome-utils/print-session.c
 gnucash/gnome-utils/search-param.c
@@ -244,7 +192,11 @@ gnucash/gnucash-bin.c
 gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in
 gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in
 gnucash/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in
+gnucash/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in
 gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in
+gnucash/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in
+gnucash/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in
+gnucash/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in
 gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in
 gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in
 gnucash/gschemas/org.gnucash.dialogs.totd.gschema.xml.in
@@ -254,6 +206,69 @@ gnucash/gschemas/org.gnucash.history.gschema.xml.in
 gnucash/gschemas/org.gnucash.warnings.gschema.xml.in
 gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in
 gnucash/gschemas/org.gnucash.window.pages.gschema.xml.in
+gnucash/gtkbuilder/assistant-acct-period.glade
+gnucash/gtkbuilder/assistant-csv-account-import.glade
+gnucash/gtkbuilder/assistant-csv-export.glade
+gnucash/gtkbuilder/assistant-csv-price-import.glade
+gnucash/gtkbuilder/assistant-csv-trans-import.glade
+gnucash/gtkbuilder/assistant-hierarchy.glade
+gnucash/gtkbuilder/assistant-loan.glade
+gnucash/gtkbuilder/assistant-qif-import.glade
+gnucash/gtkbuilder/assistant-stock-split.glade
+gnucash/gtkbuilder/assistant-xml-encoding.glade
+gnucash/gtkbuilder/business-options-gnome.glade
+gnucash/gtkbuilder/business-prefs.glade
+gnucash/gtkbuilder/dialog-account.glade
+gnucash/gtkbuilder/dialog-account-picker.glade
+gnucash/gtkbuilder/dialog-bi-import-gui.glade
+gnucash/gtkbuilder/dialog-billterms.glade
+gnucash/gtkbuilder/dialog-book-close.glade
+gnucash/gtkbuilder/dialog-choose-owner.glade
+gnucash/gtkbuilder/dialog-commodities.glade
+gnucash/gtkbuilder/dialog-commodity.glade
+gnucash/gtkbuilder/dialog-customer.glade
+gnucash/gtkbuilder/dialog-customer-import-gui.glade
+gnucash/gtkbuilder/dialog-custom-report.glade
+gnucash/gtkbuilder/dialog-date-close.glade
+gnucash/gtkbuilder/dialog-employee.glade
+gnucash/gtkbuilder/dialog-file-access.glade
+gnucash/gtkbuilder/dialog-fincalc.glade
+gnucash/gtkbuilder/dialog-find-account.glade
+gnucash/gtkbuilder/dialog-imap-editor.glade
+gnucash/gtkbuilder/dialog-import.glade
+gnucash/gtkbuilder/dialog-invoice.glade
+gnucash/gtkbuilder/dialog-job.glade
+gnucash/gtkbuilder/dialog-lot-viewer.glade
+gnucash/gtkbuilder/dialog-new-user.glade
+gnucash/gtkbuilder/dialog-object-references.glade
+gnucash/gtkbuilder/dialog-options.glade
+gnucash/gtkbuilder/dialog-order.glade
+gnucash/gtkbuilder/dialog-payment.glade
+gnucash/gtkbuilder/dialog-preferences.glade
+gnucash/gtkbuilder/dialog-price.glade
+gnucash/gtkbuilder/dialog-print-check.glade
+gnucash/gtkbuilder/dialog-progress.glade
+gnucash/gtkbuilder/dialog-query-view.glade
+gnucash/gtkbuilder/dialog-report.glade
+gnucash/gtkbuilder/dialog-reset-warnings.glade
+gnucash/gtkbuilder/dialog-search.glade
+gnucash/gtkbuilder/dialog-sx.glade
+gnucash/gtkbuilder/dialog-tax-info.glade
+gnucash/gtkbuilder/dialog-tax-table.glade
+gnucash/gtkbuilder/dialog-totd.glade
+gnucash/gtkbuilder/dialog-trans-assoc.glade
+gnucash/gtkbuilder/dialog-transfer.glade
+gnucash/gtkbuilder/dialog-userpass.glade
+gnucash/gtkbuilder/dialog-vendor.glade
+gnucash/gtkbuilder/gnc-date-format.glade
+gnucash/gtkbuilder/gnc-frequency.glade
+gnucash/gtkbuilder/gnc-plugin-page-budget.glade
+gnucash/gtkbuilder/gnc-plugin-page-register2.glade
+gnucash/gtkbuilder/gnc-plugin-page-register.glade
+gnucash/gtkbuilder/gnc-recurrence.glade
+gnucash/gtkbuilder/gnc-tree-view-owner.glade
+gnucash/gtkbuilder/window-autoclear.glade
+gnucash/gtkbuilder/window-reconcile.glade
 gnucash/html/gnc-html.c
 gnucash/html/gnc-html-factory.c
 gnucash/html/gnc-html-history.c
@@ -281,20 +296,14 @@ gnucash/import-export/bi-import/dialog-bi-import-gui.c
 gnucash/import-export/bi-import/dialog-bi-import-helper.c
 gnucash/import-export/bi-import/gncmod-bi-import.c
 gnucash/import-export/bi-import/gnc-plugin-bi-import.c
-gnucash/import-export/bi-import/gtkbuilder/dialog-bi-import-gui.glade
 gnucash/import-export/csv-exp/assistant-csv-export.c
-gnucash/import-export/csv-exp/assistant-csv-export.glade
 gnucash/import-export/csv-exp/csv-transactions-export.c
 gnucash/import-export/csv-exp/csv-tree-export.c
 gnucash/import-export/csv-exp/gncmod-csv-export.c
 gnucash/import-export/csv-exp/gnc-plugin-csv-export.c
-gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in
 gnucash/import-export/csv-imp/assistant-csv-account-import.c
-gnucash/import-export/csv-imp/assistant-csv-account-import.glade
 gnucash/import-export/csv-imp/assistant-csv-price-import.cpp
-gnucash/import-export/csv-imp/assistant-csv-price-import.glade
 gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
-gnucash/import-export/csv-imp/assistant-csv-trans-import.glade
 gnucash/import-export/csv-imp/csv-account-import.c
 gnucash/import-export/csv-imp/gnc-csv-account-map.c
 gnucash/import-export/csv-imp/gnc-csv-gnumeric-popup.c
@@ -311,15 +320,11 @@ gnucash/import-export/csv-imp/gnc-price-props.cpp
 gnucash/import-export/csv-imp/gnc-tokenizer.cpp
 gnucash/import-export/csv-imp/gnc-trans-props.cpp
 gnucash/import-export/csv-imp/gnc-tx-import.cpp
-gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in
 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/customer-import/gtkbuilder/dialog-customer-import-gui.glade
-gnucash/import-export/dialog-import.glade
 gnucash/import-export/gncmod-generic-import.c
-gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in
 gnucash/import-export/import-account-matcher.c
 gnucash/import-export/import-backend.c
 gnucash/import-export/import-commodity-matcher.c
@@ -342,12 +347,9 @@ gnucash/import-export/qif/qif-context.c
 gnucash/import-export/qif/qif-file.c
 gnucash/import-export/qif/qif-objects.c
 gnucash/import-export/qif-imp/assistant-qif-import.c
-gnucash/import-export/qif-imp/assistant-qif-import.glade
 gnucash/import-export/qif-imp/dialog-account-picker.c
-gnucash/import-export/qif-imp/dialog-account-picker.glade
 gnucash/import-export/qif-imp/gncmod-qif-import.c
 gnucash/import-export/qif-imp/gnc-plugin-qif-import.c
-gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in
 gnucash/import-export/qif-imp/qif-dialog-utils.scm
 gnucash/import-export/qif-imp/qif-file.scm
 gnucash/import-export/qif-imp/qif-guess-map.scm
@@ -431,9 +433,7 @@ gnucash/report/locale-specific/us/taxtxf-de_DE.scm
 gnucash/report/locale-specific/us/taxtxf.scm
 gnucash/report/locale-specific/us/us.scm
 gnucash/report/report-gnome/dialog-custom-report.c
-gnucash/report/report-gnome/dialog-custom-report.glade
 gnucash/report/report-gnome/dialog-report-column-view.c
-gnucash/report/report-gnome/dialog-report.glade
 gnucash/report/report-gnome/dialog-report-style-sheet.c
 gnucash/report/report-gnome/gncmod-report-gnome.c
 gnucash/report/report-gnome/gnc-plugin-page-report.c



Summary of changes:
 gnucash/CMakeLists.txt                             |   8 +-
 gnucash/gnome-search/CMakeLists.txt                |  12 +-
 gnucash/gnome-utils/CMakeLists.txt                 |   5 +-
 gnucash/gnome-utils/gtkbuilder/CMakeLists.txt      |  26 ----
 gnucash/gnome-utils/ui/CMakeLists.txt              |  17 ---
 gnucash/gnome/CMakeLists.txt                       |   6 +-
 gnucash/gnome/gtkbuilder/CMakeLists.txt            |  41 -------
 gnucash/gschemas/CMakeLists.txt                    |  10 +-
 .../org.gnucash.dialogs.export.csv.gschema.xml.in  |   0
 .../org.gnucash.dialogs.import.csv.gschema.xml.in  |   0
 ...g.gnucash.dialogs.import.generic.gschema.xml.in |   0
 .../org.gnucash.dialogs.import.qif.gschema.xml.in  |   0
 gnucash/gtkbuilder/CMakeLists.txt                  |  71 +++++++++++
 .../gtkbuilder/assistant-acct-period.glade         |   0
 .../assistant-csv-account-import.glade             |   0
 .../assistant-csv-export.glade                     |   0
 .../assistant-csv-price-import.glade               |   0
 .../assistant-csv-trans-import.glade               |   0
 .../gtkbuilder/assistant-hierarchy.glade           |   0
 .../{gnome => }/gtkbuilder/assistant-loan.glade    |   0
 .../assistant-qif-import.glade                     |   0
 .../gtkbuilder/assistant-stock-split.glade         |   0
 .../gtkbuilder/assistant-xml-encoding.glade        |   0
 .../gtkbuilder/business-options-gnome.glade        |   0
 .../{gnome => }/gtkbuilder/business-prefs.glade    |   0
 .../dialog-account-picker.glade                    |   0
 .../gtkbuilder/dialog-account.glade                |   0
 .../gtkbuilder/dialog-bi-import-gui.glade          |   0
 .../{gnome => }/gtkbuilder/dialog-billterms.glade  |   0
 .../gtkbuilder/dialog-book-close.glade             |   0
 .../gtkbuilder/dialog-choose-owner.glade           |   0
 .../gtkbuilder/dialog-commodities.glade            |   0
 .../gtkbuilder/dialog-commodity.glade              |   0
 .../dialog-custom-report.glade                     |   0
 .../gtkbuilder/dialog-customer-import-gui.glade    |   0
 .../{gnome => }/gtkbuilder/dialog-customer.glade   |   0
 .../{gnome => }/gtkbuilder/dialog-date-close.glade |   0
 .../{gnome => }/gtkbuilder/dialog-employee.glade   |   0
 .../gtkbuilder/dialog-file-access.glade            |   0
 .../{gnome => }/gtkbuilder/dialog-fincalc.glade    |   0
 .../gtkbuilder/dialog-find-account.glade           |   0
 .../gtkbuilder/dialog-imap-editor.glade            |   0
 .../dialog-import.glade                            |   0
 .../{gnome => }/gtkbuilder/dialog-invoice.glade    |   0
 gnucash/{gnome => }/gtkbuilder/dialog-job.glade    |   0
 .../{gnome => }/gtkbuilder/dialog-lot-viewer.glade |   0
 .../{gnome => }/gtkbuilder/dialog-new-user.glade   |   0
 .../gtkbuilder/dialog-object-references.glade      |   0
 .../gtkbuilder/dialog-options.glade                |   0
 gnucash/{gnome => }/gtkbuilder/dialog-order.glade  |   0
 .../{gnome => }/gtkbuilder/dialog-payment.glade    |   0
 .../gtkbuilder/dialog-preferences.glade            |   0
 gnucash/{gnome => }/gtkbuilder/dialog-price.glade  |   0
 .../gtkbuilder/dialog-print-check.glade            |   0
 .../{gnome => }/gtkbuilder/dialog-progress.glade   |   0
 .../gtkbuilder/dialog-query-view.glade             |   0
 .../dialog-report.glade                            |   0
 .../gtkbuilder/dialog-reset-warnings.glade         |   0
 .../dialog-search.glade                            |   0
 gnucash/{gnome => }/gtkbuilder/dialog-sx.glade     |   0
 .../{gnome => }/gtkbuilder/dialog-tax-info.glade   |   0
 .../gtkbuilder/dialog-tax-table.glade              |   0
 .../{gnome-utils => }/gtkbuilder/dialog-totd.glade |   0
 .../gtkbuilder/dialog-trans-assoc.glade            |   0
 .../gtkbuilder/dialog-transfer.glade               |   0
 .../gtkbuilder/dialog-userpass.glade               |   0
 gnucash/{gnome => }/gtkbuilder/dialog-vendor.glade |   0
 .../gtkbuilder/gnc-date-format.glade               |   0
 .../gtkbuilder/gnc-frequency.glade                 |   0
 .../gtkbuilder/gnc-plugin-page-budget.glade        |   0
 .../gtkbuilder/gnc-plugin-page-register.glade      |   0
 .../gtkbuilder/gnc-plugin-page-register2.glade     |   0
 .../gtkbuilder/gnc-recurrence.glade                |   0
 .../gtkbuilder/gnc-tree-view-owner.glade           |   0
 .../{gnome => }/gtkbuilder/window-autoclear.glade  |   0
 .../{gnome => }/gtkbuilder/window-reconcile.glade  |   0
 gnucash/import-export/CMakeLists.txt               |  12 +-
 gnucash/import-export/bi-import/CMakeLists.txt     |   7 +-
 .../bi-import/gtkbuilder/CMakeLists.txt            |   7 --
 gnucash/import-export/bi-import/ui/CMakeLists.txt  |   7 --
 gnucash/import-export/csv-exp/CMakeLists.txt       |  22 +---
 .../import-export/csv-exp/gschemas/CMakeLists.txt  |   6 -
 gnucash/import-export/csv-imp/CMakeLists.txt       |  20 +--
 .../import-export/csv-imp/gschemas/CMakeLists.txt  |   5 -
 .../import-export/customer-import/CMakeLists.txt   |   6 +-
 .../customer-import/gtkbuilder/CMakeLists.txt      |   6 -
 .../customer-import/ui/CMakeLists.txt              |   6 -
 gnucash/import-export/gschemas/CMakeLists.txt      |   6 -
 gnucash/import-export/log-replay/CMakeLists.txt    |   9 +-
 gnucash/import-export/qif-imp/CMakeLists.txt       |  18 +--
 .../import-export/qif-imp/gschemas/CMakeLists.txt  |   6 -
 gnucash/report/report-gnome/CMakeLists.txt         |  15 +--
 gnucash/report/stylesheets/CMakeLists.txt          |   9 +-
 gnucash/{gnome => }/ui/CMakeLists.txt              |  22 +++-
 .../{gnome-utils => }/ui/gnc-main-window-ui.xml    |   0
 .../{gnome => }/ui/gnc-plugin-account-tree-ui.xml  |   0
 .../ui/gnc-plugin-basic-commands-ui.xml            |   0
 .../bi-import => }/ui/gnc-plugin-bi-import-ui.xml  |   0
 gnucash/{gnome => }/ui/gnc-plugin-budget-ui.xml    |   0
 gnucash/{gnome => }/ui/gnc-plugin-business-ui.xml  |   0
 .../csv-exp => ui}/gnc-plugin-csv-export-ui.xml    |   0
 .../csv-imp => ui}/gnc-plugin-csv-import-ui.xml    |   0
 .../ui/gnc-plugin-customer-import-ui.xml           |   0
 .../{gnome => }/ui/gnc-plugin-file-history-ui.xml  |   0
 .../log-replay => ui}/gnc-plugin-log-replay-ui.xml |   0
 .../ui/gnc-plugin-page-account-tree-ui.xml         |   0
 .../ui/gnc-plugin-page-account-tree2-ui.xml        |   0
 .../{gnome => }/ui/gnc-plugin-page-budget-ui.xml   |   0
 .../{gnome => }/ui/gnc-plugin-page-invoice-ui.xml  |   0
 .../ui/gnc-plugin-page-owner-tree-ui.xml           |   0
 .../{gnome => }/ui/gnc-plugin-page-register-ui.xml |   0
 .../ui/gnc-plugin-page-register2-ui.xml            |   0
 .../gnc-plugin-page-report-ui.xml                  |   0
 .../{gnome => }/ui/gnc-plugin-page-sx-list-ui.xml  |   0
 .../{gnome => }/ui/gnc-plugin-page-sx-list2-ui.xml |   0
 .../ui/gnc-plugin-page-sxregister-ui.xml           |   0
 .../qif-imp => ui}/gnc-plugin-qif-import-ui.xml    |   0
 gnucash/{gnome => }/ui/gnc-plugin-register-ui.xml  |   0
 gnucash/{gnome => }/ui/gnc-plugin-register2-ui.xml |   0
 .../{gnome => }/ui/gnc-plugin-register22-ui.xml    |   0
 .../gnc-plugin-stylesheets-ui.xml                  |   0
 gnucash/{gnome => }/ui/gnc-reconcile-window-ui.xml |   0
 .../ui/gnc-sxed-to-create-window-ui.xml            |   0
 gnucash/{gnome => }/ui/gnc-sxed-window-ui-full.xml |   0
 gnucash/{gnome => }/ui/gnc-sxed-window-ui.xml      |   0
 .../ui/gnc-windows-menu-ui-quartz.xml              |   0
 .../{gnome-utils => }/ui/gnc-windows-menu-ui.xml   |   0
 gnucash/{gnome-utils => }/ui/osx_accel_map         |   0
 po/POTFILES.in                                     | 134 ++++++++++-----------
 129 files changed, 184 insertions(+), 335 deletions(-)
 delete mode 100644 gnucash/gnome-utils/gtkbuilder/CMakeLists.txt
 delete mode 100644 gnucash/gnome-utils/ui/CMakeLists.txt
 delete mode 100644 gnucash/gnome/gtkbuilder/CMakeLists.txt
 rename gnucash/{import-export/csv-exp => }/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in (100%)
 rename gnucash/{import-export/csv-imp => }/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in (100%)
 rename gnucash/{import-export => }/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in (100%)
 rename gnucash/{import-export/qif-imp => }/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in (100%)
 create mode 100644 gnucash/gtkbuilder/CMakeLists.txt
 rename gnucash/{gnome => }/gtkbuilder/assistant-acct-period.glade (100%)
 rename gnucash/{import-export/csv-imp => gtkbuilder}/assistant-csv-account-import.glade (100%)
 rename gnucash/{import-export/csv-exp => gtkbuilder}/assistant-csv-export.glade (100%)
 rename gnucash/{import-export/csv-imp => gtkbuilder}/assistant-csv-price-import.glade (100%)
 rename gnucash/{import-export/csv-imp => gtkbuilder}/assistant-csv-trans-import.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/assistant-hierarchy.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/assistant-loan.glade (100%)
 rename gnucash/{import-export/qif-imp => gtkbuilder}/assistant-qif-import.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/assistant-stock-split.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/assistant-xml-encoding.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/business-options-gnome.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/business-prefs.glade (100%)
 rename gnucash/{import-export/qif-imp => gtkbuilder}/dialog-account-picker.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/dialog-account.glade (100%)
 rename gnucash/{import-export/bi-import => }/gtkbuilder/dialog-bi-import-gui.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-billterms.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/dialog-book-close.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-choose-owner.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-commodities.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/dialog-commodity.glade (100%)
 rename gnucash/{report/report-gnome => gtkbuilder}/dialog-custom-report.glade (100%)
 rename gnucash/{import-export/customer-import => }/gtkbuilder/dialog-customer-import-gui.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-customer.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-date-close.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-employee.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/dialog-file-access.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-fincalc.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-find-account.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-imap-editor.glade (100%)
 rename gnucash/{import-export => gtkbuilder}/dialog-import.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-invoice.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-job.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-lot-viewer.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-new-user.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/dialog-object-references.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/dialog-options.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-order.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-payment.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/dialog-preferences.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-price.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-print-check.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-progress.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/dialog-query-view.glade (100%)
 rename gnucash/{report/report-gnome => gtkbuilder}/dialog-report.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/dialog-reset-warnings.glade (100%)
 rename gnucash/{gnome-search => gtkbuilder}/dialog-search.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-sx.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-tax-info.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/dialog-tax-table.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/dialog-totd.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-trans-assoc.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/dialog-transfer.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/dialog-userpass.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-vendor.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/gnc-date-format.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/gnc-frequency.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/gnc-plugin-page-budget.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/gnc-plugin-page-register.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/gnc-plugin-page-register2.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/gnc-recurrence.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/gnc-tree-view-owner.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/window-autoclear.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/window-reconcile.glade (100%)
 delete mode 100644 gnucash/import-export/bi-import/gtkbuilder/CMakeLists.txt
 delete mode 100644 gnucash/import-export/bi-import/ui/CMakeLists.txt
 delete mode 100644 gnucash/import-export/csv-exp/gschemas/CMakeLists.txt
 delete mode 100644 gnucash/import-export/csv-imp/gschemas/CMakeLists.txt
 delete mode 100644 gnucash/import-export/customer-import/gtkbuilder/CMakeLists.txt
 delete mode 100644 gnucash/import-export/customer-import/ui/CMakeLists.txt
 delete mode 100644 gnucash/import-export/gschemas/CMakeLists.txt
 delete mode 100644 gnucash/import-export/qif-imp/gschemas/CMakeLists.txt
 rename gnucash/{gnome => }/ui/CMakeLists.txt (55%)
 rename gnucash/{gnome-utils => }/ui/gnc-main-window-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-account-tree-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-basic-commands-ui.xml (100%)
 rename gnucash/{import-export/bi-import => }/ui/gnc-plugin-bi-import-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-budget-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-business-ui.xml (100%)
 rename gnucash/{import-export/csv-exp => ui}/gnc-plugin-csv-export-ui.xml (100%)
 rename gnucash/{import-export/csv-imp => ui}/gnc-plugin-csv-import-ui.xml (100%)
 rename gnucash/{import-export/customer-import => }/ui/gnc-plugin-customer-import-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-file-history-ui.xml (100%)
 rename gnucash/{import-export/log-replay => ui}/gnc-plugin-log-replay-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-page-account-tree-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-page-account-tree2-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-page-budget-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-page-invoice-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-page-owner-tree-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-page-register-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-page-register2-ui.xml (100%)
 rename gnucash/{report/report-gnome => ui}/gnc-plugin-page-report-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-page-sx-list-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-page-sx-list2-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-page-sxregister-ui.xml (100%)
 rename gnucash/{import-export/qif-imp => ui}/gnc-plugin-qif-import-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-register-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-register2-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-register22-ui.xml (100%)
 rename gnucash/{report/stylesheets => ui}/gnc-plugin-stylesheets-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-reconcile-window-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-sxed-to-create-window-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-sxed-window-ui-full.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-sxed-window-ui.xml (100%)
 rename gnucash/{gnome-utils => }/ui/gnc-windows-menu-ui-quartz.xml (100%)
 rename gnucash/{gnome-utils => }/ui/gnc-windows-menu-ui.xml (100%)
 rename gnucash/{gnome-utils => }/ui/osx_accel_map (100%)



More information about the gnucash-changes mailing list