grid layout: Rename some properties

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

Fixes: #2967

7 files changed, 190 insertions, 190 deletions

diff --git a/gtk/ui/gtkcoloreditor.ui b/gtk/ui/gtkcoloreditor.ui
index 9c8b4da03a..bb17b590fa 100644
--- a/gtk/ui/gtkcoloreditor.ui
+++ b/gtk/ui/gtkcoloreditor.ui
@@ -46,8 +46,8 @@
                   <class name="circular"/>
                 </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>
@@ -59,8 +59,8 @@
                 <property name="has-menu">False</property>
                 <property name="can-focus">False</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>
@@ -70,8 +70,8 @@
                 <signal name="notify::has-focus" handler="entry_focus_changed" swapped="no"/>
                 <signal name="notify::text" handler="entry_text_changed" swapped="no"/>
                 <layout>
-                  <property name="left-attach">2</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">2</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -83,8 +83,8 @@
                 <property name="draw-value">False</property>
                 <property name="has-origin">False</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>
@@ -99,8 +99,8 @@
                   <class name="marks-before"/>
                 </style>
                 <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>
@@ -114,8 +114,8 @@
                 <property name="s-adjustment">s_adj</property>
                 <property name="v-adjustment">v_adj</property>
                 <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>
@@ -142,8 +142,8 @@
           <object class="GtkLabel" id="label4">
             <property name="label" translatable="yes" context="Color channel">A</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>
@@ -153,8 +153,8 @@
             <property name="max-width-chars">2</property>
             <property name="climb-rate">1</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>
@@ -178,8 +178,8 @@
           <object class="GtkLabel" id="label3">
             <property name="label" translatable="yes" context="Color channel">H</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>
@@ -189,8 +189,8 @@
             <property name="max-width-chars">2</property>
             <property name="climb-rate">1</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>
@@ -215,8 +215,8 @@
           <object class="GtkLabel" id="label1">
             <property name="label" translatable="yes" context="Color Channel">S</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>
@@ -224,8 +224,8 @@
           <object class="GtkLabel" id="label2">
             <property name="label" translatable="yes" context="Color Channel">V</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>
@@ -235,8 +235,8 @@
             <property name="max-width-chars">2</property>
             <property name="climb-rate">1</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>
@@ -246,8 +246,8 @@
             <property name="max-width-chars">2</property>
             <property name="climb-rate">1</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>
diff --git a/gtk/ui/gtkemojichooser.ui b/gtk/ui/gtkemojichooser.ui
index 388761ca0d..cb8cb6fa1f 100644
--- a/gtk/ui/gtkemojichooser.ui
+++ b/gtk/ui/gtkemojichooser.ui
@@ -328,8 +328,8 @@
                           <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>
@@ -341,8 +341,8 @@
                           <attribute name="scale" value="1.44"></attribute>
                         </attributes>
                         <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>
@@ -353,8 +353,8 @@
                           <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>
diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui
index 4ad9078fb2..876c67f332 100644
--- a/gtk/ui/gtkfilechooserwidget.ui
+++ b/gtk/ui/gtkfilechooserwidget.ui
@@ -286,8 +286,8 @@
                                           <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>
@@ -299,8 +299,8 @@
                                           <attribute name="scale" value="1.44"></attribute>
                                         </attributes>
                                         <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>
@@ -311,8 +311,8 @@
                                           <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>
@@ -392,8 +392,8 @@
             <property name="hexpand">1</property>
             <signal name="changed" handler="new_folder_name_changed"/>
             <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>
@@ -407,16 +407,16 @@
               <class name="suggested-action"/>
             </style>
             <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>
         <child>
           <object class="GtkFileChooserErrorStack" id="new_folder_error_stack">
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -453,8 +453,8 @@
             <property name="hexpand">1</property>
             <signal name="changed" handler="rename_file_name_changed"/>
             <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>
@@ -468,16 +468,16 @@
               <class name="suggested-action"/>
             </style>
             <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>
         <child>
           <object class="GtkFileChooserErrorStack" id="rename_file_error_stack">
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
               <property name="column-span">2</property>
             </layout>
           </object>
diff --git a/gtk/ui/gtkfontchooserwidget.ui b/gtk/ui/gtkfontchooserwidget.ui
index 01a3816677..acfbf57570 100644
--- a/gtk/ui/gtkfontchooserwidget.ui
+++ b/gtk/ui/gtkfontchooserwidget.ui
@@ -55,8 +55,8 @@
                     <property name="placeholder-text" translatable="yes">Search font name</property>
                     <signal name="stop-search" handler="stop_search_cb" swapped="no"/>
                     <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>
@@ -115,8 +115,8 @@
                                   </object>
                                 </child>
                                 <layout>
-                                  <property name="left-attach">0</property>
-                                  <property name="top-attach">1</property>
+                                  <property name="column">0</property>
+                                  <property name="row">1</property>
                                   <property name="column-span">3</property>
                                 </layout>
                               </object>
@@ -131,8 +131,8 @@
                                   </object>
                                 </child>
                                 <layout>
-                                  <property name="left-attach">0</property>
-                                  <property name="top-attach">2</property>
+                                  <property name="column">0</property>
+                                  <property name="row">2</property>
                                   <property name="column-span">3</property>
                                 </layout>
                               </object>
@@ -143,8 +143,8 @@
                                 <property name="xalign">0</property>
                                 <property name="valign">baseline</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>
@@ -161,8 +161,8 @@
                                   </object>
                                 </child>
                                 <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>
@@ -172,8 +172,8 @@
                                 <property name="valign">center</property>
                                 <signal name="output" handler="output_cb"/>
                                 <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>
@@ -199,8 +199,8 @@
                                 <property name="gicon">fonticon</property>
                                 <property name="pixel-size">64</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>
@@ -212,8 +212,8 @@
                                   <attribute name="scale" value="1.2"></attribute>
                                 </attributes>
                                 <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>
@@ -222,8 +222,8 @@
                       </object>
                     </child>
                     <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>
@@ -291,8 +291,8 @@
                                 <property name="xalign">0</property>
                                 <property name="valign">baseline</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>
@@ -303,8 +303,8 @@
                                 <property name="draw-value">0</property>
                                 <property name="round-digits">0</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>
@@ -314,8 +314,8 @@
                                 <property name="valign">center</property>
                                 <signal name="output" handler="output_cb"/>
                                 <layout>
-                                  <property name="left-attach">2</property>
-                                  <property name="top-attach">0</property>
+                                  <property name="column">2</property>
+                                  <property name="row">0</property>
                                 </layout>
                               </object>
                             </child>
diff --git a/gtk/ui/gtkpagesetupunixdialog.ui b/gtk/ui/gtkpagesetupunixdialog.ui
index 237e20b279..9d3aae94a8 100644
--- a/gtk/ui/gtkpagesetupunixdialog.ui
+++ b/gtk/ui/gtkpagesetupunixdialog.ui
@@ -28,8 +28,8 @@
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">printer_combo</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>
@@ -38,8 +38,8 @@
                 <property name="hexpand">1</property>
                 <signal name="notify::selected" handler="printer_changed_callback"/>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
                   <property name="column-span">3</property>
                 </layout>
               </object>
@@ -52,8 +52,8 @@
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">paper_size_combo</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>
@@ -62,8 +62,8 @@
                 <property name="hexpand">1</property>
                 <signal name="notify::selected" handler="paper_size_changed"/>
                 <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">3</property>
                 </layout>
               </object>
@@ -73,8 +73,8 @@
                 <property name="halign">start</property>
                 <property name="valign">center</property>
                 <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">3</property>
                 </layout>
               </object>
@@ -87,8 +87,8 @@
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">portrait_radio</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>
@@ -112,8 +112,8 @@
                   </object>
                 </child>
                 <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>
@@ -138,8 +138,8 @@
                   </object>
                 </child>
                 <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>
@@ -164,8 +164,8 @@
                   </object>
                 </child>
                 <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>
@@ -189,8 +189,8 @@
                   </object>
                 </child>
                 <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>
diff --git a/gtk/ui/gtkplacesview.ui b/gtk/ui/gtkplacesview.ui
index 4668ae758b..98460819b1 100644
--- a/gtk/ui/gtkplacesview.ui
+++ b/gtk/ui/gtkplacesview.ui
@@ -70,8 +70,8 @@
                   <attribute name="weight" value="bold"></attribute>
                 </attributes>
                 <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>
@@ -83,8 +83,8 @@
                   <attribute name="weight" value="bold"></attribute>
                 </attributes>
                 <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>
diff --git a/gtk/ui/gtkprintunixdialog.ui b/gtk/ui/gtkprintunixdialog.ui
index 775cdc9bce..69f0a2c027 100644
--- a/gtk/ui/gtkprintunixdialog.ui
+++ b/gtk/ui/gtkprintunixdialog.ui
@@ -215,8 +215,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="active">1</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">0</property>
+                                          <property name="column">0</property>
+                                          <property name="row">0</property>
                                           <property name="column-span">2</property>
                                         </layout>
                                       </object>
@@ -228,8 +228,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="group">all_pages_radio</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">1</property>
+                                          <property name="column">0</property>
+                                          <property name="row">1</property>
                                           <property name="column-span">2</property>
                                         </layout>
                                       </object>
@@ -241,8 +241,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="group">all_pages_radio</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">2</property>
+                                          <property name="column">0</property>
+                                          <property name="row">2</property>
                                           <property name="column-span">2</property>
                                         </layout>
                                       </object>
@@ -256,8 +256,8 @@
                                         <property name="group">all_pages_radio</property>
                                         <signal name="toggled" handler="update_page_range_entry_sensitivity" swapped="no"/>
                                         <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>
@@ -268,8 +268,8 @@
                                         <property name="activates-default">1</property>
                                         <signal name="notify::has-focus" handler="page_range_entry_focus_changed" swapped="no"/>
                                         <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>
@@ -305,8 +305,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">copies_spin</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>
@@ -317,8 +317,8 @@
                                         <signal name="changed" handler="update_dialog_from_capabilities" object="GtkPrintUnixDialog" swapped="yes"/>
                                         <signal name="value-changed" handler="update_dialog_from_capabilities" object="GtkPrintUnixDialog" swapped="yes"/>
                                         <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>
@@ -328,8 +328,8 @@
                                         <property name="use-underline">1</property>
                                         <signal name="toggled" handler="update_collate_icon" swapped="no"/>
                                         <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>
@@ -339,8 +339,8 @@
                                         <property name="use-underline">1</property>
                                         <signal name="toggled" handler="update_collate_icon" swapped="no"/>
                                         <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>
@@ -349,8 +349,8 @@
                                         <property name="content-width">70</property>
                                         <property name="content-height">90</property>
                                         <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="row-span">2</property>
                                         </layout>
                                       </object>
@@ -411,8 +411,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">duplex</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>
@@ -420,8 +420,8 @@
                                       <object class="GtkPrinterOptionWidget" id="duplex">
                                         <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>
@@ -433,8 +433,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">pages_per_sheet</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>
@@ -444,8 +444,8 @@
                                         <signal name="changed" handler="redraw_page_layout_preview" object="GtkPrintUnixDialog" swapped="yes"/>
                                         <signal name="changed" handler="update_number_up_layout" object="GtkPrintUnixDialog" swapped="yes"/>
                                         <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>
@@ -457,8 +457,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">number_up_layout</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>
@@ -467,8 +467,8 @@
                                         <property name="valign">baseline</property>
                                         <signal name="changed" handler="redraw_page_layout_preview" object="GtkPrintUnixDialog" swapped="yes"/>
                                         <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>
@@ -480,8 +480,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">page_set_combo</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>
@@ -499,8 +499,8 @@
                                           </object>
                                         </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>
@@ -512,8 +512,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">scale_spin</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>
@@ -535,8 +535,8 @@
                                           </object>
                                         </child>
                                         <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>
@@ -572,8 +572,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">paper_type</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>
@@ -581,8 +581,8 @@
                                       <object class="GtkPrinterOptionWidget" id="paper_type">
                                         <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>
@@ -594,8 +594,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">paper_source</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>
@@ -603,8 +603,8 @@
                                       <object class="GtkPrinterOptionWidget" id="paper_source">
                                         <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>
@@ -616,8 +616,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">output_tray</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>
@@ -625,8 +625,8 @@
                                       <object class="GtkPrinterOptionWidget" id="output_tray">
                                         <property name="valign">baseline</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>
@@ -638,8 +638,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">paper_size_combo</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>
@@ -648,8 +648,8 @@
                                         <property name="sensitive">0</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>
@@ -661,8 +661,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">orientation_combo</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>
@@ -682,8 +682,8 @@
                                           </object>
                                         </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>
@@ -750,16 +750,16 @@
                                     <property name="use-underline">1</property>
                                     <property name="mnemonic-widget">job_prio</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>
                                 <child>
                                   <object class="GtkPrinterOptionWidget" id="job_prio">
                                     <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>
@@ -771,24 +771,24 @@
                                     <property name="use-underline">1</property>
                                     <property name="mnemonic-widget">billing_info</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>
                                 <child>
                                   <object class="GtkPrinterOptionWidget" id="billing_info">
                                     <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>
                               </object>
                             </child>
                             <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>
@@ -818,8 +818,8 @@
                                     <property name="active">1</property>
                                     <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">0</property>
+                                      <property name="column">0</property>
+                                      <property name="row">0</property>
                                       <property name="column-span">2</property>
                                     </layout>
                                   </object>
@@ -838,8 +838,8 @@
                                     <signal name="toggled" handler="update_print_at_entry_sensitivity" swapped="no"/>
                                     <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
                                     <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>
@@ -853,8 +853,8 @@
  e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
                                     <signal name="changed" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
                                     <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>
@@ -869,8 +869,8 @@
                                     <property name="group">print_now_radio</property>
                                     <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">2</property>
+                                      <property name="column">0</property>
+                                      <property name="row">2</property>
                                       <property name="column-span">2</property>
                                     </layout>
                                   </object>
@@ -878,8 +878,8 @@
                               </object>
                             </child>
                             <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>
@@ -910,16 +910,16 @@
                                     <property name="use-underline">1</property>
                                     <property name="mnemonic-widget">cover_before</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>
                                 <child>
                                   <object class="GtkPrinterOptionWidget" id="cover_before">
                                     <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>
@@ -931,24 +931,24 @@
                                     <property name="use-underline">1</property>
                                     <property name="mnemonic-widget">cover_after</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>
                                 <child>
                                   <object class="GtkPrinterOptionWidget" id="cover_after">
                                     <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>
                               </object>
                             </child>
                             <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>