gnucash maint: Multiple changes pushed

Robert Fewell bobit at code.gnucash.org
Fri Jul 31 06:41:06 EDT 2020


Updated	 via  https://github.com/Gnucash/gnucash/commit/a4b8b7a2 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/8650ffad (commit)
	from  https://github.com/Gnucash/gnucash/commit/f71af666 (commit)



commit a4b8b7a21aaa9b15f54d8a0ac97ba1130fa640ea
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Fri Jul 31 11:38:55 2020 +0100

    Realign the UI source files so they are consistent.

diff --git a/gnucash/ui/gnc-main-window-ui.xml b/gnucash/ui/gnc-main-window-ui.xml
index 53e8e7030..77580a7c1 100644
--- a/gnucash/ui/gnc-main-window-ui.xml
+++ b/gnucash/ui/gnc-main-window-ui.xml
@@ -28,7 +28,7 @@
       <menuitem name="FileQuit" action="FileQuitAction"/>
       <separator name="FileSep6"/>
     </menu>
-  
+
     <menu name="Edit" action="EditAction">
       <placeholder name="EditModificationPlaceholder"/>
       <separator name="EditSep1"/>
@@ -46,7 +46,7 @@
       <separator name="EditSep5"/>
       <placeholder name="EditStyleSheetsPlaceholder"/>
     </menu>
-  
+
     <menu name="View" action="ViewAction">
       <menuitem name="ViewToolbar" action="ViewToolbarAction"/>
       <menuitem name="ViewSummary" action="ViewSummaryAction"/>
@@ -65,7 +65,7 @@
       <separator name="ViewSep5"/>
       <menuitem name="ViewRefresh" action="ViewRefreshAction"/>
     </menu>
-  
+
     <menu name="Transaction" action="TransactionAction">
     </menu>
 
@@ -83,7 +83,7 @@
       <menuitem name="ActionsForgetWarnings" action="ActionsForgetWarningsAction"/>
       <menuitem name="ActionsRenamePage" action="ActionsRenamePageAction"/>
     </menu>
-  
+
     <placeholder name="AdditionalMenusPlaceholder"/>
 
     <menu name="Reports" action="ReportsAction">
@@ -105,7 +105,7 @@
       <placeholder name="ExtensionsPlaceholder"/>
     </menu>
 
-    <menu name="Windows" action="WindowsAction" >
+    <menu name="Windows" action="WindowsAction">
       <placeholder name= "WindowPlaceholder"/>
     </menu>
 
@@ -115,7 +115,6 @@
       <menuitem name="HelpContents" action="HelpContentsAction"/>
       <menuitem name="HelpAbout" action="HelpAboutAction"/>
     </menu>
-
   </menubar>
 
   <popup name="MainPopup" action="FakeToplevel">
diff --git a/gnucash/ui/gnc-plugin-basic-commands-ui.xml b/gnucash/ui/gnc-plugin-basic-commands-ui.xml
index 022727c9c..b48ebedae 100644
--- a/gnucash/ui/gnc-plugin-basic-commands-ui.xml
+++ b/gnucash/ui/gnc-plugin-basic-commands-ui.xml
@@ -16,14 +16,14 @@
         <menuitem name="FileExportAccounts" action="FileExportAccountsAction"/>
       </menu>
     </menu>
-  
+
     <menu name="Edit" action="EditAction">
       <placeholder name="EditFindPlaceholder">
         <menuitem name="EditFindTransactions" action="EditFindTransactionsAction"/>
       </placeholder>
       <menuitem name="EditTaxOptions" action="EditTaxOptionsAction"/>
     </menu>
-  
+
     <menu name="View" action="ViewAction">
       <menuitem name="ViewRefresh" action="ViewRefreshAction"/>
       <separator name="ViewSep1"/>
@@ -33,7 +33,7 @@
       <separator name="ViewSep2"/>
       <placeholder name="ViewPlaceholder"/>
     </menu>
-  
+
     <menu name="Actions" action="ActionsAction">
       <placeholder name="ActionsPlaceholder">
         <menu name="ActionsScheduledTransactions" action="ActionsScheduledTransactionsAction">
@@ -43,7 +43,7 @@
         </menu>
       </placeholder>
     </menu>
-  
+
     <placeholder name="AdditionalMenusPlaceholder"/>
 
     <menu name="Reports" action="ReportsAction">
@@ -70,7 +70,6 @@
         <menuitem name="HelpTipsOfTheDay" action="HelpTipsOfTheDayAction"/>
       </placeholder>
     </menu>
-
   </menubar>
 
   <toolbar name="DefaultToolbar">
diff --git a/gnucash/ui/gnc-plugin-bi-import-ui.xml b/gnucash/ui/gnc-plugin-bi-import-ui.xml
index 3aef2e512..1eba4f04a 100644
--- a/gnucash/ui/gnc-plugin-bi-import-ui.xml
+++ b/gnucash/ui/gnc-plugin-bi-import-ui.xml
@@ -2,9 +2,9 @@
   <menubar>
     <menu name="File" action="FileAction">
       <menu name="FileImport" action="FileImportAction">
-          <placeholder name="FileImportPlaceholder">
-           <menuitem name="bi_import" action="bi_importAction"/>
-      	</placeholder>
+        <placeholder name="FileImportPlaceholder">
+          <menuitem name="bi_import" action="bi_importAction"/>
+        </placeholder>
       </menu>
     </menu>
   </menubar>
diff --git a/gnucash/ui/gnc-plugin-business-ui.xml b/gnucash/ui/gnc-plugin-business-ui.xml
index aca84e46c..ba7354202 100644
--- a/gnucash/ui/gnc-plugin-business-ui.xml
+++ b/gnucash/ui/gnc-plugin-business-ui.xml
@@ -2,69 +2,67 @@
   <menubar>
     <menu name="Edit" action="EditAction">
       <placeholder name="EditSelectedPlaceholder">
-          <menuitem name="RegisterAssignPayment"       action="RegisterAssignPayment"/>
-          <menuitem name="RegisterEditPayment"       action="RegisterEditPayment"/>
+        <menuitem name="RegisterAssignPayment" action="RegisterAssignPayment"/>
+        <menuitem name="RegisterEditPayment" action="RegisterEditPayment"/>
       </placeholder>
     </menu>
 
     <placeholder name="AdditionalMenusPlaceholder">
       <menu name="Business" action="BusinessAction">
-	<menu name="CustomerMenu" action="CustomerMenuAction">
-	  <menuitem name="CustomerOverviewPage"     action="CustomerOverviewPageAction"/>
-	  <menuitem name="CustomerNewCustomerOpen"  action="CustomerNewCustomerOpenAction"/>
-	  <menuitem name="CustomerFindCustomerOpen" action="CustomerFindCustomerOpenAction"/>
-	  <menuitem name="CustomerNewInvoiceOpen"   action="CustomerNewInvoiceOpenAction"/>
-	  <menuitem name="CustomerFindInvoiceOpen"  action="CustomerFindInvoiceOpenAction"/>
-	  <menuitem name="CustomerNewJobOpen"       action="CustomerNewJobOpenAction"/>
-	  <menuitem name="CustomerFindJobOpen"      action="CustomerFindJobOpenAction"/>
-	  <menuitem name="CustomerProcessPayment"   action="CustomerProcessPaymentAction"/>
+        <menu name="CustomerMenu" action="CustomerMenuAction">
+          <menuitem name="CustomerOverviewPage" action="CustomerOverviewPageAction"/>
+          <menuitem name="CustomerNewCustomerOpen" action="CustomerNewCustomerOpenAction"/>
+          <menuitem name="CustomerFindCustomerOpen" action="CustomerFindCustomerOpenAction"/>
+          <menuitem name="CustomerNewInvoiceOpen" action="CustomerNewInvoiceOpenAction"/>
+          <menuitem name="CustomerFindInvoiceOpen" action="CustomerFindInvoiceOpenAction"/>
+          <menuitem name="CustomerNewJobOpen" action="CustomerNewJobOpenAction"/>
+          <menuitem name="CustomerFindJobOpen" action="CustomerFindJobOpenAction"/>
+          <menuitem name="CustomerProcessPayment" action="CustomerProcessPaymentAction"/>
           <menuitem name="InvoicesDueReminderOpen" action="InvoicesDueReminderOpenAction"/>
-	</menu>
+        </menu>
 
-	<menu name="VendorMenu" action="VendorMenuAction">
-	  <menuitem name="VendorOverviewPage"   action="VendorOverviewPageAction"/>
-	  <menuitem name="VendorNewVendorOpen"  action="VendorNewVendorOpenAction"/>
-	  <menuitem name="VendorFindVendorOpen" action="VendorFindVendorOpenAction"/>
-	  <menuitem name="VendorNewBillOpen"    action="VendorNewBillOpenAction"/>
-	  <menuitem name="VendorFindBillOpen"   action="VendorFindBillOpenAction"/>
-	  <menuitem name="VendorNewJobOpen"     action="VendorNewJobOpenAction"/>
-	  <menuitem name="VendorFindJobOpen"    action="VendorFindJobOpenAction"/>
-	  <menuitem name="VendorProcessPayment" action="VendorProcessPaymentAction"/>
+        <menu name="VendorMenu" action="VendorMenuAction">
+          <menuitem name="VendorOverviewPage" action="VendorOverviewPageAction"/>
+          <menuitem name="VendorNewVendorOpen" action="VendorNewVendorOpenAction"/>
+          <menuitem name="VendorFindVendorOpen" action="VendorFindVendorOpenAction"/>
+          <menuitem name="VendorNewBillOpen" action="VendorNewBillOpenAction"/>
+          <menuitem name="VendorFindBillOpen" action="VendorFindBillOpenAction"/>
+          <menuitem name="VendorNewJobOpen" action="VendorNewJobOpenAction"/>
+          <menuitem name="VendorFindJobOpen" action="VendorFindJobOpenAction"/>
+          <menuitem name="VendorProcessPayment" action="VendorProcessPaymentAction"/>
           <menuitem name="BillsDueReminderOpen" action="BillsDueReminderOpenAction"/>
-	</menu>
+        </menu>
 
-	<menu name="EmployeeMenu" action="EmployeeMenuAction">
-	  <menuitem name="EmployeeOverviewPage"     action="EmployeeOverviewPageAction"/>
-	  <menuitem name="EmployeeNewEmployeeOpen"  action="EmployeeNewEmployeeOpenAction"/>
-	  <menuitem name="EmployeeFindEmployeeOpen" action="EmployeeFindEmployeeOpenAction"/>
-	  <menuitem name="EmployeeNewExpenseOpen"   action="EmployeeNewExpenseVoucherOpenAction"/>
-	  <menuitem name="EmployeeFindExpenseOpen"  action="EmployeeFindExpenseVoucherOpenAction"/>
-	  <menuitem name="EmployeeProcessPayment"   action="EmployeeProcessPaymentAction"/>
-	</menu>
+        <menu name="EmployeeMenu" action="EmployeeMenuAction">
+          <menuitem name="EmployeeOverviewPage" action="EmployeeOverviewPageAction"/>
+          <menuitem name="EmployeeNewEmployeeOpen" action="EmployeeNewEmployeeOpenAction"/>
+          <menuitem name="EmployeeFindEmployeeOpen" action="EmployeeFindEmployeeOpenAction"/>
+          <menuitem name="EmployeeNewExpenseOpen" action="EmployeeNewExpenseVoucherOpenAction"/>
+          <menuitem name="EmployeeFindExpenseOpen" action="EmployeeFindExpenseVoucherOpenAction"/>
+          <menuitem name="EmployeeProcessPayment" action="EmployeeProcessPaymentAction"/>
+        </menu>
 
-	<menuitem name="BusinessAssocOpen" action="BusinessAssocOpenAction"/>
+        <menuitem name="BusinessAssocOpen" action="BusinessAssocOpenAction"/>
 
         <placeholder name="BusinessPlaceholderTop"/>
         <separator name="Sep1"/>
 
-	<menuitem name="TaxTablesOpen" action="TaxTablesOpenAction"/>
-	<menuitem name="BillingTermsOpen" action="BillingTermsOpenAction"/>
+        <menuitem name="TaxTablesOpen" action="TaxTablesOpenAction"/>
+        <menuitem name="BillingTermsOpen" action="BillingTermsOpenAction"/>
 
         <placeholder name="BusinessPlaceholderMiddle"/>
         <placeholder name="BusinessPlaceholderBottom"/>
-
       </menu>
     </placeholder>
 
     <menu name="Extensions" action="ExtensionsAction">
       <placeholder name="ExtensionsPlaceholder">
-      	<menu name="BusinessTest" action="BusinessTestAction">
-      	  <menuitem name="BusinessTestSearch" action="BusinessTestSearchAction"/>
-      	  <menuitem name="BusinessTestInitData" action="BusinessTestInitDataAction"/>
-      	</menu>
+        <menu name="BusinessTest" action="BusinessTestAction">
+          <menuitem name="BusinessTestSearch" action="BusinessTestSearchAction"/>
+          <menuitem name="BusinessTestInitData" action="BusinessTestInitDataAction"/>
+        </menu>
       </placeholder>
     </menu>
-
   </menubar>
 
   <toolbar name="DefaultToolbar">
@@ -76,8 +74,8 @@
   <popup name="MainPopup" action="FakeToplevel">
     <!--separator name="PopupSep3"/-->
     <placeholder name="PopupPlaceholder3">
-        <menuitem name="RegisterAssignPayment"       action="RegisterAssignPayment"/>
-        <menuitem name="RegisterEditPayment"       action="RegisterEditPayment"/>
+      <menuitem name="RegisterAssignPayment" action="RegisterAssignPayment"/>
+      <menuitem name="RegisterEditPayment" action="RegisterEditPayment"/>
     </placeholder>
   </popup>
 </ui>
diff --git a/gnucash/ui/gnc-plugin-csv-export-ui.xml b/gnucash/ui/gnc-plugin-csv-export-ui.xml
index 2a46ce389..47dd5d8c4 100644
--- a/gnucash/ui/gnc-plugin-csv-export-ui.xml
+++ b/gnucash/ui/gnc-plugin-csv-export-ui.xml
@@ -2,11 +2,11 @@
   <menubar>
     <menu name="File" action="FileAction">
       <menu name="FileExport" action="FileExportAction">
-      	<placeholder name="FileExportPlaceholder">
-      	   <menuitem name="FileCsvExportTree" action="CsvExportTreeAction"/>
-      	   <menuitem name="FileCsvExportTrans" action="CsvExportTransAction"/>
-	   <menuitem name="FileCsvExportRegister" action="CsvExportRegisterAction"/>
-      	</placeholder>
+        <placeholder name="FileExportPlaceholder">
+          <menuitem name="FileCsvExportTree" action="CsvExportTreeAction"/>
+          <menuitem name="FileCsvExportTrans" action="CsvExportTransAction"/>
+          <menuitem name="FileCsvExportRegister" action="CsvExportRegisterAction"/>
+        </placeholder>
       </menu>
     </menu>
   </menubar>
diff --git a/gnucash/ui/gnc-plugin-csv-import-ui.xml b/gnucash/ui/gnc-plugin-csv-import-ui.xml
index bdd3043cb..756cb6680 100644
--- a/gnucash/ui/gnc-plugin-csv-import-ui.xml
+++ b/gnucash/ui/gnc-plugin-csv-import-ui.xml
@@ -2,11 +2,11 @@
   <menubar>
     <menu name="File" action="FileAction">
       <menu name="FileImport" action="FileImportAction">
-      	<placeholder name="FileImportPlaceholder">
-      	   <menuitem name="FileCsvImportAccounts" action="CsvImportAccountAction"/>
-      	   <menuitem name="FileCsvImportTrans" action="CsvImportTransAction"/>
-           <menuitem name="FileCsvImportPrice" action="CsvImportPriceAction"/>
-      	</placeholder>
+        <placeholder name="FileImportPlaceholder">
+          <menuitem name="FileCsvImportAccounts" action="CsvImportAccountAction"/>
+          <menuitem name="FileCsvImportTrans" action="CsvImportTransAction"/>
+          <menuitem name="FileCsvImportPrice" action="CsvImportPriceAction"/>
+        </placeholder>
       </menu>
     </menu>
   </menubar>
diff --git a/gnucash/ui/gnc-plugin-customer-import-ui.xml b/gnucash/ui/gnc-plugin-customer-import-ui.xml
index 3b7e3f2c8..51a45a012 100644
--- a/gnucash/ui/gnc-plugin-customer-import-ui.xml
+++ b/gnucash/ui/gnc-plugin-customer-import-ui.xml
@@ -2,9 +2,9 @@
   <menubar>
     <menu name="File" action="FileAction">
       <menu name="FileImport" action="FileImportAction">
-          <placeholder name="FileImportPlaceholder">
-           <menuitem name="customer_import" action="customer_importAction"/>
-          </placeholder>
+        <placeholder name="FileImportPlaceholder">
+          <menuitem name="customer_import" action="customer_importAction"/>
+        </placeholder>
       </menu>
     </menu>
   </menubar>
diff --git a/gnucash/ui/gnc-plugin-log-replay-ui.xml b/gnucash/ui/gnc-plugin-log-replay-ui.xml
index b62a4076f..a211fde4b 100644
--- a/gnucash/ui/gnc-plugin-log-replay-ui.xml
+++ b/gnucash/ui/gnc-plugin-log-replay-ui.xml
@@ -2,9 +2,9 @@
   <menubar>
     <menu name="File" action="FileAction">
       <menu name="FileImport" action="FileImportAction">
-      	<placeholder name="FileImportPlaceholder">
-      	   <menuitem name="LogReplay" action="LogReplayAction"/>
-      	</placeholder>
+        <placeholder name="FileImportPlaceholder">
+           <menuitem name="LogReplay" action="LogReplayAction"/>
+        </placeholder>
       </menu>
     </menu>
   </menubar>
diff --git a/gnucash/ui/gnc-plugin-page-account-tree-ui.xml b/gnucash/ui/gnc-plugin-page-account-tree-ui.xml
index a6c16c74e..2eb8124d5 100644
--- a/gnucash/ui/gnc-plugin-page-account-tree-ui.xml
+++ b/gnucash/ui/gnc-plugin-page-account-tree-ui.xml
@@ -14,29 +14,29 @@
     </menu>
     <menu name="Actions" action="ActionsAction">
       <placeholder name="ActionsPlaceholder">
-      <separator name="ActionsSep1"/>
-      <menuitem name="FileNewAccount" action="FileNewAccountAction"/>
-      <menuitem name="FileAddAccountHierarchyAssistant" action="FileAddAccountHierarchyAssistantAction"/>
-      <separator name="ActionsSep2"/>
-      <menuitem name="ActionsTransfer" action="ActionsTransferAction"/>
-      <menuitem name="ActionsReconcile" action="ActionsReconcileAction"/>
-      <menuitem name="ActionsAutoClear" action="ActionsAutoClearAction"/>
-      <menuitem name="ActionsStockSplit" action="ActionsStockSplitAction"/>
-      <menuitem name="ActionLots" action="ActionsLotsAction"/>
-      <separator name="ActionsSep3"/>
-      <menu name="ScrubMenu" action="ScrubMenuAction">
-        <menuitem name="Scrub" action="ScrubAction"/>
-        <menuitem name="ScrubSub" action="ScrubSubAction"/>
-        <menuitem name="ScrubAll" action="ScrubAllAction"/>
-      </menu>
+        <separator name="ActionsSep1"/>
+        <menuitem name="FileNewAccount" action="FileNewAccountAction"/>
+        <menuitem name="FileAddAccountHierarchyAssistant" action="FileAddAccountHierarchyAssistantAction"/>
+        <separator name="ActionsSep2"/>
+        <menuitem name="ActionsTransfer" action="ActionsTransferAction"/>
+        <menuitem name="ActionsReconcile" action="ActionsReconcileAction"/>
+        <menuitem name="ActionsAutoClear" action="ActionsAutoClearAction"/>
+        <menuitem name="ActionsStockSplit" action="ActionsStockSplitAction"/>
+        <menuitem name="ActionLots" action="ActionsLotsAction"/>
+        <separator name="ActionsSep3"/>
+        <menu name="ScrubMenu" action="ScrubMenuAction">
+          <menuitem name="Scrub" action="ScrubAction"/>
+          <menuitem name="ScrubSub" action="ScrubSubAction"/>
+          <menuitem name="ScrubAll" action="ScrubAllAction"/>
+        </menu>
       </placeholder>
     </menu>
     <menu name="Extensions" action="ExtensionsAction">
       <placeholder name="ExtensionsPlaceholder">
-    <menu name="Register2Test" action="Register2TestAction">
-      <menuitem name="Register2TestAccount" action="Register2TestAccountAction"/>
-      <menuitem name="Register2TestSubAccount" action="Register2TestSubAccountAction"/>
-    </menu>
+        <menu name="Register2Test" action="Register2TestAction">
+        <menuitem name="Register2TestAccount" action="Register2TestAccountAction"/>
+        <menuitem name="Register2TestSubAccount" action="Register2TestSubAccountAction"/>
+        </menu>
       </placeholder>
     </menu>
   </menubar>
diff --git a/gnucash/ui/gnc-plugin-page-account-tree2-ui.xml b/gnucash/ui/gnc-plugin-page-account-tree2-ui.xml
index 94c911912..b98cc55f5 100644
--- a/gnucash/ui/gnc-plugin-page-account-tree2-ui.xml
+++ b/gnucash/ui/gnc-plugin-page-account-tree2-ui.xml
@@ -3,9 +3,10 @@
     <menu name="Edit" action="EditAction">
       <placeholder name="EditSelectedPlaceholder">
         <menuitem name="EditEditAccount" action="EditEditAccountAction"/>
-	<menuitem name="EditDeleteAccount" action="EditDeleteAccountAction"/>
+        <menuitem name="EditDeleteAccount" action="EditDeleteAccountAction"/>
         <menuitem name="EditAccountFindAccount" action="EditFindAccountAction"/>
-	<menuitem name="EditRenumberSubaccounts" action="EditRenumberSubaccountsAction"/>
+        <menuitem name="AccountCascadeProperty" action="EditCascadeAccountAction"/>
+        <menuitem name="EditRenumberSubaccounts" action="EditRenumberSubaccountsAction"/>
         <separator name="EditSep2"/>
         <menuitem name="FileOpenAccount2" action="FileOpenAccount2Action"/>
         <menuitem name="FileOpenAccount" action="FileOpenAccountAction"/>
@@ -15,29 +16,29 @@
     </menu>
     <menu name="Actions" action="ActionsAction">
       <placeholder name="ActionsPlaceholder">
-	<separator name="ActionsSep1"/>
+        <separator name="ActionsSep1"/>
         <menuitem name="FileNewAccount" action="FileNewAccountAction"/>
         <menuitem name="FileAddAccountHierarchyAssistant" action="FileAddAccountHierarchyAssistantAction"/>
         <separator name="ActionsSep2"/>
-	<menuitem name="ActionsTransfer" action="ActionsTransferAction"/>
-	<menuitem name="ActionsReconcile" action="ActionsReconcileAction"/>
-	<menuitem name="ActionsAutoClear" action="ActionsAutoClearAction"/>
-	<menuitem name="ActionsStockSplit" action="ActionsStockSplitAction"/>
-	<menuitem name="ActionLots" action="ActionsLotsAction"/>
-	<separator name="ActionsSep3"/>
-	<menu name="ScrubMenu" action="ScrubMenuAction">
-	  <menuitem name="Scrub" action="ScrubAction"/>
-	  <menuitem name="ScrubSub" action="ScrubSubAction"/>
-	  <menuitem name="ScrubAll" action="ScrubAllAction"/>
-	</menu>
+        <menuitem name="ActionsTransfer" action="ActionsTransferAction"/>
+        <menuitem name="ActionsReconcile" action="ActionsReconcileAction"/>
+        <menuitem name="ActionsAutoClear" action="ActionsAutoClearAction"/>
+        <menuitem name="ActionsStockSplit" action="ActionsStockSplitAction"/>
+        <menuitem name="ActionLots" action="ActionsLotsAction"/>
+        <separator name="ActionsSep3"/>
+        <menu name="ScrubMenu" action="ScrubMenuAction">
+          <menuitem name="Scrub" action="ScrubAction"/>
+          <menuitem name="ScrubSub" action="ScrubSubAction"/>
+          <menuitem name="ScrubAll" action="ScrubAllAction"/>
+        </menu>
       </placeholder>
     </menu>
     <menu name="Extensions" action="ExtensionsAction">
       <placeholder name="ExtensionsPlaceholder">
-	<menu name="Register2Test" action="Register2TestAction">
-	  <menuitem name="Register2TestAccount" action="Register2TestAccountAction"/>
-	  <menuitem name="Register2TestSubAccount" action="Register2TestSubAccountAction"/>
-	</menu>
+        <menu name="Register2Test" action="Register2TestAction">
+          <menuitem name="Register2TestAccount" action="Register2TestAccountAction"/>
+          <menuitem name="Register2TestSubAccount" action="Register2TestSubAccountAction"/>
+        </menu>
       </placeholder>
     </menu>
   </menubar>
@@ -49,6 +50,7 @@
       <menuitem name="AccountOpenSubaccounts2" action="FileOpenSubaccounts2Action"/>
       <menuitem name="AccountOpenSubaccounts" action="FileOpenSubaccountsAction"/>
       <menuitem name="AccountEditAccount" action="EditEditAccountAction"/>
+      <menuitem name="AccountCascadeProperty" action="EditCascadeAccountAction"/>
       <menuitem name="AccountFindAccountPopup" action="EditFindAccountPopupAction"/>
       <separator name="AccountSep1"/>
       <menuitem name="AccountReconcile" action="ActionsReconcileAction"/>
diff --git a/gnucash/ui/gnc-plugin-page-invoice-ui.xml b/gnucash/ui/gnc-plugin-page-invoice-ui.xml
index cfbab6992..d21a29091 100644
--- a/gnucash/ui/gnc-plugin-page-invoice-ui.xml
+++ b/gnucash/ui/gnc-plugin-page-invoice-ui.xml
@@ -2,41 +2,41 @@
   <menubar>
     <menu name="Edit" action="EditAction">
       <placeholder name="EditSelectedPlaceholder">
-        <menuitem name="EditEditInvoice"        action="EditEditInvoiceAction"/>
-        <menuitem name="EditDuplicateInvoice"   action="EditDuplicateInvoiceAction"/>
-        <menuitem name="EditPostInvoice"        action="EditPostInvoiceAction"/>
-        <menuitem name="EditUnpostInvoice"      action="EditUnpostInvoiceAction"/>
+        <menuitem name="EditEditInvoice" action="EditEditInvoiceAction"/>
+        <menuitem name="EditDuplicateInvoice" action="EditDuplicateInvoiceAction"/>
+        <menuitem name="EditPostInvoice" action="EditPostInvoiceAction"/>
+        <menuitem name="EditUnpostInvoice" action="EditUnpostInvoiceAction"/>
       </placeholder>
     </menu>
 
     <menu name="View" action="ViewAction">
       <placeholder name="ViewPlaceholder">
         <separator name="ViewSep44"/>
-        <menuitem name="ViewSaveLayout"         action="ViewSaveLayoutAction"/>
-        <menuitem name="ViewResetLayout"        action="ViewResetLayoutAction"/>
+        <menuitem name="ViewSaveLayout" action="ViewSaveLayoutAction"/>
+        <menuitem name="ViewResetLayout" action="ViewResetLayoutAction"/>
         <separator name="ViewSep45"/>
-        <menu name="SortOrder"                  action="SortOrderAction">
-          <menuitem name="SortStandard"         action="SortStandardAction"/>
+        <menu name="SortOrder" action="SortOrderAction">
+          <menuitem name="SortStandard" action="SortStandardAction"/>
           <separator name="ViewSep43"/>
-          <menuitem name="SortDate"             action="SortDateAction"/>
-          <menuitem name="SortDateEntry"        action="SortDateEntryAction"/>
-          <menuitem name="SortQuantity"         action="SortQuantityAction"/>
-          <menuitem name="SortPrice"            action="SortPriceAction"/>
-          <menuitem name="SortDescription"      action="SortDescriptionAction"/>
+          <menuitem name="SortDate" action="SortDateAction"/>
+          <menuitem name="SortDateEntry" action="SortDateEntryAction"/>
+          <menuitem name="SortQuantity" action="SortQuantityAction"/>
+          <menuitem name="SortPrice" action="SortPriceAction"/>
+          <menuitem name="SortDescription" action="SortDescriptionAction"/>
         </menu>
       </placeholder>
     </menu>
 
     <menu name="Actions" action="ActionsAction">
       <placeholder name="ActionsPlaceholder">
-        <menuitem name="RecordEntry"       	action="RecordEntryAction"/>
-        <menuitem name="CancelEntry"       	action="CancelEntryAction"/>
-        <menuitem name="DeleteEntry"       	action="DeleteEntryAction"/>
-        <menuitem name="BlankEntry"        	action="BlankEntryAction"/>
+        <menuitem name="RecordEntry" action="RecordEntryAction"/>
+        <menuitem name="CancelEntry" action="CancelEntryAction"/>
+        <menuitem name="DeleteEntry" action="DeleteEntryAction"/>
+        <menuitem name="BlankEntry" action="BlankEntryAction"/>
         <separator name="ActionsSep4"/>
-        <menuitem name="DuplicateEntry"    	action="DuplicateEntryAction"/>
-        <menuitem name="UpEntry"    	action="EntryUpAction"/>
-        <menuitem name="DownEntry"    	action="EntryDownAction"/>
+        <menuitem name="DuplicateEntry" action="DuplicateEntryAction"/>
+        <menuitem name="UpEntry" action="EntryUpAction"/>
+        <menuitem name="DownEntry" action="EntryDownAction"/>
       </placeholder>
     </menu>
 
@@ -44,18 +44,18 @@
       <menu name="Business" action="BusinessAction">
         <placeholder name="BusinessPlaceholderMiddle">
           <separator name="BusinessSep1"/>
-          <menuitem name="BusinessAssociation"     action="BusinessAssociationAction"/>
-          <menuitem name="BusinessAssociationOpen"     action="BusinessAssociationOpenAction"/>
-          <menuitem name="BusinessAssociationRemove"     action="BusinessAssociationRemoveAction"/>
+          <menuitem name="BusinessAssociation" action="BusinessAssociationAction"/>
+          <menuitem name="BusinessAssociationOpen" action="BusinessAssociationOpenAction"/>
+          <menuitem name="BusinessAssociationRemove" action="BusinessAssociationRemoveAction"/>
           <separator name="BusinessSep2"/>
-          <menuitem name="ToolsProcessPayment"     action="ToolsProcessPaymentAction"/>
+          <menuitem name="ToolsProcessPayment" action="ToolsProcessPaymentAction"/>
         </placeholder>
       </menu>
     </placeholder>
 
     <menu name="Reports" action="ReportsAction">
       <placeholder name="ReportsPlaceholder">
-        <menuitem name="ReportsCompanyReport"   action="ReportsCompanyReportAction"/>
+        <menuitem name="ReportsCompanyReport" action="ReportsCompanyReportAction"/>
       </placeholder>
     </menu>
   </menubar>
@@ -65,34 +65,34 @@
       <toolitem name="ToolbarPrintInvoice" action="FilePrintAction"/>
     </placeholder>
     <placeholder name="DefaultToolbarPlaceholder">
-      <toolitem name="ToolbarNewInvoice"       action="BusinessNewInvoiceAction"/>
-      <toolitem name="ToolbarEditInvoice"       action="EditEditInvoiceAction"/>
-      <toolitem name="ToolbarDuplicateInvoice"  action="EditDuplicateInvoiceAction"/>
+      <toolitem name="ToolbarNewInvoice" action="BusinessNewInvoiceAction"/>
+      <toolitem name="ToolbarEditInvoice" action="EditEditInvoiceAction"/>
+      <toolitem name="ToolbarDuplicateInvoice" action="EditDuplicateInvoiceAction"/>
       <separator name="ToolbarSep65"/>
-      <toolitem name="ToolbarRecordEntry"    	action="RecordEntryAction"/>
-      <toolitem name="ToolbarCancelEntry"    	action="CancelEntryAction"/>
-      <toolitem name="ToolbarDeleteEntry"    	action="DeleteEntryAction"/>
-      <toolitem name="ToolbarDuplicateEntry" 	action="DuplicateEntryAction"/>
-        <toolitem name="ToolbarUpEntry"    	action="EntryUpAction"/>
-        <toolitem name="ToolbarDownEntry"    	action="EntryDownAction"/>
-      <toolitem name="ToolbarBlankEntry"     	action="BlankEntryAction"/>
+      <toolitem name="ToolbarRecordEntry" action="RecordEntryAction"/>
+      <toolitem name="ToolbarCancelEntry" action="CancelEntryAction"/>
+      <toolitem name="ToolbarDeleteEntry" action="DeleteEntryAction"/>
+      <toolitem name="ToolbarDuplicateEntry" action="DuplicateEntryAction"/>
+      <toolitem name="ToolbarUpEntry" action="EntryUpAction"/>
+      <toolitem name="ToolbarDownEntry" action="EntryDownAction"/>
+      <toolitem name="ToolbarBlankEntry" action="BlankEntryAction"/>
       <separator name="ToolbarSep68"/>
-      <toolitem name="ToolbarPostInvoice"       action="EditPostInvoiceAction"/>
-      <toolitem name="ToolbarUnPostInvoice"     action="EditUnpostInvoiceAction"/>
-      <toolitem name="ToolbarProcessPayment"     action="ToolsProcessPaymentAction"/>
+      <toolitem name="ToolbarPostInvoice" action="EditPostInvoiceAction"/>
+      <toolitem name="ToolbarUnPostInvoice" action="EditUnpostInvoiceAction"/>
+      <toolitem name="ToolbarProcessPayment" action="ToolsProcessPaymentAction"/>
     </placeholder>
   </toolbar>
 
-  <popup name="MainPopup"                       action="FakeToplevel">
+  <popup name="MainPopup" action="FakeToplevel">
     <placeholder name="PopupPlaceholder2">
-      <menuitem name="RecordEntry"       		action="RecordEntryAction"/>
-      <menuitem name="CancelEntry"       		action="CancelEntryAction"/>
-      <menuitem name="DeleteEntry"       		action="DeleteEntryAction"/>
+      <menuitem name="RecordEntry" action="RecordEntryAction"/>
+      <menuitem name="CancelEntry" action="CancelEntryAction"/>
+      <menuitem name="DeleteEntry" action="DeleteEntryAction"/>
       <separator name="PopupSep1"/>
-      <menuitem name="DuplicateEntry"    		action="DuplicateEntryAction"/>
-      <menuitem name="UpEntry"    	action="EntryUpAction"/>
-      <menuitem name="DownEntry"  	action="EntryDownAction"/>
-      <menuitem name="BlankEntry"        		action="BlankEntryAction"/>
+      <menuitem name="DuplicateEntry" action="DuplicateEntryAction"/>
+      <menuitem name="UpEntry" action="EntryUpAction"/>
+      <menuitem name="DownEntry" action="EntryDownAction"/>
+      <menuitem name="BlankEntry" action="BlankEntryAction"/>
     </placeholder>
   </popup>
 </ui>
diff --git a/gnucash/ui/gnc-plugin-page-owner-tree-ui.xml b/gnucash/ui/gnc-plugin-page-owner-tree-ui.xml
index 5a577a80f..1952f3f6c 100644
--- a/gnucash/ui/gnc-plugin-page-owner-tree-ui.xml
+++ b/gnucash/ui/gnc-plugin-page-owner-tree-ui.xml
@@ -2,60 +2,60 @@
   <menubar>
     <menu name="Edit" action="EditAction">
       <placeholder name="EditSelectedPlaceholder">
-        <menuitem name="EditEditVendor"        action="OTEditVendorAction"/>
-        <menuitem name="EditEditCustomer"      action="OTEditCustomerAction"/>
-        <menuitem name="EditEditEmployee"      action="OTEditEmployeeAction"/>
-<!--        <menuitem name="EditDeleteOwner"   action="OTDeleteOwnerAction"/> -->
-        <menuitem name="EditNewVendor"         action="OTNewVendorAction"/>
-        <menuitem name="EditNewCustomer"       action="OTNewCustomerAction"/>
-        <menuitem name="EditNewEmployee"       action="OTNewEmployeeAction"/>
+        <menuitem name="EditEditVendor" action="OTEditVendorAction"/>
+        <menuitem name="EditEditCustomer" action="OTEditCustomerAction"/>
+        <menuitem name="EditEditEmployee" action="OTEditEmployeeAction"/>
+<!--        <menuitem name="EditDeleteOwner" action="OTDeleteOwnerAction"/> -->
+        <menuitem name="EditNewVendor" action="OTNewVendorAction"/>
+        <menuitem name="EditNewCustomer" action="OTNewCustomerAction"/>
+        <menuitem name="EditNewEmployee" action="OTNewEmployeeAction"/>
       </placeholder>
     </menu>
-    
+
     <menu name="Reports" action="ReportsAction">
       <placeholder name="OtherReports">
-        <menuitem name="ReportVendorListingReport"   action="OTVendorListingReportAction"/>
+        <menuitem name="ReportVendorListingReport" action="OTVendorListingReportAction"/>
         <menuitem name="ReportCustomerListingReport" action="OTCustomerListingReportAction"/>
-        <menuitem name="ReportOTVendorReport"        action="OTVendorReportAction"/>
-        <menuitem name="ReportOTCustomerReport"      action="OTCustomerReportAction"/>
-        <menuitem name="ReportOTEmployeeReport"      action="OTEmployeeReportAction"/>
+        <menuitem name="ReportOTVendorReport" action="OTVendorReportAction"/>
+        <menuitem name="ReportOTCustomerReport" action="OTCustomerReportAction"/>
+        <menuitem name="ReportOTEmployeeReport" action="OTEmployeeReportAction"/>
       </placeholder>
     </menu>
   </menubar>
 
   <toolbar name="DefaultToolbar">
     <placeholder name="DefaultToolbarPlaceholder">
-      <toolitem name="ToolbarNewVendor"        action="OTNewVendorAction"/>
-      <toolitem name="ToolbarNewCustomer"      action="OTNewCustomerAction"/>
-      <toolitem name="ToolbarNewEmployee"      action="OTNewEmployeeAction"/>
-      <toolitem name="ToolbarEditVendor"       action="OTEditVendorAction"/>
-      <toolitem name="ToolbarEditCustomer"     action="OTEditCustomerAction"/>
-      <toolitem name="ToolbarEditEmployee"     action="OTEditEmployeeAction"/>
+      <toolitem name="ToolbarNewVendor" action="OTNewVendorAction"/>
+      <toolitem name="ToolbarNewCustomer" action="OTNewCustomerAction"/>
+      <toolitem name="ToolbarNewEmployee" action="OTNewEmployeeAction"/>
+      <toolitem name="ToolbarEditVendor" action="OTEditVendorAction"/>
+      <toolitem name="ToolbarEditCustomer" action="OTEditCustomerAction"/>
+      <toolitem name="ToolbarEditEmployee" action="OTEditEmployeeAction"/>
 <!--      <toolitem name="ToolbarDeleteOwner"  action="OTDeleteOwnerAction"/> -->
       <separator name="ToolbarSep168"/>
-      <toolitem name="ToolbarNewBill"          action="OTNewBillAction"/>
-      <toolitem name="ToolbarNewInvoice"       action="OTNewInvoiceAction"/>
-      <toolitem name="ToolbarNewVoucher"       action="OTNewVoucherAction"/>
-      <toolitem name="ToolbarVendorListing"    action="OTVendorListingReportAction"/>
-      <toolitem name="ToolbarCustomerListing"  action="OTCustomerListingReportAction"/>
-      <toolitem name="ToolbarProcessPayment"   action="OTProcessPaymentAction"/>
+      <toolitem name="ToolbarNewBill"  action="OTNewBillAction"/>
+      <toolitem name="ToolbarNewInvoice" action="OTNewInvoiceAction"/>
+      <toolitem name="ToolbarNewVoucher" action="OTNewVoucherAction"/>
+      <toolitem name="ToolbarVendorListing" action="OTVendorListingReportAction"/>
+      <toolitem name="ToolbarCustomerListing" action="OTCustomerListingReportAction"/>
+      <toolitem name="ToolbarProcessPayment" action="OTProcessPaymentAction"/>
     </placeholder>
   </toolbar>
 
-  <popup name="MainPopup"                      action="FakeToplevel">
+  <popup name="MainPopup" action="FakeToplevel">
     <placeholder name="PopupPlaceholder2">
-        <menuitem name="EditVendor"            action="OTEditVendorAction"/>
-        <menuitem name="EditCustomer"          action="OTEditCustomerAction"/>
-        <menuitem name="EditEmployee"          action="OTEditEmployeeAction"/>
+        <menuitem name="EditVendor" action="OTEditVendorAction"/>
+        <menuitem name="EditCustomer" action="OTEditCustomerAction"/>
+        <menuitem name="EditEmployee" action="OTEditEmployeeAction"/>
 <!--        <menuitem name="DeleteOwner"           action="OTDeleteOwnerAction"/> -->
         <separator name="ToolbarSep169"/>
-        <menuitem name="NewBill"               action="OTNewBillAction"/>
-        <menuitem name="NewInvoice"            action="OTNewInvoiceAction"/>
-        <menuitem name="NewVoucher"            action="OTNewVoucherAction"/>
-        <menuitem name="OTVendorReport"        action="OTVendorReportAction"/>
-        <menuitem name="OTCustomerReport"      action="OTCustomerReportAction"/>
-        <menuitem name="OTEmployeeReport"      action="OTEmployeeReportAction"/>
-        <menuitem name="ProcessPayment"        action="OTProcessPaymentAction"/>
+        <menuitem name="NewBill" action="OTNewBillAction"/>
+        <menuitem name="NewInvoice" action="OTNewInvoiceAction"/>
+        <menuitem name="NewVoucher" action="OTNewVoucherAction"/>
+        <menuitem name="OTVendorReport" action="OTVendorReportAction"/>
+        <menuitem name="OTCustomerReport" action="OTCustomerReportAction"/>
+        <menuitem name="OTEmployeeReport" action="OTEmployeeReportAction"/>
+        <menuitem name="ProcessPayment" action="OTProcessPaymentAction"/>
     </placeholder>
   </popup>
 </ui>
diff --git a/gnucash/ui/gnc-plugin-page-register-ui.xml b/gnucash/ui/gnc-plugin-page-register-ui.xml
index fba5e1262..50d111b46 100644
--- a/gnucash/ui/gnc-plugin-page-register-ui.xml
+++ b/gnucash/ui/gnc-plugin-page-register-ui.xml
@@ -2,25 +2,25 @@
   <menubar>
     <menu name="Edit" action="EditAction">
       <placeholder name="EditAllSelectedPlaceholder">
-        <menuitem name="EditEditAccount"        action="EditEditAccountAction"/>
-        <menuitem name="EditFindAccount"        action="EditFindAccountAction"/>
+        <menuitem name="EditEditAccount" action="EditEditAccountAction"/>
+        <menuitem name="EditFindAccount" action="EditFindAccountAction"/>
       </placeholder>
     </menu>
 
     <menu name="Transaction" action="TransactionAction">
-      <menuitem name="CutTransaction"     	action="CutTransactionAction"/>
-      <menuitem name="CopyTransaction"    	action="CopyTransactionAction"/>
-      <menuitem name="PasteTransaction"   	action="PasteTransactionAction"/>
-      <menuitem name="DuplicateTransaction"    	action="DuplicateTransactionAction"/>
-      <menuitem name="DeleteTransaction"       	action="DeleteTransactionAction"/>
-      <menuitem name="RemoveTransactionSplits" 	action="RemoveTransactionSplitsAction"/>
+      <menuitem name="CutTransaction" action="CutTransactionAction"/>
+      <menuitem name="CopyTransaction" action="CopyTransactionAction"/>
+      <menuitem name="PasteTransaction" action="PasteTransactionAction"/>
+      <menuitem name="DuplicateTransaction" action="DuplicateTransactionAction"/>
+      <menuitem name="DeleteTransaction" action="DeleteTransactionAction"/>
+      <menuitem name="RemoveTransactionSplits" action="RemoveTransactionSplitsAction"/>
       <separator name="TransactionSep1"/>
-      <menuitem name="RecordTransaction"        action="RecordTransactionAction"/>
-      <menuitem name="CancelTransaction"        action="CancelTransactionAction"/>
+      <menuitem name="RecordTransaction" action="RecordTransactionAction"/>
+      <menuitem name="CancelTransaction" action="CancelTransactionAction"/>
       <separator name="TransactionSep2"/>
-      <menuitem name="VoidTransaction"    	action="VoidTransactionAction"/>
-      <menuitem name="UnvoidTransaction"  	action="UnvoidTransactionAction"/>
-      <menuitem name="ReverseTransaction" 	action="ReverseTransactionAction"/>
+      <menuitem name="VoidTransaction" action="VoidTransactionAction"/>
+      <menuitem name="UnvoidTransaction" action="UnvoidTransactionAction"/>
+      <menuitem name="ReverseTransaction" action="ReverseTransactionAction"/>
       <separator name="TransactionSep3"/>
       <menuitem name="AssociateTransaction" action="AssociateTransactionAction"/>
       <menuitem name="AssociateTransactionOpen" action="AssociateTransactionOpenAction"/>
@@ -31,39 +31,39 @@
 
     <menu name="View" action="ViewAction">
       <placeholder name="ViewContentPlaceholder">
-        <menuitem name="ViewStyleBasic"        	action="ViewStyleBasicAction"/>
-        <menuitem name="ViewStyleAutoSplit"    	action="ViewStyleAutoSplitAction"/>
-        <menuitem name="ViewStyleJournal"      	action="ViewStyleJournalAction"/>
+        <menuitem name="ViewStyleBasic" action="ViewStyleBasicAction"/>
+        <menuitem name="ViewStyleAutoSplit" action="ViewStyleAutoSplitAction"/>
+        <menuitem name="ViewStyleJournal" action="ViewStyleJournalAction"/>
         <separator name="ViewSep44"/>
-        <menuitem name="ViewStyleDoubleLine"   	action="ViewStyleDoubleLineAction"/>
+        <menuitem name="ViewStyleDoubleLine" action="ViewStyleDoubleLineAction"/>
       </placeholder>
     </menu>
 
     <menu name="Actions" action="ActionsAction">
       <placeholder name="ActionsPlaceholder">
         <separator name="ActionsSep1"/>
-	<menuitem name="ActionsTransfer"         action="ActionsTransferAction"/>
-	<menuitem name="ActionsReconcile"        action="ActionsReconcileAction"/>
-	<menuitem name="ActionsStockSplit"       action="ActionsStockSplitAction"/>
-	<menuitem name="ActionLots"              action="ActionsLotsAction"/>
+        <menuitem name="ActionsTransfer" action="ActionsTransferAction"/>
+        <menuitem name="ActionsReconcile" action="ActionsReconcileAction"/>
+        <menuitem name="ActionsStockSplit" action="ActionsStockSplitAction"/>
+        <menuitem name="ActionLots" action="ActionsLotsAction"/>
         <separator name="ActionsSep4"/>
-        <menuitem name="BlankTransaction"        action="BlankTransactionAction"/>
-        <menuitem name="SplitTransaction"        action="SplitTransactionAction"/>
-        <menuitem name="EditExchangeRate"        action="EditExchangeRateAction"/>
-        <menuitem name="ScheduleTransaction"     action="ScheduleTransactionAction"/>
-        <menuitem name="JumpTransaction"         action="JumpTransactionAction"/>
-	<separator name="ActionsSep5"/>
+        <menuitem name="BlankTransaction" action="BlankTransactionAction"/>
+        <menuitem name="SplitTransaction" action="SplitTransactionAction"/>
+        <menuitem name="EditExchangeRate" action="EditExchangeRateAction"/>
+        <menuitem name="ScheduleTransaction" action="ScheduleTransactionAction"/>
+        <menuitem name="JumpTransaction" action="JumpTransactionAction"/>
+        <separator name="ActionsSep5"/>
       </placeholder>
       <menu name="ScrubMenu" action="ScrubMenuAction">
-	<menuitem name="ScrubAll" action="ScrubAllAction"/>
-	<menuitem name="ScrubCurrent" action="ScrubCurrentAction"/>
+        <menuitem name="ScrubAll" action="ScrubAllAction"/>
+        <menuitem name="ScrubCurrent" action="ScrubCurrentAction"/>
       </menu>
     </menu>
 
     <menu name="Reports" action="ReportsAction">
       <placeholder name="AccountReports">
-        <menuitem name="ReportsAccountReport"      action="ReportsAccountReportAction"/>
-        <menuitem name="ReportsAcctTransReport"    action="ReportsAcctTransReportAction"/>
+        <menuitem name="ReportsAccountReport" action="ReportsAccountReportAction"/>
+        <menuitem name="ReportsAcctTransReport" action="ReportsAcctTransReportAction"/>
       </placeholder>
     </menu>
   </menubar>
@@ -71,45 +71,45 @@
   <toolbar name="DefaultToolbar">
     <placeholder name="DefaultToolbarPlaceholder">
       <toolitem name="ToolbarDuplicateTransaction" action="DuplicateTransactionAction"/>
-      <toolitem name="ToolbarDeleteTransaction"    action="DeleteTransactionAction"/>
+      <toolitem name="ToolbarDeleteTransaction" action="DeleteTransactionAction"/>
       <separator name="ToolbarSep66"/>
-      <toolitem name="ToolbarRecordTransaction"    action="RecordTransactionAction"/>
-      <toolitem name="ToolbarCancelTransaction"    action="CancelTransactionAction"/>
+      <toolitem name="ToolbarRecordTransaction" action="RecordTransactionAction"/>
+      <toolitem name="ToolbarCancelTransaction" action="CancelTransactionAction"/>
       <separator name="ToolbarSep67"/>
-      <toolitem name="ToolbarBlankTransaction"     action="BlankTransactionAction"/>
-      <toolitem name="ToolbarSplitTransaction"     action="SplitTransactionAction"/>
-      <toolitem name="ToolbarJumpTransaction"      action="JumpTransactionAction"/>
-      <toolitem name="ToolbarScheduleTransaction"  action="ScheduleTransactionAction"/>
+      <toolitem name="ToolbarBlankTransaction" action="BlankTransactionAction"/>
+      <toolitem name="ToolbarSplitTransaction" action="SplitTransactionAction"/>
+      <toolitem name="ToolbarJumpTransaction" action="JumpTransactionAction"/>
+      <toolitem name="ToolbarScheduleTransaction" action="ScheduleTransactionAction"/>
       <separator name="ToolbarSep68"/>
-      <toolitem name="ToolbarTransfer"             action="ActionsTransferAction"/>
-      <toolitem name="ActionsReconcile"            action="ActionsReconcileAction"/>
+      <toolitem name="ToolbarTransfer" action="ActionsTransferAction"/>
+      <toolitem name="ActionsReconcile" action="ActionsReconcileAction"/>
     </placeholder>
   </toolbar>
 
-  <popup name="MainPopup"                    action="FakeToplevel">
+  <popup name="MainPopup" action="FakeToplevel">
     <placeholder name="PopupPlaceholder1">
-      <menuitem name="ViewSortBy"              action="ViewSortByAction"/>
-      <menuitem name="ViewFilterBy"            action="ViewFilterByAction"/>
+      <menuitem name="ViewSortBy" action="ViewSortByAction"/>
+      <menuitem name="ViewFilterBy" action="ViewFilterByAction"/>
     </placeholder>
     <placeholder name="PopupPlaceholder2">
-      <menuitem name="DuplicateTransaction"    action="DuplicateTransactionAction"/>
-      <menuitem name="DeleteTransaction"       action="DeleteTransactionAction"/>
+      <menuitem name="DuplicateTransaction" action="DuplicateTransactionAction"/>
+      <menuitem name="DeleteTransaction" action="DeleteTransactionAction"/>
       <menuitem name="RemoveTransactionSplits" action="RemoveTransactionSplitsAction"/>
       <separator name="PopupSep2"/>
-      <menuitem name="RecordTransaction"       action="RecordTransactionAction"/>
-      <menuitem name="CancelTransaction"       action="CancelTransactionAction"/>
+      <menuitem name="RecordTransaction" action="RecordTransactionAction"/>
+      <menuitem name="CancelTransaction" action="CancelTransactionAction"/>
       <separator name="PopupSep3"/>
       <menuitem name="AssociateTransaction" action="AssociateTransactionAction"/>
       <menuitem name="AssociateTransactionOpen" action="AssociateTransactionOpenAction"/>
       <menuitem name="AssociateTransactionRemove" action="AssociateTransactionRemoveAction"/>
       <separator name="PopupSep4"/>
-      <menuitem name="JumpAssociateInvoice"    action="JumpAssociatedInvoiceAction"/>
+      <menuitem name="JumpAssociateInvoice" action="JumpAssociatedInvoiceAction"/>
       <separator name="PopupSep5"/>
-      <menuitem name="BlankTransaction"        action="BlankTransactionAction"/>
-      <menuitem name="SplitTransaction"        action="SplitTransactionAction"/>
-      <menuitem name="EditExchangeRate"        action="EditExchangeRateAction"/>
-      <menuitem name="ScheduleTransaction"     action="ScheduleTransactionAction"/>
-      <menuitem name="JumpTransaction"         action="JumpTransactionAction"/>
+      <menuitem name="BlankTransaction" action="BlankTransactionAction"/>
+      <menuitem name="SplitTransaction" action="SplitTransactionAction"/>
+      <menuitem name="EditExchangeRate" action="EditExchangeRateAction"/>
+      <menuitem name="ScheduleTransaction" action="ScheduleTransactionAction"/>
+      <menuitem name="JumpTransaction" action="JumpTransactionAction"/>
     </placeholder>
   </popup>
 </ui>
diff --git a/gnucash/ui/gnc-plugin-page-register2-ui.xml b/gnucash/ui/gnc-plugin-page-register2-ui.xml
index f25f93a8a..91b77b0a6 100644
--- a/gnucash/ui/gnc-plugin-page-register2-ui.xml
+++ b/gnucash/ui/gnc-plugin-page-register2-ui.xml
@@ -2,110 +2,110 @@
   <menubar>
     <menu name="Edit" action="EditAction">
       <placeholder name="EditAllSelectedPlaceholder">
-        <menuitem name="EditEditAccount"        action="EditEditAccountAction"/>
-        <menuitem name="EditFindAccount"        action="EditFindAccountAction"/>
+        <menuitem name="EditEditAccount" action="EditEditAccountAction"/>
+        <menuitem name="EditFindAccount" action="EditFindAccountAction"/>
       </placeholder>
     </menu>
 
     <menu name="Transaction" action="TransactionAction">
-      <menuitem name="CutTransaction"     	action="CutTransactionAction"/>
-      <menuitem name="CopyTransaction"    	action="CopyTransactionAction"/>
-      <menuitem name="PasteTransaction"   	action="PasteTransactionAction"/>
-      <menuitem name="TransactionUp"            action="TransactionUpAction"/> 
-      <menuitem name="TransactionDown"          action="TransactionDownAction"/> 
-      <menuitem name="DuplicateTransaction"    	action="DuplicateTransactionAction"/>
-      <menuitem name="DeleteTransaction"       	action="DeleteTransactionAction"/>
-      <menuitem name="RemoveTransactionSplits" 	action="RemoveTransactionSplitsAction"/>
-      <!--menuitem name="ShiftTransactionForward" 	action="ShiftTransactionForwardAction"/-->
+      <menuitem name="CutTransaction" action="CutTransactionAction"/>
+      <menuitem name="CopyTransaction" action="CopyTransactionAction"/>
+      <menuitem name="PasteTransaction" action="PasteTransactionAction"/>
+      <menuitem name="TransactionUp" action="TransactionUpAction"/>
+      <menuitem name="TransactionDown" action="TransactionDownAction"/>
+      <menuitem name="DuplicateTransaction" action="DuplicateTransactionAction"/>
+      <menuitem name="DeleteTransaction" action="DeleteTransactionAction"/>
+      <menuitem name="RemoveTransactionSplits" action="RemoveTransactionSplitsAction"/>
+      <!--menuitem name="ShiftTransactionForward" action="ShiftTransactionForwardAction"/-->
       <separator name="TransactionSep1"/>
-      <menuitem name="RecordTransaction"        action="RecordTransactionAction"/>
-      <menuitem name="CancelTransaction"        action="CancelTransactionAction"/>
+      <menuitem name="RecordTransaction" action="RecordTransactionAction"/>
+      <menuitem name="CancelTransaction" action="CancelTransactionAction"/>
       <separator name="TransactionSep2"/>
-      <menuitem name="VoidTransaction"    	action="VoidTransactionAction"/>
-      <menuitem name="UnvoidTransaction"  	action="UnvoidTransactionAction"/>
-      <menuitem name="ReverseTransaction" 	action="ReverseTransactionAction"/>
+      <menuitem name="VoidTransaction" action="VoidTransactionAction"/>
+      <menuitem name="UnvoidTransaction" action="UnvoidTransactionAction"/>
+      <menuitem name="ReverseTransaction" action="ReverseTransactionAction"/>
     </menu>
 
     <menu name="View" action="ViewAction">
       <placeholder name="ViewContentPlaceholder">
-        <menuitem name="ViewStyleBasic"        	action="ViewStyleBasicAction"/>
-        <menuitem name="ViewStyleAutoSplit"    	action="ViewStyleAutoSplitAction"/>
-        <menuitem name="ViewStyleJournal"      	action="ViewStyleJournalAction"/>
+        <menuitem name="ViewStyleBasic" action="ViewStyleBasicAction"/>
+        <menuitem name="ViewStyleAutoSplit" action="ViewStyleAutoSplitAction"/>
+        <menuitem name="ViewStyleJournal" action="ViewStyleJournalAction"/>
         <separator name="ViewSep44"/>
-        <menuitem name="ViewStyleDoubleLine"   	action="ViewStyleDoubleLineAction"/>
-        <menuitem name="ViewStyleExtraDates"   	action="ViewStyleExtraDatesAction"/>
+        <menuitem name="ViewStyleDoubleLine" action="ViewStyleDoubleLineAction"/>
+        <menuitem name="ViewStyleExtraDates" action="ViewStyleExtraDatesAction"/>
       </placeholder>
     </menu>
 
     <menu name="Actions" action="ActionsAction">
       <placeholder name="ActionsPlaceholder">
         <separator name="ActionsSep1"/>
-	<menuitem name="ActionsTransfer"         action="ActionsTransferAction"/>
-	<menuitem name="ActionsReconcile"        action="ActionsReconcileAction"/>
-	<menuitem name="ActionsStockSplit"       action="ActionsStockSplitAction"/>
-	<menuitem name="ActionLots"              action="ActionsLotsAction"/>
+        <menuitem name="ActionsTransfer" action="ActionsTransferAction"/>
+        <menuitem name="ActionsReconcile" action="ActionsReconcileAction"/>
+        <menuitem name="ActionsStockSplit" action="ActionsStockSplitAction"/>
+        <menuitem name="ActionLots" action="ActionsLotsAction"/>
         <separator name="ActionsSep4"/>
-        <menuitem name="BlankTransaction"        action="BlankTransactionAction"/>
-        <menuitem name="SplitTransaction"        action="SplitTransactionAction"/>
-        <menuitem name="EditExchangeRate"        action="EditExchangeRateAction"/>
-        <menuitem name="ScheduleTransaction"     action="ScheduleTransactionAction"/>
-        <menuitem name="JumpTransaction"         action="JumpTransactionAction"/>
-	<separator name="ActionsSep5"/>
+        <menuitem name="BlankTransaction" action="BlankTransactionAction"/>
+        <menuitem name="SplitTransaction" action="SplitTransactionAction"/>
+        <menuitem name="EditExchangeRate" action="EditExchangeRateAction"/>
+        <menuitem name="ScheduleTransaction" action="ScheduleTransactionAction"/>
+        <menuitem name="JumpTransaction" action="JumpTransactionAction"/>
+        <separator name="ActionsSep5"/>
       </placeholder>
       <menu name="ScrubMenu" action="ScrubMenuAction">
-	<menuitem name="ScrubAll" action="ScrubAllAction"/>
-	<menuitem name="ScrubCurrent" action="ScrubCurrentAction"/>
+        <menuitem name="ScrubAll" action="ScrubAllAction"/>
+        <menuitem name="ScrubCurrent" action="ScrubCurrentAction"/>
       </menu>
     </menu>
 
     <menu name="Reports" action="ReportsAction">
       <placeholder name="AccountReports">
-        <menuitem name="ReportsAccountReport"      action="ReportsAccountReportAction"/>
-        <menuitem name="ReportsAcctTransReport"    action="ReportsAcctTransReportAction"/>
+        <menuitem name="ReportsAccountReport" action="ReportsAccountReportAction"/>
+        <menuitem name="ReportsAcctTransReport" action="ReportsAcctTransReportAction"/>
       </placeholder>
     </menu>
   </menubar>
 
   <toolbar name="DefaultToolbar">
     <placeholder name="DefaultToolbarPlaceholder">
-      <toolitem name="ToolbarTransactionUp"        action="TransactionUpAction"/> 
-      <toolitem name="ToolbarTransactionDown"      action="TransactionDownAction"/> 
+      <toolitem name="ToolbarTransactionUp" action="TransactionUpAction"/>
+      <toolitem name="ToolbarTransactionDown" action="TransactionDownAction"/>
       <toolitem name="ToolbarDuplicateTransaction" action="DuplicateTransactionAction"/>
-      <toolitem name="ToolbarDeleteTransaction"    action="DeleteTransactionAction"/>
+      <toolitem name="ToolbarDeleteTransaction" action="DeleteTransactionAction"/>
       <separator name="ToolbarSep66"/>
-      <toolitem name="ToolbarRecordTransaction"    action="RecordTransactionAction"/>
-      <toolitem name="ToolbarCancelTransaction"    action="CancelTransactionAction"/>
+      <toolitem name="ToolbarRecordTransaction" action="RecordTransactionAction"/>
+      <toolitem name="ToolbarCancelTransaction" action="CancelTransactionAction"/>
       <separator name="ToolbarSep67"/>
-      <toolitem name="ToolbarBlankTransaction"     action="BlankTransactionAction"/>
-      <toolitem name="ToolbarSplitTransaction"     action="SplitTransactionAction"/>
-      <toolitem name="ToolbarJumpTransaction"      action="JumpTransactionAction"/>
-      <toolitem name="ToolbarScheduleTransaction"  action="ScheduleTransactionAction"/>
+      <toolitem name="ToolbarBlankTransaction" action="BlankTransactionAction"/>
+      <toolitem name="ToolbarSplitTransaction" action="SplitTransactionAction"/>
+      <toolitem name="ToolbarJumpTransaction" action="JumpTransactionAction"/>
+      <toolitem name="ToolbarScheduleTransaction" action="ScheduleTransactionAction"/>
       <separator name="ToolbarSep68"/>
-      <toolitem name="ToolbarTransfer"             action="ActionsTransferAction"/>
-      <toolitem name="ActionsReconcile"            action="ActionsReconcileAction"/>
+      <toolitem name="ToolbarTransfer" action="ActionsTransferAction"/>
+      <toolitem name="ActionsReconcile" action="ActionsReconcileAction"/>
     </placeholder>
   </toolbar>
 
-  <popup name="MainPopup"                    action="FakeToplevel">
+  <popup name="MainPopup" action="FakeToplevel">
     <placeholder name="PopupPlaceholder1">
-      <menuitem name="ViewFilterBy"            action="ViewFilterByAction"/>
+      <menuitem name="ViewFilterBy" action="ViewFilterByAction"/>
     </placeholder>
     <placeholder name="PopupPlaceholder2">
-      <menuitem name="TransactionUp"           action="TransactionUpAction"/> 
-      <menuitem name="TransactionDown"         action="TransactionDownAction"/> 
-      <menuitem name="DuplicateTransaction"    action="DuplicateTransactionAction"/>
-      <menuitem name="DeleteTransaction"       action="DeleteTransactionAction"/>
+      <menuitem name="TransactionUp" action="TransactionUpAction"/>
+      <menuitem name="TransactionDown" action="TransactionDownAction"/>
+      <menuitem name="DuplicateTransaction" action="DuplicateTransactionAction"/>
+      <menuitem name="DeleteTransaction" action="DeleteTransactionAction"/>
       <menuitem name="RemoveTransactionSplits" action="RemoveTransactionSplitsAction"/>
-      <!--menuitem name="ShiftTransactionForward" 	action="ShiftTransactionForwardAction"/-->
+      <!--menuitem name="ShiftTransactionForward" action="ShiftTransactionForwardAction"/-->
       <separator name="PopupSep2"/>
-      <menuitem name="RecordTransaction"       action="RecordTransactionAction"/>
-      <menuitem name="CancelTransaction"       action="CancelTransactionAction"/>
+      <menuitem name="RecordTransaction" action="RecordTransactionAction"/>
+      <menuitem name="CancelTransaction" action="CancelTransactionAction"/>
       <separator name="PopupSep3"/>
-      <menuitem name="BlankTransaction"        action="BlankTransactionAction"/>
-      <menuitem name="SplitTransaction"        action="SplitTransactionAction"/>
-      <menuitem name="EditExchangeRate"        action="EditExchangeRateAction"/>
-      <menuitem name="ScheduleTransaction"     action="ScheduleTransactionAction"/>
-      <menuitem name="JumpTransaction"         action="JumpTransactionAction"/>
+      <menuitem name="BlankTransaction" action="BlankTransactionAction"/>
+      <menuitem name="SplitTransaction" action="SplitTransactionAction"/>
+      <menuitem name="EditExchangeRate" action="EditExchangeRateAction"/>
+      <menuitem name="ScheduleTransaction" action="ScheduleTransactionAction"/>
+      <menuitem name="JumpTransaction" action="JumpTransactionAction"/>
     </placeholder>
   </popup>
 </ui>
diff --git a/gnucash/ui/gnc-plugin-page-report-ui.xml b/gnucash/ui/gnc-plugin-page-report-ui.xml
index cc6f0b8c0..c46173f0a 100644
--- a/gnucash/ui/gnc-plugin-page-report-ui.xml
+++ b/gnucash/ui/gnc-plugin-page-report-ui.xml
@@ -6,21 +6,21 @@
       </placeholder>
       <menu name="FileExport" action="FileExportAction">
         <placeholder name="FileExportPlaceholder">
-          <menuitem name="FileReportExport" action="ReportExportAction" />
+          <menuitem name="FileReportExport" action="ReportExportAction"/>
         </placeholder>
       </menu>
     </menu>
 
     <menu name="Edit" action="EditAction">
       <placeholder name="EditStyleSheetsPlaceholder">
-        <menuitem name="EditReportOptions" action="ReportOptionsAction" />
+        <menuitem name="EditReportOptions" action="ReportOptionsAction"/>
       </placeholder>
     </menu>
 
     <menu name="Reports" action="ReportsAction">
       <placeholder name="SavedReportConfigs">
-        <menuitem name="ReportSaveConfig" action="ReportSaveAction" />
-        <menuitem name="ReportSaveConfigAs" action="ReportSaveAsAction" />
+        <menuitem name="ReportSaveConfig" action="ReportSaveAction"/>
+        <menuitem name="ReportSaveConfigAs" action="ReportSaveAsAction"/>
       </placeholder>
     </menu>
   </menubar>
@@ -33,16 +33,16 @@
 
   <toolbar name="DefaultToolbar">
     <placeholder name="DefaultToolbarPlaceholder">
-      <separator name="ReportToolbarSep0" />
-      <toolitem name="ReportToolbarBack" action="ReportBackAction" />
-      <toolitem name="ReportToolbarForw" action="ReportForwAction" />
-      <toolitem name="ReportToolbarReload" action="ReportReloadAction" />
-      <toolitem name="ReportToolbarStop" action="ReportStopAction" />
-      <separator name="ReportToolbarSep1" />
-      <toolitem name="ReportToolbarOptions" action="ReportOptionsAction" />
-      <toolitem name="ReportToolbarSave" action="ReportSaveAction" />
-      <toolitem name="ReportToolbarSaveAs" action="ReportSaveAsAction" />
-      <toolitem name="ReportToolbarExport" action="ReportExportAction" />
+      <separator name="ReportToolbarSep0"/>
+      <toolitem name="ReportToolbarBack" action="ReportBackAction"/>
+      <toolitem name="ReportToolbarForw" action="ReportForwAction"/>
+      <toolitem name="ReportToolbarReload" action="ReportReloadAction"/>
+      <toolitem name="ReportToolbarStop" action="ReportStopAction"/>
+      <separator name="ReportToolbarSep1"/>
+      <toolitem name="ReportToolbarOptions" action="ReportOptionsAction"/>
+      <toolitem name="ReportToolbarSave" action="ReportSaveAction"/>
+      <toolitem name="ReportToolbarSaveAs" action="ReportSaveAsAction"/>
+      <toolitem name="ReportToolbarExport" action="ReportExportAction"/>
       <toolitem name="ReportToolbarPrint" action="FilePrintAction" />
       <toolitem name="ReportToolbarExportPDF" action="FilePrintPDFAction"/>
     </placeholder>
diff --git a/gnucash/ui/gnc-plugin-page-sx-list-ui.xml b/gnucash/ui/gnc-plugin-page-sx-list-ui.xml
index bd419b803..b9dafdc3d 100644
--- a/gnucash/ui/gnc-plugin-page-sx-list-ui.xml
+++ b/gnucash/ui/gnc-plugin-page-sx-list-ui.xml
@@ -11,7 +11,7 @@
 
   <toolbar name="DefaultToolbar">
     <placeholder name="DefaultToolbarPlaceholder">
-      <separator name="ToolbarSep2" />
+      <separator name="ToolbarSep2"/>
       <toolitem name="SxListToolbarNew" action="SxListNewAction"/>
       <toolitem name="SxListToolbarEdit" action="SxListEditAction"/>
       <toolitem name="SxListToolbarDelete" action="SxListDeleteAction"/>
diff --git a/gnucash/ui/gnc-plugin-page-sx-list2-ui.xml b/gnucash/ui/gnc-plugin-page-sx-list2-ui.xml
index 0fa80c9f9..81f2be297 100644
--- a/gnucash/ui/gnc-plugin-page-sx-list2-ui.xml
+++ b/gnucash/ui/gnc-plugin-page-sx-list2-ui.xml
@@ -13,7 +13,7 @@
 
   <toolbar name="DefaultToolbar">
     <placeholder name="DefaultToolbarPlaceholder">
-      <separator name="ToolbarSep2" />
+      <separator name="ToolbarSep2"/>
       <toolitem name="SxListToolbarNew" action="SxListNewAction"/>
       <toolitem name="SxListToolbarEdit" action="SxListEditAction"/>
       <toolitem name="SxListToolbarDelete" action="SxListDeleteAction"/>
diff --git a/gnucash/ui/gnc-plugin-page-sxregister-ui.xml b/gnucash/ui/gnc-plugin-page-sxregister-ui.xml
index f5eb7bc17..1c6d96131 100644
--- a/gnucash/ui/gnc-plugin-page-sxregister-ui.xml
+++ b/gnucash/ui/gnc-plugin-page-sxregister-ui.xml
@@ -7,31 +7,31 @@
     </menu>
 
     <menu name="Transaction" action="TransactionAction">
-      <menuitem name="CutTransaction"     	action="CutTransactionAction"/>
-      <menuitem name="CopyTransaction"    	action="CopyTransactionAction"/>
-      <menuitem name="PasteTransaction"   	action="PasteTransactionAction"/>
-      <menuitem name="DuplicateTransaction"    	action="DuplicateTransactionAction"/>
-      <menuitem name="DeleteTransaction"       	action="DeleteTransactionAction"/>
-      <menuitem name="RemoveTransactionSplits" 	action="RemoveTransactionSplitsAction"/>
+      <menuitem name="CutTransaction" action="CutTransactionAction"/>
+      <menuitem name="CopyTransaction" action="CopyTransactionAction"/>
+      <menuitem name="PasteTransaction" action="PasteTransactionAction"/>
+      <menuitem name="DuplicateTransaction" action="DuplicateTransactionAction"/>
+      <menuitem name="DeleteTransaction" action="DeleteTransactionAction"/>
+      <menuitem name="RemoveTransactionSplits" action="RemoveTransactionSplitsAction"/>
       <separator name="TransactionSep1"/>
-      <menuitem name="RecordTransaction"        action="RecordTransactionAction"/>
-      <menuitem name="CancelTransaction"        action="CancelTransactionAction"/>
+      <menuitem name="RecordTransaction" action="RecordTransactionAction"/>
+      <menuitem name="CancelTransaction" action="CancelTransactionAction"/>
     </menu>
 
     <menu name="View" action="ViewAction">
       <placeholder name="ViewContentPlaceholder">
-        <menuitem name="ViewStyleDoubleLine"   	action="ViewStyleDoubleLineAction"/>
+        <menuitem name="ViewStyleDoubleLine" action="ViewStyleDoubleLineAction"/>
       </placeholder>
     </menu>
 
     <menu name="Actions" action="ActionsAction">
       <placeholder name="ActionsPlaceholder">
-        <menuitem name="BlankTransaction"        action="BlankTransactionAction"/>
-        <menuitem name="SplitTransaction"        action="SplitTransactionAction"/>
-        <menuitem name="EditExchangeRate"        action="EditExchangeRateAction"/>
-        <menuitem name="ScheduleTransaction"     action="ScheduleTransactionAction"/>
-        <menuitem name="JumpTransaction"         action="JumpTransactionAction"/>
-	<separator name="ActionsSep5"/>
+        <menuitem name="BlankTransaction" action="BlankTransactionAction"/>
+        <menuitem name="SplitTransaction" action="SplitTransactionAction"/>
+        <menuitem name="EditExchangeRate" action="EditExchangeRateAction"/>
+        <menuitem name="ScheduleTransaction" action="ScheduleTransactionAction"/>
+        <menuitem name="JumpTransaction" action="JumpTransactionAction"/>
+        <separator name="ActionsSep5"/>
       </placeholder>
     </menu>
 
@@ -40,15 +40,15 @@
   <toolbar name="DefaultToolbar">
     <placeholder name="DefaultToolbarPlaceholder">
       <toolitem name="ToolbarDuplicateTransaction" action="DuplicateTransactionAction"/>
-      <toolitem name="ToolbarDeleteTransaction"    action="DeleteTransactionAction"/>
+      <toolitem name="ToolbarDeleteTransaction" action="DeleteTransactionAction"/>
       <separator name="ToolbarSep66"/>
-      <toolitem name="ToolbarRecordTransaction"    action="RecordTransactionAction"/>
-      <toolitem name="ToolbarCancelTransaction"    action="CancelTransactionAction"/>
+      <toolitem name="ToolbarRecordTransaction" action="RecordTransactionAction"/>
+      <toolitem name="ToolbarCancelTransaction" action="CancelTransactionAction"/>
       <separator name="ToolbarSep67"/>
-      <toolitem name="ToolbarBlankTransaction"     action="BlankTransactionAction"/>
-      <toolitem name="ToolbarSplitTransaction"     action="SplitTransactionAction"/>
-      <toolitem name="ToolbarJumpTransaction"      action="JumpTransactionAction"/>
-      <toolitem name="ToolbarScheduleTransaction"  action="ScheduleTransactionAction"/>
+      <toolitem name="ToolbarBlankTransaction" action="BlankTransactionAction"/>
+      <toolitem name="ToolbarSplitTransaction" action="SplitTransactionAction"/>
+      <toolitem name="ToolbarJumpTransaction" action="JumpTransactionAction"/>
+      <toolitem name="ToolbarScheduleTransaction" action="ScheduleTransactionAction"/>
     </placeholder>
   </toolbar>
 </ui>
diff --git a/gnucash/ui/gnc-plugin-qif-import-ui.xml b/gnucash/ui/gnc-plugin-qif-import-ui.xml
index 57cc3c625..3cd182e0b 100644
--- a/gnucash/ui/gnc-plugin-qif-import-ui.xml
+++ b/gnucash/ui/gnc-plugin-qif-import-ui.xml
@@ -2,10 +2,10 @@
   <menubar>
     <menu name="File" action="FileAction">
       <menu name="FileImport" action="FileImportAction">
-      	<placeholder name="FileImportPlaceholder">
-      	   <menuitem name="FileQIFImport" action="QIFImportAction"/>
-      	   <!-- menuitem name="FileQIFTestDruid" action="QIFTestDruid"/ -->
-      	</placeholder>
+        <placeholder name="FileImportPlaceholder">
+           <menuitem name="FileQIFImport" action="QIFImportAction"/>
+           <!-- menuitem name="FileQIFTestDruid" action="QIFTestDruid"/ -->
+        </placeholder>
       </menu>
     </menu>
   </menubar>
diff --git a/gnucash/ui/gnc-plugin-register2-ui.xml b/gnucash/ui/gnc-plugin-register2-ui.xml
index ea01ca924..58865edad 100644
--- a/gnucash/ui/gnc-plugin-register2-ui.xml
+++ b/gnucash/ui/gnc-plugin-register2-ui.xml
@@ -8,9 +8,9 @@
 
     <menu name="Extensions" action="ExtensionsAction">
       <placeholder name="ExtensionsPlaceholder">
-	<menu name="Register2Test" action="Register2TestAction">
-	  <menuitem name="Register2TestGL" action="Register2TestGLAction"/>
-	</menu>
+        <menu name="Register2Test" action="Register2TestAction">
+          <menuitem name="Register2TestGL" action="Register2TestGLAction"/>
+        </menu>
       </placeholder>
     </menu>
   </menubar>
diff --git a/gnucash/ui/gnc-plugin-register22-ui.xml b/gnucash/ui/gnc-plugin-register22-ui.xml
index 03de810e4..07a13c50d 100644
--- a/gnucash/ui/gnc-plugin-register22-ui.xml
+++ b/gnucash/ui/gnc-plugin-register22-ui.xml
@@ -2,9 +2,9 @@
   <menubar>
     <menu name="Extensions" action="ExtensionsAction">
       <placeholder name="ExtensionsPlaceholder">
-	<menu name="Register2Test" action="Register2TestAction">
-	  <menuitem name="Register2TestGL" action="Register2TestGLAction"/>
-	</menu>
+        <menu name="Register2Test" action="Register2TestAction">
+          <menuitem name="Register2TestGL" action="Register2TestGLAction"/>
+        </menu>
       </placeholder>
     </menu>
   </menubar>
diff --git a/gnucash/ui/gnc-reconcile-window-ui.xml b/gnucash/ui/gnc-reconcile-window-ui.xml
index 126154eeb..d44dfc87a 100644
--- a/gnucash/ui/gnc-reconcile-window-ui.xml
+++ b/gnucash/ui/gnc-reconcile-window-ui.xml
@@ -3,52 +3,52 @@
     <menu name="Reconcile" action="ReconcileMenuAction">
       <menuitem name="RecnChangeInfo" action="RecnChangeInfoAction"/>
       <separator name="RecnSep1"/>
-      <menuitem name="RecnFinish"     action="RecnFinishAction"/>
-      <menuitem name="RecnPostpone"   action="RecnPostponeAction"/>
-      <menuitem name="RecnCancel"     action="RecnCancelAction"/>
+      <menuitem name="RecnFinish" action="RecnFinishAction"/>
+      <menuitem name="RecnPostpone" action="RecnPostponeAction"/>
+      <menuitem name="RecnCancel" action="RecnCancelAction"/>
     </menu>
-  
+
     <menu name="Account" action="AccountMenuAction">
       <menuitem name="AccountOpenAccount" action="AccountOpenAccountAction"/>
       <menuitem name="AccountEditAccount" action="AccountEditAccountAction"/>
       <separator name="AccountSep1"/>
-      <menuitem name="AccountTransfer"    action="AccountTransferAction"/>
+      <menuitem name="AccountTransfer" action="AccountTransferAction"/>
       <separator name="AccountSep2"/>
       <menuitem name="AccountCheckRepair" action="AccountCheckRepairAction"/>
     </menu>
 
     <menu name="Transaction" action="TransactionMenuAction">
-      <menuitem name="TransNew"     action="TransBalanceAction"/>
-      <menuitem name="TransEdit"    action="TransEditAction"/>
-      <menuitem name="TransRec"     action="TransRecAction"/>
-      <menuitem name="TransUnRec"   action="TransUnRecAction"/>
-      <menuitem name="TransDelete"  action="TransDeleteAction"/>
+      <menuitem name="TransNew" action="TransBalanceAction"/>
+      <menuitem name="TransEdit" action="TransEditAction"/>
+      <menuitem name="TransRec" action="TransRecAction"/>
+      <menuitem name="TransUnRec" action="TransUnRecAction"/>
+      <menuitem name="TransDelete" action="TransDeleteAction"/>
     </menu>
 
     <menu name="Help" action="HelpMenuAction">
-      <menuitem name="HelpHelp"    action="HelpHelpAction"/>
+      <menuitem name="HelpHelp" action="HelpHelpAction"/>
     </menu>
   </menubar>
 
   <popup name="MainPopup" action="FakeToplevel">
-    <menuitem name="TransNew"    action="TransBalanceAction"/>
-    <menuitem name="TransEdit"   action="TransEditAction"/>
-    <menuitem name="TransRec"    action="TransRecAction"/>
-    <menuitem name="TransUnRec"  action="TransUnRecAction"/>
+    <menuitem name="TransNew" action="TransBalanceAction"/>
+    <menuitem name="TransEdit" action="TransEditAction"/>
+    <menuitem name="TransRec" action="TransRecAction"/>
+    <menuitem name="TransUnRec" action="TransUnRecAction"/>
     <menuitem name="TransDelete" action="TransDeleteAction"/>
   </popup>
 
   <toolbar name="DefaultToolbar">
-    <toolitem name="TransNew"      action="TransBalanceAction"/>
-    <toolitem name="TransEdit"     action="TransEditAction"/>
-    <toolitem name="TransRec"      action="TransRecAction"/>
-    <toolitem name="TransUnRec"    action="TransUnRecAction"/>
-    <toolitem name="TransDelete"   action="TransDeleteAction"/>
+    <toolitem name="TransNew" action="TransBalanceAction"/>
+    <toolitem name="TransEdit" action="TransEditAction"/>
+    <toolitem name="TransRec" action="TransRecAction"/>
+    <toolitem name="TransUnRec" action="TransUnRecAction"/>
+    <toolitem name="TransDelete" action="TransDeleteAction"/>
     <separator name="ToolbarSep2"/>
     <toolitem name="AccountOpenAccount" action="AccountOpenAccountAction"/>
     <separator name="ToolbarSep3"/>
-    <toolitem name="RecnFinish"  action="RecnFinishAction"/>
-    <toolitem name="RecnPostpone"   action="RecnPostponeAction"/>
-    <toolitem name="RecnCancel"     action="RecnCancelAction"/>
+    <toolitem name="RecnFinish" action="RecnFinishAction"/>
+    <toolitem name="RecnPostpone" action="RecnPostponeAction"/>
+    <toolitem name="RecnCancel" action="RecnCancelAction"/>
   </toolbar>
 </ui>
diff --git a/gnucash/ui/gnc-sxed-window-ui-full.xml b/gnucash/ui/gnc-sxed-window-ui-full.xml
index 2c1776cde..c2a41d35f 100644
--- a/gnucash/ui/gnc-sxed-window-ui-full.xml
+++ b/gnucash/ui/gnc-sxed-window-ui-full.xml
@@ -7,29 +7,29 @@
     </menu>
 
     <menu name="Transaction" action="TransactionAction">
-      <menuitem name="CutTransaction"     	action="CutTransactionAction"/>
-      <menuitem name="CopyTransaction"    	action="CopyTransactionAction"/>
-      <menuitem name="PasteTransaction"   	action="PasteTransactionAction"/>
-      <menuitem name="DuplicateTransaction"    	action="DuplicateTransactionAction"/>
-      <menuitem name="DeleteTransaction"       	action="DeleteTransactionAction"/>
-      <menuitem name="RemoveTransactionSplits" 	action="RemoveTransactionSplitsAction"/>
+      <menuitem name="CutTransaction" action="CutTransactionAction"/>
+      <menuitem name="CopyTransaction" action="CopyTransactionAction"/>
+      <menuitem name="PasteTransaction" action="PasteTransactionAction"/>
+      <menuitem name="DuplicateTransaction" action="DuplicateTransactionAction"/>
+      <menuitem name="DeleteTransaction" action="DeleteTransactionAction"/>
+      <menuitem name="RemoveTransactionSplits" action="RemoveTransactionSplitsAction"/>
       <separator name="TransactionSep1"/>
-      <menuitem name="RecordTransaction"        action="RecordTransactionAction"/>
-      <menuitem name="CancelTransaction"        action="CancelTransactionAction"/>
+      <menuitem name="RecordTransaction" action="RecordTransactionAction"/>
+      <menuitem name="CancelTransaction" action="CancelTransactionAction"/>
     </menu>
 
     <menu name="View" action="ViewAction">
       <placeholder name="ViewContentPlaceholder">
-        <menuitem name="ViewStyleDoubleLine"   	action="ViewStyleDoubleLineAction"/>
+        <menuitem name="ViewStyleDoubleLine" action="ViewStyleDoubleLineAction"/>
       </placeholder>
     </menu>
 
     <menu name="Actions" action="ActionsAction">
       <placeholder name="ActionsPlaceholder">
         <separator name="ActionsSep1"/>
-	<menuitem name="ActionsTransfer"         action="ActionsTransferAction"/>
+        <menuitem name="ActionsTransfer" action="ActionsTransferAction"/>
         <separator name="ActionsSep4"/>
-        <menuitem name="BlankTransaction"        action="BlankTransactionAction"/>
+        <menuitem name="BlankTransaction" action="BlankTransactionAction"/>
       </placeholder>
     </menu>
   </menubar>
@@ -37,27 +37,26 @@
   <toolbar name="DefaultToolbar">
     <placeholder name="DefaultToolbarPlaceholder">
       <toolitem name="ToolbarDuplicateTransaction" action="DuplicateTransactionAction"/>
-      <toolitem name="ToolbarDeleteTransaction"    action="DeleteTransactionAction"/>
+      <toolitem name="ToolbarDeleteTransaction" action="DeleteTransactionAction"/>
       <separator name="ToolbarSep66"/>
-      <toolitem name="ToolbarRecordTransaction"    action="RecordTransactionAction"/>
-      <toolitem name="ToolbarCancelTransaction"    action="CancelTransactionAction"/>
+      <toolitem name="ToolbarRecordTransaction" action="RecordTransactionAction"/>
+      <toolitem name="ToolbarCancelTransaction" action="CancelTransactionAction"/>
       <separator name="ToolbarSep67"/>
-      <toolitem name="ToolbarBlankTransaction"     action="BlankTransactionAction"/>
+      <toolitem name="ToolbarBlankTransaction" action="BlankTransactionAction"/>
       <separator name="ToolbarSep68"/>
     </placeholder>
   </toolbar>
 
-  <popup name="MainPopup"                    action="FakeToplevel">
+  <popup name="MainPopup" action="FakeToplevel">
     <placeholder name="PopupPlaceholder2">
-      <menuitem name="DuplicateTransaction"    action="DuplicateTransactionAction"/>
-      <menuitem name="DeleteTransaction"       action="DeleteTransactionAction"/>
+      <menuitem name="DuplicateTransaction" action="DuplicateTransactionAction"/>
+      <menuitem name="DeleteTransaction" action="DeleteTransactionAction"/>
       <menuitem name="RemoveTransactionSplits" action="RemoveTransactionSplitsAction"/>
       <separator name="PopupSep2"/>
-      <menuitem name="RecordTransaction"       action="RecordTransactionAction"/>
-      <menuitem name="CancelTransaction"       action="CancelTransactionAction"/>
+      <menuitem name="RecordTransaction" action="RecordTransactionAction"/>
+      <menuitem name="CancelTransaction" action="CancelTransactionAction"/>
       <separator name="PopupSep3"/>
-      <menuitem name="BlankTransaction"        action="BlankTransactionAction"/>
+      <menuitem name="BlankTransaction" action="BlankTransactionAction"/>
     </placeholder>
   </popup>
-
 </ui>
diff --git a/gnucash/ui/gnc-windows-menu-ui-quartz.xml b/gnucash/ui/gnc-windows-menu-ui-quartz.xml
index ec5f5daf0..9613e9737 100644
--- a/gnucash/ui/gnc-windows-menu-ui-quartz.xml
+++ b/gnucash/ui/gnc-windows-menu-ui-quartz.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ui>
   <menubar>
-
     <menu name="Windows" action="WindowsAction">
-      <menuitem name="WindowNew"      action="WindowNewAction"/>
+      <menuitem name="WindowNew" action="WindowNewAction"/>
       <menuitem name="WindowMovePage" action="WindowMovePageAction"/>
       <separator name="ViewSep4"/>
       <placeholder name="WindowsPlaceholder"/>
     </menu>
-
   </menubar>
-</ui>
\ No newline at end of file
+</ui>
diff --git a/gnucash/ui/gnc-windows-menu-ui.xml b/gnucash/ui/gnc-windows-menu-ui.xml
index d9a15c560..78fab6723 100644
--- a/gnucash/ui/gnc-windows-menu-ui.xml
+++ b/gnucash/ui/gnc-windows-menu-ui.xml
@@ -1,23 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ui>
   <menubar>
-
     <menu name="Windows" action="WindowsAction">
-      <menuitem name="WindowNew"      action="WindowNewAction"/>
+      <menuitem name="WindowNew" action="WindowNewAction"/>
       <menuitem name="WindowMovePage" action="WindowMovePageAction"/>
       <separator name="ViewSep4"/>
-      <menuitem name="Window0"        action="Window0Action"/>
-      <menuitem name="Window1"        action="Window1Action"/>
-      <menuitem name="Window2"        action="Window2Action"/>
-      <menuitem name="Window3"        action="Window3Action"/>
-      <menuitem name="Window4"        action="Window4Action"/>
-      <menuitem name="Window5"        action="Window5Action"/>
-      <menuitem name="Window6"        action="Window6Action"/>
-      <menuitem name="Window7"        action="Window7Action"/>
-      <menuitem name="Window8"        action="Window8Action"/>
-      <menuitem name="Window9"        action="Window9Action"/>
+      <menuitem name="Window0" action="Window0Action"/>
+      <menuitem name="Window1" action="Window1Action"/>
+      <menuitem name="Window2" action="Window2Action"/>
+      <menuitem name="Window3" action="Window3Action"/>
+      <menuitem name="Window4" action="Window4Action"/>
+      <menuitem name="Window5" action="Window5Action"/>
+      <menuitem name="Window6" action="Window6Action"/>
+      <menuitem name="Window7" action="Window7Action"/>
+      <menuitem name="Window8" action="Window8Action"/>
+      <menuitem name="Window9" action="Window9Action"/>
       <placeholder name="WindowsPlaceholder"/>
     </menu>
-
   </menubar>
 </ui>

commit 8650ffadd653b5f574e9668e004882bb83098a38
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Fri Jul 31 11:21:04 2020 +0100

    Fix some text alignment for duplicate transaction dialog

diff --git a/gnucash/gtkbuilder/gnc-plugin-page-register.glade b/gnucash/gtkbuilder/gnc-plugin-page-register.glade
index c0ab6b646..8d4e99b43 100644
--- a/gnucash/gtkbuilder/gnc-plugin-page-register.glade
+++ b/gnucash/gtkbuilder/gnc-plugin-page-register.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.22.2 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkAdjustment" id="days_adjustment">
@@ -15,7 +15,7 @@
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
     <signal name="response" handler="gnc_plugin_page_register_filter_response_cb" swapped="no"/>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
     <child internal-child="vbox">
@@ -572,7 +572,7 @@ If 0, all previous days included</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
     <signal name="response" handler="gnc_plugin_page_register_sort_response_cb" swapped="no"/>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
     <child internal-child="vbox">
@@ -918,7 +918,7 @@ If 0, all previous days included</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
     <child internal-child="vbox">
@@ -998,7 +998,7 @@ If 0, all previous days included</property>
               <object class="GtkLabel" id="date_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="halign">start</property>
+                <property name="halign">end</property>
                 <property name="label" translatable="yes">_Date</property>
                 <property name="use_underline">True</property>
                 <property name="justify">center</property>
@@ -1012,7 +1012,7 @@ If 0, all previous days included</property>
               <object class="GtkLabel" id="num_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="halign">start</property>
+                <property name="halign">end</property>
                 <property name="label" translatable="yes">_Number</property>
                 <property name="use_underline">True</property>
                 <property name="justify">center</property>
@@ -1055,7 +1055,7 @@ If 0, all previous days included</property>
               <object class="GtkLabel" id="tnum_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="halign">start</property>
+                <property name="halign">end</property>
                 <property name="label" translatable="yes">_Transaction Number</property>
                 <property name="use_underline">True</property>
                 <property name="justify">center</property>
@@ -1099,7 +1099,7 @@ If 0, all previous days included</property>
               <object class="GtkLabel" id="assoc_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="halign">start</property>
+                <property name="halign">end</property>
                 <property name="label" translatable="yes">Keep Associated Entry</property>
               </object>
               <packing>
@@ -1128,7 +1128,7 @@ If 0, all previous days included</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
     <child internal-child="vbox">



Summary of changes:
 gnucash/gtkbuilder/gnc-plugin-page-register.glade |  18 ++--
 gnucash/ui/gnc-main-window-ui.xml                 |  11 +-
 gnucash/ui/gnc-plugin-basic-commands-ui.xml       |   9 +-
 gnucash/ui/gnc-plugin-bi-import-ui.xml            |   6 +-
 gnucash/ui/gnc-plugin-business-ui.xml             |  80 +++++++--------
 gnucash/ui/gnc-plugin-csv-export-ui.xml           |  10 +-
 gnucash/ui/gnc-plugin-csv-import-ui.xml           |  10 +-
 gnucash/ui/gnc-plugin-customer-import-ui.xml      |   6 +-
 gnucash/ui/gnc-plugin-log-replay-ui.xml           |   6 +-
 gnucash/ui/gnc-plugin-page-account-tree-ui.xml    |  38 +++----
 gnucash/ui/gnc-plugin-page-account-tree2-ui.xml   |  38 +++----
 gnucash/ui/gnc-plugin-page-invoice-ui.xml         |  92 ++++++++---------
 gnucash/ui/gnc-plugin-page-owner-tree-ui.xml      |  70 ++++++-------
 gnucash/ui/gnc-plugin-page-register-ui.xml        | 106 +++++++++----------
 gnucash/ui/gnc-plugin-page-register2-ui.xml       | 120 +++++++++++-----------
 gnucash/ui/gnc-plugin-page-report-ui.xml          |  28 ++---
 gnucash/ui/gnc-plugin-page-sx-list-ui.xml         |   2 +-
 gnucash/ui/gnc-plugin-page-sx-list2-ui.xml        |   2 +-
 gnucash/ui/gnc-plugin-page-sxregister-ui.xml      |  44 ++++----
 gnucash/ui/gnc-plugin-qif-import-ui.xml           |   8 +-
 gnucash/ui/gnc-plugin-register2-ui.xml            |   6 +-
 gnucash/ui/gnc-plugin-register22-ui.xml           |   6 +-
 gnucash/ui/gnc-reconcile-window-ui.xml            |  46 ++++-----
 gnucash/ui/gnc-sxed-window-ui-full.xml            |  43 ++++----
 gnucash/ui/gnc-windows-menu-ui-quartz.xml         |   6 +-
 gnucash/ui/gnc-windows-menu-ui.xml                |  24 ++---
 26 files changed, 414 insertions(+), 421 deletions(-)



More information about the gnucash-changes mailing list