From 01f13ba122b97e5090d3ecb9c6d876536fb40afb Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 19 Sep 2020 21:48:39 +0200
Subject: [PATCH] Aggregate Dialog Box: Remove deprecated properties

---
 src/ui/gui/aggregate.ui | 45 ++++++++++++++---------------------------
 1 file changed, 15 insertions(+), 30 deletions(-)

diff --git a/src/ui/gui/aggregate.ui b/src/ui/gui/aggregate.ui
index 9c7d722ff7..c09c389102 100644
--- a/src/ui/gui/aggregate.ui
+++ b/src/ui/gui/aggregate.ui
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <!-- PSPP - a program for statistical analysis. -->
-<!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
-
+<!-- Copyright (C) 2017, 2020 Free Software Foundation, Inc. -->
 <!-- This program is free software: you can redistribute it and/or modify -->
 <!-- it under the terms of the GNU General Public License as published by -->
 <!-- the Free Software Foundation, either version 3 of the License, or -->
 <!-- (at your option) any later version. -->
-
 <!-- This program is distributed in the hope that it will be useful, -->
 <!-- but WITHOUT ANY WARRANTY; without even the implied warranty of -->
 <!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the -->
 <!-- GNU General Public License for more details. -->
-
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
-
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.22"/>
   <requires lib="psppire" version="0.0"/>
@@ -23,7 +19,10 @@
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Aggregate Data</property>
     <property name="modal">True</property>
-    <property name="help-page">AGGREGATE</property>
+    <property name="help_page">AGGREGATE</property>
+    <child>
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkBox" id="dialog-hbox1">
         <property name="visible">True</property>
@@ -175,7 +174,6 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="halign">start</property>
-                                    <property name="xalign">1</property>
                                     <property name="label" translatable="yes">Variable Name: </property>
                                   </object>
                                   <packing>
@@ -211,7 +209,7 @@
                                   <object class="GtkLabel" id="label10">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">1</property>
+                                    <property name="halign">start</property>
                                     <property name="label" translatable="yes">Variable Label: </property>
                                   </object>
                                   <packing>
@@ -248,7 +246,7 @@
                                   <object class="GtkLabel" id="label5">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">1</property>
+                                    <property name="halign">start</property>
                                     <property name="label" translatable="yes">Function: </property>
                                   </object>
                                   <packing>
@@ -323,7 +321,6 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="halign">start</property>
-                                    <property name="xalign">1</property>
                                     <property name="label" translatable="yes">Argument 1: </property>
                                   </object>
                                   <packing>
@@ -360,7 +357,7 @@
                                   <object class="GtkLabel" id="label9">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">1</property>
+                                    <property name="halign">start</property>
                                     <property name="label" translatable="yes">Argument 2: </property>
                                   </object>
                                   <packing>
@@ -388,17 +385,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkEventBox" id="eventbox1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">2</property>
-                              </packing>
+                              <placeholder/>
                             </child>
                           </object>
                           <packing>
@@ -470,8 +457,8 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="halign">start</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0.5</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -487,8 +474,8 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="halign">start</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0.5</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
                     <property name="group">add-radiobutton</property>
@@ -505,8 +492,8 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="halign">start</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0.5</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
                     <property name="group">add-radiobutton</property>
@@ -594,8 +581,8 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="halign">start</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0.5</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
@@ -610,8 +597,8 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="halign">start</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0.5</property>
                     <property name="draw_indicator">True</property>
                     <property name="group">sorted-radiobutton</property>
                   </object>
@@ -640,7 +627,6 @@
         </child>
         <child>
           <object class="PsppireButtonBox" id="psppire-hbuttonbox1">
-            <property name="orientation">horizontal</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="border_width">5</property>
@@ -655,5 +641,4 @@
       </object>
     </child>
   </object>
-  <object class="GtkToggleAction" id="toggleaction1"/>
 </interface>
-- 
2.30.2