[meld] Re-save new-diff-tab UI with new Glade

[Kai Willadsen <kaiw src gnome org>]

commit 44965235f364e66284d1314f28b64fa5708c99f9
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Jul 4 12:06:08 2021 +1000

    Re-save new-diff-tab UI with new Glade

 meld/resources/ui/new-diff-tab.ui | 210 +++++++++++++++++++++-----------------
 1 file changed, 114 insertions(+), 96 deletions(-)
---
diff --git a/meld/resources/ui/new-diff-tab.ui b/meld/resources/ui/new-diff-tab.ui
index 24d9450b..fb81eec3 100644
--- a/meld/resources/ui/new-diff-tab.ui
+++ b/meld/resources/ui/new-diff-tab.ui
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <template class="NewDiffTab" parent="GtkAlignment">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="yalign">0.25</property>
     <property name="xscale">0</property>
     <property name="yscale">0</property>
     <child>
       <object class="GtkVBox" id="vbox6">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="spacing">18</property>
         <child>
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="label" translatable="yes">New comparison</property>
             <property name="xalign">0</property>
             <style>
@@ -32,31 +32,31 @@
         <child>
           <object class="GtkVBox" id="vbox7">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="spacing">12</property>
             <child>
               <object class="GtkHBox" id="hbox1">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="spacing">12</property>
                 <property name="homogeneous">True</property>
                 <child>
                   <object class="GtkToggleButton" id="button_type_file">
-                    <property name="use_action_appearance">False</property>
+                    <property name="use-action-appearance">False</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
                     <signal name="toggled" handler="on_button_type_toggled" swapped="no"/>
                     <child>
                       <object class="GtkVBox" id="vbox1">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkImage" id="image1">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="icon_name">document-new-symbolic</property>
+                            <property name="can-focus">False</property>
+                            <property name="icon-name">document-new-symbolic</property>
                             <property name="icon_size">6</property>
                           </object>
                           <packing>
@@ -68,7 +68,7 @@
                         <child>
                           <object class="GtkLabel" id="label5">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="label" translatable="yes">File</property>
                           </object>
                           <packing>
@@ -91,21 +91,21 @@
                 </child>
                 <child>
                   <object class="GtkToggleButton" id="button_type_dir">
-                    <property name="use_action_appearance">False</property>
+                    <property name="use-action-appearance">False</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
                     <signal name="toggled" handler="on_button_type_toggled" swapped="no"/>
                     <child>
                       <object class="GtkVBox" id="vbox2">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkImage" id="image2">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="icon_name">folder-new-symbolic</property>
+                            <property name="can-focus">False</property>
+                            <property name="icon-name">folder-new-symbolic</property>
                             <property name="icon_size">6</property>
                           </object>
                           <packing>
@@ -117,7 +117,7 @@
                         <child>
                           <object class="GtkLabel" id="label6">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="label" translatable="yes">Folder</property>
                           </object>
                           <packing>
@@ -140,21 +140,21 @@
                 </child>
                 <child>
                   <object class="GtkToggleButton" id="button_type_vc">
-                    <property name="use_action_appearance">False</property>
+                    <property name="use-action-appearance">False</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
                     <signal name="toggled" handler="on_button_type_toggled" swapped="no"/>
                     <child>
                       <object class="GtkVBox" id="vbox3">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkImage" id="image3">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="icon_name">appointment-new-symbolic</property>
+                            <property name="can-focus">False</property>
+                            <property name="icon-name">appointment-new-symbolic</property>
                             <property name="icon_size">6</property>
                           </object>
                           <packing>
@@ -166,7 +166,7 @@
                         <child>
                           <object class="GtkLabel" id="label7">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="label" translatable="yes">Version control</property>
                           </object>
                           <packing>
@@ -197,13 +197,13 @@
             <child>
               <object class="GtkNotebook" id="choosers_notebook">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="show_tabs">False</property>
-                <property name="show_border">False</property>
+                <property name="can-focus">False</property>
+                <property name="show-tabs">False</property>
+                <property name="show-border">False</property>
                 <child>
                   <object class="GtkHBox" id="hbox2">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="spacing">12</property>
                     <property name="homogeneous">True</property>
                     <child>
@@ -217,76 +217,77 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="tab_fill">False</property>
+                    <property name="tab-fill">False</property>
                   </packing>
                 </child>
                 <child type="tab">
                   <placeholder/>
                 </child>
                 <child>
+                  <!-- n-columns=3 n-rows=2 -->
                   <object class="GtkGrid" id="grid1">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
-                    <property name="column_homogeneous">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="row-spacing">6</property>
+                    <property name="column-spacing">12</property>
+                    <property name="column-homogeneous">True</property>
                     <child>
                       <object class="GtkCheckButton" id="file_three_way_checkbutton">
                         <property name="label" translatable="yes">_3-way comparison</property>
-                        <property name="use_action_appearance">False</property>
+                        <property name="use-action-appearance">False</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="can-focus">True</property>
+                        <property name="receives-default">False</property>
+                        <property name="use-underline">True</property>
+                        <property name="draw-indicator">True</property>
                         <signal name="toggled" handler="on_three_way_checkbutton_toggled" swapped="no"/>
                       </object>
                       <packing>
-                        <property name="left_attach">2</property>
-                        <property name="top_attach">1</property>
+                        <property name="left-attach">2</property>
+                        <property name="top-attach">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkFileChooserButton" id="file_chooser0">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="create_folders">False</property>
+                        <property name="can-focus">False</property>
+                        <property name="create-folders">False</property>
                         <property name="local-only">False</property>
                         <property name="title" translatable="yes">Select First File</property>
                         <signal name="file-set" handler="on_file_set" swapped="no"/>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkFileChooserButton" id="file_chooser1">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="create_folders">False</property>
+                        <property name="can-focus">False</property>
+                        <property name="create-folders">False</property>
                         <property name="local-only">False</property>
                         <property name="title" translatable="yes">Select Second File</property>
                         <signal name="file-set" handler="on_file_set" swapped="no"/>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkFileChooserButton" id="file_chooser2">
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="can_focus">False</property>
-                        <property name="create_folders">False</property>
+                        <property name="can-focus">False</property>
+                        <property name="create-folders">False</property>
                         <property name="local-only">False</property>
                         <property name="title" translatable="yes">Select Third File</property>
                         <signal name="file-set" handler="on_file_set" swapped="no"/>
                       </object>
                       <packing>
-                        <property name="left_attach">2</property>
-                        <property name="top_attach">0</property>
+                        <property name="left-attach">2</property>
+                        <property name="top-attach">0</property>
                       </packing>
                     </child>
                     <child>
@@ -304,66 +305,67 @@
                   <placeholder/>
                 </child>
                 <child>
+                  <!-- n-columns=3 n-rows=2 -->
                   <object class="GtkGrid" id="grid2">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
-                    <property name="column_homogeneous">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="row-spacing">6</property>
+                    <property name="column-spacing">12</property>
+                    <property name="column-homogeneous">True</property>
                     <child>
                       <object class="GtkFileChooserButton" id="dir_chooser0">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="action">select-folder</property>
-                        <property name="create_folders">False</property>
+                        <property name="create-folders">False</property>
                         <property name="title" translatable="yes">Select First Folder</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkFileChooserButton" id="dir_chooser1">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="action">select-folder</property>
-                        <property name="create_folders">False</property>
+                        <property name="create-folders">False</property>
                         <property name="title" translatable="yes">Select Second Folder</property>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkFileChooserButton" id="dir_chooser2">
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="action">select-folder</property>
-                        <property name="create_folders">False</property>
+                        <property name="create-folders">False</property>
                         <property name="title" translatable="yes">Select Third Folder</property>
                       </object>
                       <packing>
-                        <property name="left_attach">2</property>
-                        <property name="top_attach">0</property>
+                        <property name="left-attach">2</property>
+                        <property name="top-attach">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="dir_three_way_checkbutton">
                         <property name="label" translatable="yes">_3-way comparison</property>
-                        <property name="use_action_appearance">False</property>
+                        <property name="use-action-appearance">False</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="can-focus">True</property>
+                        <property name="receives-default">False</property>
+                        <property name="use-underline">True</property>
+                        <property name="draw-indicator">True</property>
                         <signal name="toggled" handler="on_three_way_checkbutton_toggled" swapped="no"/>
                       </object>
                       <packing>
-                        <property name="left_attach">2</property>
-                        <property name="top_attach">1</property>
+                        <property name="left-attach">2</property>
+                        <property name="top-attach">1</property>
                       </packing>
                     </child>
                     <child>
@@ -381,25 +383,41 @@
                   <placeholder/>
                 </child>
                 <child>
+                  <!-- n-columns=3 n-rows=2 -->
                   <object class="GtkGrid" id="grid3">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
-                    <property name="column_homogeneous">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="row-spacing">6</property>
+                    <property name="column-spacing">12</property>
+                    <property name="column-homogeneous">True</property>
                     <child>
                       <object class="GtkFileChooserButton" id="vc_chooser0">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="action">select-folder</property>
-                        <property name="create_folders">False</property>
+                        <property name="create-folders">False</property>
                         <property name="title" translatable="yes">Select A Version-Controlled 
Folder</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">0</property>
                       </packing>
                     </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </object>
                   <packing>
                     <property name="position">3</property>
@@ -422,9 +440,8 @@
         <child>
           <object class="GtkHButtonBox" id="hbuttonbox2">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="spacing">6</property>
-            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button_help">
                 <property name="label">gtk-help</property>
@@ -440,15 +457,16 @@
                 <property name="secondary">True</property>
               </packing>
             </child>
+            <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="button_new_blank">
                 <property name="label" translatable="yes">_Blank comparison</property>
-                <property name="use_action_appearance">False</property>
+                <property name="use-action-appearance">False</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+                <property name="use-underline">True</property>
                 <signal name="clicked" handler="on_button_new_blank_clicked" swapped="no"/>
               </object>
               <packing>
@@ -460,12 +478,12 @@
             <child>
               <object class="GtkButton" id="button_compare">
                 <property name="label" translatable="yes">C_ompare</property>
-                <property name="use_action_appearance">False</property>
+                <property name="use-action-appearance">False</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+                <property name="use-underline">True</property>
                 <signal name="clicked" handler="on_button_compare_clicked" swapped="no"/>
               </object>
               <packing>