grid layout: Rename some properties

Rename GtkGridLayoutChild:left-attach/top-attach to
GtkGridLayoutChild:column/row. Update all users.

Fixes: #2967

3 files changed, 177 insertions, 177 deletions

diff --git a/testsuite/gtk/focus-chain/widget-factory.ui b/testsuite/gtk/focus-chain/widget-factory.ui
index bf09b8732b..c4b6ef8886 100644
--- a/testsuite/gtk/focus-chain/widget-factory.ui
+++ b/testsuite/gtk/focus-chain/widget-factory.ui
@@ -632,8 +632,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   <object class="GtkCheckButton" id="checkbutton2">
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">0</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -642,8 +642,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <property name="inconsistent">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">2</property>
+                                      <property name="column">0</property>
+                                      <property name="row">2</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -653,8 +653,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="active">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">0</property>
+                                      <property name="row">3</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -663,8 +663,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">0</property>
+                                      <property name="row">4</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -674,8 +674,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="inconsistent">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">5</property>
+                                      <property name="column">0</property>
+                                      <property name="row">5</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -684,8 +684,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="active">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="left-attach">1</property>
+                                      <property name="column">0</property>
+                                      <property name="column">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -694,8 +694,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="group">radiobutton1</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">1</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -705,8 +705,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="inconsistent">1</property>
                                     <property name="group">radiobutton1</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">2</property>
+                                      <property name="column">1</property>
+                                      <property name="row">2</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -715,8 +715,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">1</property>
+                                      <property name="row">3</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -726,8 +726,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="group">radiobutton3</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">1</property>
+                                      <property name="row">4</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -738,8 +738,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="inconsistent">1</property>
                                     <property name="group">radiobutton3</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">5</property>
+                                      <property name="column">1</property>
+                                      <property name="row">5</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -747,15 +747,15 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   <object class="GtkSpinner" id="spinner1">
                                     <property name="spinning">1</property>
                                     <layout>
-                                      <property name="left-attach">2</property>
+                                      <property name="column">2</property>
                                     </layout>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkSpinner" id="spinner2">
                                     <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">2</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -764,8 +764,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="spinning">1</property>
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">2</property>
+                                      <property name="row">3</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -773,8 +773,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   <object class="GtkSpinner" id="spinner4">
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">2</property>
+                                      <property name="row">4</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -1496,8 +1496,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                         <property name="value">.5</property>
                                         <property name="halign">center</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">0</property>
+                                          <property name="column">0</property>
+                                          <property name="row">0</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -1512,8 +1512,8 @@ microphone-sensitivity-medium-symbolic</property>
                                         <property name="value">.5</property>
                                         <property name="halign">center</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">1</property>
+                                          <property name="column">0</property>
+                                          <property name="row">1</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -2957,8 +2957,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -2966,8 +2966,8 @@ bad things might happen.</property>
               <object class="GtkEntry" id="details_entry">
                 <property name="valign">baseline</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -2982,8 +2982,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -2991,8 +2991,8 @@ bad things might happen.</property>
               <object class="GtkEntry" id="more_details_entry">
                 <property name="valign">baseline</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -3007,8 +3007,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -3018,8 +3018,8 @@ bad things might happen.</property>
                 <property name="draw-value">0</property>
                 <property name="adjustment">adjustment1</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -3034,8 +3034,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">3</property>
+                  <property name="column">0</property>
+                  <property name="row">3</property>
                 </layout>
               </object>
             </child>
@@ -3044,8 +3044,8 @@ bad things might happen.</property>
                 <property name="halign">start</property>
                 <property name="valign">baseline</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">3</property>
+                  <property name="column">1</property>
+                  <property name="row">3</property>
                 </layout>
               </object>
             </child>
@@ -3115,7 +3115,7 @@ bad things might happen.</property>
             <property name="label">Description:</property>
             <property name="xalign">1</property>
             <layout>
-              <property name="top-attach">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -3132,8 +3132,8 @@ bad things might happen.</property>
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3142,7 +3142,7 @@ bad things might happen.</property>
           <object class="GtkEntry" id="open_popover_entry">
             <property name="activates-default">1</property>
             <layout>
-              <property name="left-attach">1</property>
+              <property name="column">1</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3161,8 +3161,8 @@ bad things might happen.</property>
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3174,8 +3174,8 @@ bad things might happen.</property>
             <property name="menu-model">gear_menu</property>
             <property name="tooltip-text">This is a menu button</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -3188,8 +3188,8 @@ bad things might happen.</property>
               <class name="suggested-action"/>
             </style>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/gtk/focus-chain/widget-factory2.ui b/testsuite/gtk/focus-chain/widget-factory2.ui
index abe48c0222..9d814b2125 100644
--- a/testsuite/gtk/focus-chain/widget-factory2.ui
+++ b/testsuite/gtk/focus-chain/widget-factory2.ui
@@ -633,8 +633,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   <object class="GtkCheckButton" id="checkbutton2">
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">0</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -643,8 +643,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <property name="inconsistent">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">2</property>
+                                      <property name="column">0</property>
+                                      <property name="row">2</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -654,8 +654,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="active">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">0</property>
+                                      <property name="row">3</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -664,8 +664,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">0</property>
+                                      <property name="row">4</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -675,8 +675,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="inconsistent">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">5</property>
+                                      <property name="column">0</property>
+                                      <property name="row">5</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -685,8 +685,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="active">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="left-attach">1</property>
+                                      <property name="column">0</property>
+                                      <property name="column">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -695,8 +695,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="group">radiobutton1</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">1</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -706,8 +706,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="inconsistent">1</property>
                                     <property name="group">radiobutton1</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">2</property>
+                                      <property name="column">1</property>
+                                      <property name="row">2</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -716,8 +716,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">1</property>
+                                      <property name="row">3</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -727,8 +727,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="group">radiobutton3</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">1</property>
+                                      <property name="row">4</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -739,8 +739,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="inconsistent">1</property>
                                     <property name="group">radiobutton3</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">5</property>
+                                      <property name="column">1</property>
+                                      <property name="row">5</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -748,15 +748,15 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   <object class="GtkSpinner" id="spinner1">
                                     <property name="spinning">1</property>
                                     <layout>
-                                      <property name="left-attach">2</property>
+                                      <property name="column">2</property>
                                     </layout>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkSpinner" id="spinner2">
                                     <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">2</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -765,8 +765,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="spinning">1</property>
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">2</property>
+                                      <property name="row">3</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -774,8 +774,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   <object class="GtkSpinner" id="spinner4">
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">2</property>
+                                      <property name="row">4</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -1497,8 +1497,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                         <property name="value">.5</property>
                                         <property name="halign">center</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">0</property>
+                                          <property name="column">0</property>
+                                          <property name="row">0</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -1513,8 +1513,8 @@ microphone-sensitivity-medium-symbolic</property>
                                         <property name="value">.5</property>
                                         <property name="halign">center</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">1</property>
+                                          <property name="column">0</property>
+                                          <property name="row">1</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -2958,8 +2958,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -2967,8 +2967,8 @@ bad things might happen.</property>
               <object class="GtkEntry" id="details_entry">
                 <property name="valign">baseline</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -2983,8 +2983,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -2992,8 +2992,8 @@ bad things might happen.</property>
               <object class="GtkEntry" id="more_details_entry">
                 <property name="valign">baseline</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -3008,8 +3008,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -3019,8 +3019,8 @@ bad things might happen.</property>
                 <property name="draw-value">0</property>
                 <property name="adjustment">adjustment1</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -3035,8 +3035,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">3</property>
+                  <property name="column">0</property>
+                  <property name="row">3</property>
                 </layout>
               </object>
             </child>
@@ -3045,8 +3045,8 @@ bad things might happen.</property>
                 <property name="halign">start</property>
                 <property name="valign">baseline</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">3</property>
+                  <property name="column">1</property>
+                  <property name="row">3</property>
                 </layout>
               </object>
             </child>
@@ -3116,7 +3116,7 @@ bad things might happen.</property>
             <property name="label">Description:</property>
             <property name="xalign">1</property>
             <layout>
-              <property name="top-attach">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -3133,8 +3133,8 @@ bad things might happen.</property>
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3143,7 +3143,7 @@ bad things might happen.</property>
           <object class="GtkEntry" id="open_popover_entry">
             <property name="activates-default">1</property>
             <layout>
-              <property name="left-attach">1</property>
+              <property name="column">1</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3162,8 +3162,8 @@ bad things might happen.</property>
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3175,8 +3175,8 @@ bad things might happen.</property>
             <property name="menu-model">gear_menu</property>
             <property name="tooltip-text">This is a menu button</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -3189,8 +3189,8 @@ bad things might happen.</property>
               <class name="suggested-action"/>
             </style>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/gtk/focus-chain/widget-factory3.ui b/testsuite/gtk/focus-chain/widget-factory3.ui
index 02c485c4b7..d7a5bc973d 100644
--- a/testsuite/gtk/focus-chain/widget-factory3.ui
+++ b/testsuite/gtk/focus-chain/widget-factory3.ui
@@ -633,8 +633,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   <object class="GtkCheckButton" id="checkbutton2">
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">0</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -643,8 +643,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <property name="inconsistent">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">2</property>
+                                      <property name="column">0</property>
+                                      <property name="row">2</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -654,8 +654,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="active">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">0</property>
+                                      <property name="row">3</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -664,8 +664,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">0</property>
+                                      <property name="row">4</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -675,8 +675,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="inconsistent">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">5</property>
+                                      <property name="column">0</property>
+                                      <property name="row">5</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -685,8 +685,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="active">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="left-attach">1</property>
+                                      <property name="column">0</property>
+                                      <property name="column">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -695,8 +695,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="group">radiobutton1</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">1</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -706,8 +706,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="inconsistent">1</property>
                                     <property name="group">radiobutton1</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">2</property>
+                                      <property name="column">1</property>
+                                      <property name="row">2</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -716,8 +716,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">1</property>
+                                      <property name="row">3</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -727,8 +727,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="group">radiobutton3</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">1</property>
+                                      <property name="row">4</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -739,8 +739,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="inconsistent">1</property>
                                     <property name="group">radiobutton3</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">5</property>
+                                      <property name="column">1</property>
+                                      <property name="row">5</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -748,15 +748,15 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   <object class="GtkSpinner" id="spinner1">
                                     <property name="spinning">1</property>
                                     <layout>
-                                      <property name="left-attach">2</property>
+                                      <property name="column">2</property>
                                     </layout>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkSpinner" id="spinner2">
                                     <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">2</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -765,8 +765,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="spinning">1</property>
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">2</property>
+                                      <property name="row">3</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -774,8 +774,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   <object class="GtkSpinner" id="spinner4">
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">2</property>
+                                      <property name="row">4</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -1497,8 +1497,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                         <property name="value">.5</property>
                                         <property name="halign">center</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">0</property>
+                                          <property name="column">0</property>
+                                          <property name="row">0</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -1513,8 +1513,8 @@ microphone-sensitivity-medium-symbolic</property>
                                         <property name="value">.5</property>
                                         <property name="halign">center</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">1</property>
+                                          <property name="column">0</property>
+                                          <property name="row">1</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -2958,8 +2958,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -2967,8 +2967,8 @@ bad things might happen.</property>
               <object class="GtkEntry" id="details_entry">
                 <property name="valign">baseline</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -2983,8 +2983,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -2992,8 +2992,8 @@ bad things might happen.</property>
               <object class="GtkEntry" id="more_details_entry">
                 <property name="valign">baseline</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -3008,8 +3008,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -3019,8 +3019,8 @@ bad things might happen.</property>
                 <property name="draw-value">0</property>
                 <property name="adjustment">adjustment1</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -3035,8 +3035,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">3</property>
+                  <property name="column">0</property>
+                  <property name="row">3</property>
                 </layout>
               </object>
             </child>
@@ -3045,8 +3045,8 @@ bad things might happen.</property>
                 <property name="halign">start</property>
                 <property name="valign">baseline</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">3</property>
+                  <property name="column">1</property>
+                  <property name="row">3</property>
                 </layout>
               </object>
             </child>
@@ -3116,7 +3116,7 @@ bad things might happen.</property>
             <property name="label">Description:</property>
             <property name="xalign">1</property>
             <layout>
-              <property name="top-attach">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -3133,8 +3133,8 @@ bad things might happen.</property>
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3143,7 +3143,7 @@ bad things might happen.</property>
           <object class="GtkEntry" id="open_popover_entry">
             <property name="activates-default">1</property>
             <layout>
-              <property name="left-attach">1</property>
+              <property name="column">1</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3162,8 +3162,8 @@ bad things might happen.</property>
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3175,8 +3175,8 @@ bad things might happen.</property>
             <property name="menu-model">gear_menu</property>
             <property name="tooltip-text">This is a menu button</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -3189,8 +3189,8 @@ bad things might happen.</property>
               <class name="suggested-action"/>
             </style>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>