gnucash maint: Multiple changes pushed

[Christopher Lam]

Updated	 via  https://github.com/Gnucash/gnucash/commit/85461138 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/eeb02636 (commit)
	from  https://github.com/Gnucash/gnucash/commit/29706167 (commit)



commit 854611380ca2003a2b5db8c09ac1bc62b39b380a
Merge: 297061670 eeb026364
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Tue Sep 29 20:19:14 2020 +0800

    Merge branch 'maint-merge-checkbox-label' into maint #792


commit eeb026364727d5f1d2a71c97a87b5e58f1dc78d6
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Tue Sep 29 18:59:51 2020 +0800

    Merge GtkCheckButton with GtkLabel
    
    ... because the gtkcheckbutton's label makes the checkbutton much
    easier to click

diff --git a/gnucash/gtkbuilder/dialog-account.glade b/gnucash/gtkbuilder/dialog-account.glade
index 84a64c8ca..8e97a5bf0 100644
--- a/gnucash/gtkbuilder/dialog-account.glade
+++ b/gnucash/gtkbuilder/dialog-account.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.22.2 -->
 <interface>
   <requires lib="gtk+" version="3.22"/>
   <object class="GtkDialog" id="account_cascade_dialog">
@@ -64,21 +64,9 @@
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
                 <property name="spacing">3</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="label" translatable="yes">Enable Cascading Account Color</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
                 <child>
                   <object class="GtkCheckButton" id="enable_cascade_color">
+                    <property name="label" translatable="yes">Enable Cascading Account Color</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -111,20 +99,9 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">3</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Enable Cascading Account Placeholder</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
                 <child>
                   <object class="GtkCheckButton" id="enable_cascade_placeholder">
+                    <property name="label" translatable="yes">Enable Cascading Account Placeholder</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -142,35 +119,14 @@
                 <property name="top_attach">4</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkSeparator">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">6</property>
-              </packing>
-            </child>
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">3</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Enable Cascading Account Hidden</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
                 <child>
                   <object class="GtkCheckButton" id="enable_cascade_hidden">
+                    <property name="label" translatable="yes">Enable Cascading Account Hidden</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -332,6 +288,16 @@
                 <property name="top_attach">5</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkSeparator">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">6</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkBox" id="hidden_box">
                 <property name="visible">True</property>



Summary of changes:
 gnucash/gtkbuilder/dialog-account.glade | 62 ++++++++-------------------------
 1 file changed, 14 insertions(+), 48 deletions(-)