drop deprecated GtkAlignment, move left/top-padding into child margin-start/top

for sd

Change-Id: I9bc9bffb93db2244320ee505fcecec9e9223fb76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108523
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 316 insertions, 355 deletions

diff --git a/sd/uiconfig/simpress/ui/headerfootertab.ui b/sd/uiconfig/simpress/ui/headerfootertab.ui
index bd9c4b6b05aa..28554ce6b2c0 100644
--- a/sd/uiconfig/simpress/ui/headerfootertab.ui
+++ b/sd/uiconfig/simpress/ui/headerfootertab.ui
@@ -1,54 +1,71 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.1 -->
 <interface domain="sd">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkBox" id="HeaderFooterTab">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
-    <property name="border_width">6</property>
+    <property name="border-width">6</property>
     <property name="spacing">12</property>
     <child>
       <object class="GtkBox" id="box2">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="hexpand">True</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child>
           <object class="GtkFrame" id="frame1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
+            <property name="can-focus">False</property>
+            <property name="label-xalign">0</property>
+            <property name="shadow-type">none</property>
             <child>
-              <object class="GtkAlignment" id="alignment2">
+              <object class="GtkBox" id="box3">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="top_padding">6</property>
-                <property name="left_padding">12</property>
+                <property name="can-focus">False</property>
+                <property name="margin-start">12</property>
+                <property name="margin-top">6</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
                 <child>
-                  <object class="GtkBox" id="box3">
+                  <object class="GtkCheckButton" id="header_cb">
+                    <property name="label" translatable="yes" context="headerfootertab|header_cb">Heade_r</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="margin-top">6</property>
+                    <property name="use-underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw-indicator">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="header_cb-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="headerfootertab|extended_tip|header_cb">Adds the text that you enter in the Header text box to the top of the slide.</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="header_box">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="margin-start">24</property>
+                    <property name="spacing">12</property>
                     <child>
-                      <object class="GtkCheckButton" id="header_cb">
-                        <property name="label" translatable="yes" context="headerfootertab|header_cb">Heade_r</property>
+                      <object class="GtkLabel" id="header_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="margin_top">6</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="header_cb-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes" context="headerfootertab|extended_tip|header_cb">Adds the text that you enter in the Header text box to the top of the slide.</property>
-                          </object>
-                        </child>
+                        <property name="can-focus">False</property>
+                        <property name="label" translatable="yes" context="headerfootertab|header_label">Header _text:</property>
+                        <property name="use-underline">True</property>
+                        <property name="mnemonic-widget">header_text</property>
+                        <property name="xalign">1</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -57,51 +74,13 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkAlignment">
+                      <object class="GtkEntry" id="header_text">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkBox" id="header_box">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin-start">12</property>
-                            <property name="spacing">12</property>
-                            <child>
-                              <object class="GtkLabel" id="header_label">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes" context="headerfootertab|header_label">Header _text:</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">header_text</property>
-                                <property name="xalign">1</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkEntry" id="header_text">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="activates_default">True</property>
-                                <child internal-child="accessible">
-                                  <object class="AtkObject" id="header_text-atkobject">
-                                    <property name="AtkObject::accessible-description" translatable="yes" context="headerfootertab|extended_tip|header_text">Adds the text that you enter to the top of the slide.</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <accessibility>
-                              <relation type="labelled-by" target="header_cb"/>
-                            </accessibility>
+                        <property name="can-focus">True</property>
+                        <property name="activates-default">True</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="header_text-atkobject">
+                            <property name="AtkObject::accessible-description" translatable="yes" context="headerfootertab|extended_tip|header_text">Adds the text that you enter to the top of the slide.</property>
                           </object>
                         </child>
                       </object>
@@ -111,245 +90,263 @@
                         <property name="position">1</property>
                       </packing>
                     </child>
+                    <accessibility>
+                      <relation type="labelled-by" target="header_cb"/>
+                    </accessibility>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="datetime_cb">
+                    <property name="label" translatable="yes" context="headerfootertab|datetime_cb">_Date and time</property>
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw-indicator">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="datetime_cb-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="headerfootertab|extended_tip|datetime_cb">Adds the date and time to the slide.</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="datetimebox">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="margin-start">24</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">12</property>
                     <child>
-                      <object class="GtkCheckButton" id="datetime_cb">
-                        <property name="label" translatable="yes" context="headerfootertab|datetime_cb">_Date and time</property>
+                      <object class="GtkBox" id="box6">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="datetime_cb-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes" context="headerfootertab|extended_tip|datetime_cb">Adds the date and time to the slide.</property>
+                        <property name="can-focus">False</property>
+                        <property name="spacing">12</property>
+                        <child>
+                          <object class="GtkRadioButton" id="rb_fixed">
+                            <property name="label" translatable="yes" context="headerfootertab|rb_fixed">Fi_xed</property>
+                            <property name="visible">True</property>
+                            <property name="can-focus">True</property>
+                            <property name="receives-default">False</property>
+                            <property name="use-underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="active">True</property>
+                            <property name="draw-indicator">True</property>
+                            <accessibility>
+                              <relation type="label-for" target="datetime_value"/>
+                            </accessibility>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="rb_fixed-atkobject">
+                                <property name="AtkObject::accessible-description" translatable="yes" context="headerfootertab|extended_tip|rb_fixed">Displays the date and time that you enter in the text box.</property>
+                              </object>
+                            </child>
                           </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkEntry" id="datetime_value">
+                            <property name="visible">True</property>
+                            <property name="can-focus">True</property>
+                            <property name="activates-default">True</property>
+                            <accessibility>
+                              <relation type="labelled-by" target="rb_fixed"/>
+                            </accessibility>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="datetime_value-atkobject">
+                                <property name="AtkObject::accessible-description" translatable="yes" context="headerfootertab|extended_tip|datetime_value">Displays the date and time that you enter in the text box.</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">2</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkAlignment">
+                      <!-- n-columns=1 n-rows=2 -->
+                      <object class="GtkGrid" id="grid1">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="left_padding">12</property>
+                        <property name="can-focus">False</property>
+                        <property name="row-spacing">6</property>
+                        <child>
+                          <object class="GtkRadioButton" id="rb_auto">
+                            <property name="label" translatable="yes" context="headerfootertab|rb_auto">_Variable</property>
+                            <property name="visible">True</property>
+                            <property name="can-focus">True</property>
+                            <property name="receives-default">False</property>
+                            <property name="use-underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw-indicator">True</property>
+                            <property name="group">rb_fixed</property>
+                            <accessibility>
+                              <relation type="labelled-by" target="variablebox"/>
+                            </accessibility>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="rb_auto-atkobject">
+                                <property name="AtkObject::accessible-description" translatable="yes" context="headerfootertab|extended_tip|rb_auto">Displays the date and time that the slide was created. Select a date format from the list.</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
                         <child>
-                          <object class="GtkBox" id="datetimebox">
+                          <!-- n-columns=2 n-rows=2 -->
+                          <object class="GtkGrid" id="variablebox">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin-start">12</property>
-                            <property name="orientation">vertical</property>
-                            <property name="spacing">12</property>
+                            <property name="can-focus">False</property>
+                            <property name="row-spacing">6</property>
+                            <property name="column-spacing">12</property>
                             <child>
-                              <object class="GtkBox" id="box6">
+                              <object class="GtkComboBoxText" id="language_list">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="spacing">12</property>
-                                <child>
-                                  <object class="GtkRadioButton" id="rb_fixed">
-                                    <property name="label" translatable="yes" context="headerfootertab|rb_fixed">Fi_xed</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="active">True</property>
-                                    <property name="draw_indicator">True</property>
-                                    <accessibility>
-                                      <relation type="label-for" target="datetime_value"/>
-                                    </accessibility>
-                                    <child internal-child="accessible">
-                                      <object class="AtkObject" id="rb_fixed-atkobject">
-                                        <property name="AtkObject::accessible-description" translatable="yes" context="headerfootertab|extended_tip|rb_fixed">Displays the date and time that you enter in the text box.</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="datetime_value">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="activates_default">True</property>
-                                    <accessibility>
-                                      <relation type="labelled-by" target="rb_fixed"/>
-                                    </accessibility>
-                                    <child internal-child="accessible">
-                                      <object class="AtkObject" id="datetime_value-atkobject">
-                                        <property name="AtkObject::accessible-description" translatable="yes" context="headerfootertab|extended_tip|datetime_value">Displays the date and time that you enter in the text box.</property>
-                                      </object>
-                                    </child>
+                                <property name="can-focus">False</property>
+                                <child internal-child="accessible">
+                                  <object class="AtkObject" id="language_list-atkobject">
+                                    <property name="AtkObject::accessible-description" translatable="yes" context="headerfootertab|extended_tip|language_list">Select the language for the date and time format.</property>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
+                                <property name="left-attach">1</property>
+                                <property name="top-attach">1</property>
                               </packing>
                             </child>
                             <child>
-                              <!-- n-columns=1 n-rows=1 -->
-                              <object class="GtkGrid" id="grid1">
+                              <object class="GtkLabel" id="language_label">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="row_spacing">6</property>
-                                <child>
-                                  <object class="GtkRadioButton" id="rb_auto">
-                                    <property name="label" translatable="yes" context="headerfootertab|rb_auto">_Variable</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="draw_indicator">True</property>
-                                    <property name="group">rb_fixed</property>
-                                    <accessibility>
-                                      <relation type="labelled-by" target="variablebox"/>
-                                    </accessibility>
-                                    <child internal-child="accessible">
-                                      <object class="AtkObject" id="rb_auto-atkobject">
-                                        <property name="AtkObject::accessible-description" translatable="yes" context="headerfootertab|extended_tip|rb_auto">Displays the date and time that the slide was created. Select a date format from the list.</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkAlignment" id="variablebox">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <child>
-                                      <!-- n-columns=1 n-rows=1 -->
-                                      <object class="GtkGrid" id="grid2">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="row_spacing">6</property>
-                                        <property name="column_spacing">12</property>
-                                        <child>
-                                          <object class="GtkComboBoxText" id="language_list">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <child internal-child="accessible">
-                                              <object class="AtkObject" id="language_list-atkobject">
-                                                <property name="AtkObject::accessible-description" translatable="yes" context="headerfootertab|extended_tip|language_list">Select the language for the date and time format.</property>
-                                              </object>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="language_label">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes" context="headerfootertab|language_label">_Language:</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="mnemonic_widget">language_list</property>
-                                            <property name="xalign">1</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkComboBoxText" id="datetime_format_list">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <child internal-child="accessible">
-                                              <object class="AtkObject" id="datetime_format_list-atkobject">
-                                                <property name="AtkObject::accessible-description" translatable="yes" context="headerfootertab|extended_tip|datetime_format_list">Displays the date and time that the slide was created. Select a date format from the list.</property>
-                                              </object>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="top_attach">0</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="language_label1">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes" context="headerfootertab|language_label1">_Format:</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="mnemonic_widget">datetime_format_list</property>
-                                            <property name="xalign">1</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">0</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                    </child>
-                                    <accessibility>
-                                      <relation type="labelled-by" target="rb_auto"/>
-                                    </accessibility>
+                                <property name="can-focus">False</property>
+                                <property name="label" translatable="yes" context="headerfootertab|language_label">_Language:</property>
+                                <property name="use-underline">True</property>
+                                <property name="mnemonic-widget">language_list</property>
+                                <property name="xalign">1</property>
+                              </object>
+                              <packing>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkComboBoxText" id="datetime_format_list">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <child internal-child="accessible">
+                                  <object class="AtkObject" id="datetime_format_list-atkobject">
+                                    <property name="AtkObject::accessible-description" translatable="yes" context="headerfootertab|extended_tip|datetime_format_list">Displays the date and time that the slide was created. Select a date format from the list.</property>
                                   </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">1</property>
-                                  </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
+                                <property name="left-attach">1</property>
+                                <property name="top-attach">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="language_label1">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="label" translatable="yes" context="headerfootertab|language_label1">_Format:</property>
+                                <property name="use-underline">True</property>
+                                <property name="mnemonic-widget">datetime_format_list</property>
+                                <property name="xalign">1</property>
+                              </object>
+                              <packing>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">0</property>
                               </packing>
                             </child>
                             <accessibility>
-                              <relation type="labelled-by" target="datetime_cb"/>
+                              <relation type="labelled-by" target="rb_auto"/>
                             </accessibility>
                           </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">1</property>
+                          </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">3</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
+                    <accessibility>
+                      <relation type="labelled-by" target="datetime_cb"/>
+                    </accessibility>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="box7">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">12</property>
                     <child>
-                      <object class="GtkBox" id="box7">
+                      <object class="GtkCheckButton" id="footer_cb">
+                        <property name="label" translatable="yes" context="headerfootertab|footer_cb">_Footer</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="orientation">vertical</property>
+                        <property name="can-focus">True</property>
+                        <property name="receives-default">False</property>
+                        <property name="use-underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw-indicator">True</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="footer_cb-atkobject">
+                            <property name="AtkObject::accessible-description" translatable="yes" context="headerfootertab|extended_tip|footer_cb">Adds the text that you enter in the Footer text box to the bottom of the slide.</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="footer_box">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">24</property>
                         <property name="spacing">12</property>
                         <child>
-                          <object class="GtkCheckButton" id="footer_cb">
-                            <property name="label" translatable="yes" context="headerfootertab|footer_cb">_Footer</property>
+                          <object class="GtkLabel" id="footer_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0</property>
-                            <property name="draw_indicator">True</property>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" id="footer_cb-atkobject">
-                                <property name="AtkObject::accessible-description" translatable="yes" context="headerfootertab|extended_tip|footer_cb">Adds the text that you enter in the Footer text box to the bottom of the slide.</property>
-                              </object>
-                            </child>
+                            <property name="can-focus">False</property>
+                            <property name="label" translatable="yes" context="headerfootertab|footer_label">F_ooter text:</property>
+                            <property name="use-underline">True</property>
+                            <property name="mnemonic-widget">footer_text</property>
+                            <property name="xalign">1</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -358,51 +355,13 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkAlignment">
+                          <object class="GtkEntry" id="footer_text">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkBox" id="footer_box">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="margin-start">12</property>
-                                <property name="spacing">12</property>
-                                <child>
-                                  <object class="GtkLabel" id="footer_label">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes" context="headerfootertab|footer_label">F_ooter text:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">footer_text</property>
-                                    <property name="xalign">1</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="footer_text">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="activates_default">True</property>
-                                    <child internal-child="accessible">
-                                      <object class="AtkObject" id="footer_text-atkobject">
-                                        <property name="AtkObject::accessible-description" translatable="yes" context="headerfootertab|extended_tip|footer_text">Adds the text that you enter to the bottom of the slide.</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <accessibility>
-                                  <relation type="labelled-by" target="footer_cb"/>
-                                </accessibility>
+                            <property name="can-focus">True</property>
+                            <property name="activates-default">True</property>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="footer_text-atkobject">
+                                <property name="AtkObject::accessible-description" translatable="yes" context="headerfootertab|extended_tip|footer_text">Adds the text that you enter to the bottom of the slide.</property>
                               </object>
                             </child>
                           </object>
@@ -412,42 +371,50 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="footer_cb"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">4</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkCheckButton" id="slide_number">
-                        <property name="label" translatable="yes" context="headerfootertab|slide_number">_Slide number</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="slide_number-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes" context="headerfootertab|extended_tip|slide_number">Adds the slide number or the page number.</property>
-                          </object>
-                        </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">4</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="slide_number">
+                    <property name="label" translatable="yes" context="headerfootertab|slide_number">_Slide number</property>
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw-indicator">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="slide_number-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="headerfootertab|extended_tip|slide_number">Adds the slide number or the page number.</property>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">5</property>
+                  </packing>
                 </child>
               </object>
             </child>
             <child type="label">
               <object class="GtkLabel" id="include_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="headerfootertab|include_label">Include on Slide</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -462,24 +429,18 @@
           </packing>
         </child>
         <child>
-          <object class="GtkAlignment">
+          <object class="GtkCheckButton" id="not_on_title">
+            <property name="label" translatable="yes" context="headerfootertab|not_on_title">Do _not show on the first slide</property>
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="left_padding">12</property>
-            <child>
-              <object class="GtkCheckButton" id="not_on_title">
-                <property name="label" translatable="yes" context="headerfootertab|not_on_title">Do _not show on the first slide</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
-                <property name="xalign">0</property>
-                <property name="draw_indicator">True</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="not_on_title-atkobject">
-                    <property name="AtkObject::accessible-description" translatable="yes" context="headerfootertab|extended_tip|not_on_title">Does not display your specified information on the first slide of your presentation.</property>
-                  </object>
-                </child>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="margin-start">12</property>
+            <property name="use-underline">True</property>
+            <property name="xalign">0</property>
+            <property name="draw-indicator">True</property>
+            <child internal-child="accessible">
+              <object class="AtkObject" id="not_on_title-atkobject">
+                <property name="AtkObject::accessible-description" translatable="yes" context="headerfootertab|extended_tip|not_on_title">Does not display your specified information on the first slide of your presentation.</property>
               </object>
             </child>
           </object>
@@ -491,10 +452,10 @@
         </child>
         <child>
           <object class="GtkLabel" id="replacement_a">
-            <property name="can_focus">False</property>
-            <property name="no_show_all">True</property>
+            <property name="can-focus">False</property>
+            <property name="no-show-all">True</property>
             <property name="label" translatable="yes" context="headerfootertab|replacement_a">_Page Number</property>
-            <property name="use_underline">True</property>
+            <property name="use-underline">True</property>
             <property name="xalign">0</property>
           </object>
           <packing>
@@ -505,8 +466,8 @@
         </child>
         <child>
           <object class="GtkLabel" id="replacement_b">
-            <property name="can_focus">False</property>
-            <property name="no_show_all">True</property>
+            <property name="can-focus">False</property>
+            <property name="no-show-all">True</property>
             <property name="label" translatable="yes" context="headerfootertab|replacement_b">Include on page</property>
             <property name="xalign">0</property>
           </object>
@@ -526,10 +487,10 @@
     <child>
       <object class="GtkDrawingArea" id="preview">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="halign">center</property>
         <property name="valign">start</property>
-        <property name="margin_top">24</property>
+        <property name="margin-top">24</property>
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
       </object>