[gtk/wip/ebassi/grid-layout: 3/5] testsuite/a11y: Update GtkGrid definitions in UI files

[Emmanuele Bassi <ebassi src gnome org>]

commit 358ad227d5704b52e7cc6f06aa942bf06bb8dd2d
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Fri Apr 5 00:24:49 2019 +0100

    testsuite/a11y: Update GtkGrid definitions in UI files

 testsuite/a11y/buttons.ui | 130 ++++++++++++++++++++--------------------------
 testsuite/a11y/pickers.ui |  41 +++++----------
 testsuite/a11y/range.ui   |  26 ++++------
 3 files changed, 79 insertions(+), 118 deletions(-)
---
diff --git a/testsuite/a11y/buttons.ui b/testsuite/a11y/buttons.ui
index 7b86217d81..46e1f7e802 100644
--- a/testsuite/a11y/buttons.ui
+++ b/testsuite/a11y/buttons.ui
@@ -1,132 +1,116 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
         <child>
           <object class="GtkToggleButton" id="button1">
             <property name="label" translatable="yes">Hello World!</property>
-            <property name="visible">True</property>
-            <property name="active">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="active">1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkCheckButton" id="button2">
             <property name="label" translatable="yes">Hello World!</property>
-            <property name="visible">True</property>
-            <property name="active">False</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkRadioButton" id="button3">
             <property name="label" translatable="yes">Hello World!</property>
-            <property name="visible">True</property>
-            <property name="active">False</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkRadioButton" id="button4">
             <property name="label" translatable="yes">Hello World!</property>
-            <property name="visible">True</property>
-            <property name="active">True</property>
+            <property name="active">1</property>
             <property name="group">button3</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSwitch" id="button5">
-            <property name="visible">True</property>
-            <property name="active">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="active">1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSwitch" id="button6">
-            <property name="visible">True</property>
-            <property name="active">False</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="button6-accessible">
                 <property name="accessible-name">Test switch</property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
-
         <child>
           <object class="GtkButton" id="button7">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="label">Text Button</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button8">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button9">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/a11y/pickers.ui b/testsuite/a11y/pickers.ui
index a540fa1ccb..2a9a02756e 100644
--- a/testsuite/a11y/pickers.ui
+++ b/testsuite/a11y/pickers.ui
@@ -1,50 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
         <child>
           <object class="GtkAppChooserButton" id="button1">
-            <property name="visible">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkColorButton" id="button2">
-            <property name="visible">True</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkFontButton" id="button3">
-            <property name="visible">True</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
-<!--
-        <child>
-          <object class="GtkFileChooserButton" id="button4">
-            <property name="visible">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
-        </child>
--->
       </object>
     </child>
   </object>
diff --git a/testsuite/a11y/range.ui b/testsuite/a11y/range.ui
index 9c1ac450fa..319acf0db5 100644
--- a/testsuite/a11y/range.ui
+++ b/testsuite/a11y/range.ui
@@ -1,41 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">0.5</property>
     <property name="upper">99.5</property>
-    <property name="page-size">0</property>
     <property name="value">45.5</property>
     <property name="step-increment">0.5</property>
     <property name="page-increment">5.0</property>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
         <child>
           <object class="GtkScale" id="scale1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can_focus">1</property>
             <property name="adjustment">adjustment1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkScrollbar" id="scrollbar1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can_focus">1</property>
             <property name="adjustment">adjustment1</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
       </object>
     </child>