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

for cui part a

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

1 files changed, 156 insertions, 162 deletions

diff --git a/cui/uiconfig/ui/editmodulesdialog.ui b/cui/uiconfig/ui/editmodulesdialog.ui
index 69c5f8e80444..58fb3737ba71 100644
--- a/cui/uiconfig/ui/editmodulesdialog.ui
+++ b/cui/uiconfig/ui/editmodulesdialog.ui
@@ -95,47 +95,114 @@
             <property name="label_xalign">0</property>
             <property name="shadow_type">none</property>
             <child>
-              <object class="GtkAlignment" id="alignment1">
+              <!-- n-columns=1 n-rows=1 -->
+              <object class="GtkGrid" id="grid1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="row_spacing">12</property>
+                <property name="margin-start">12</property>
+                <property name="margin-top">6</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
-                <property name="top_padding">6</property>
-                <property name="left_padding">12</property>
                 <child>
-                  <!-- n-columns=1 n-rows=1 -->
-                  <object class="GtkGrid" id="grid1">
+                  <object class="GtkLinkButton" id="moredictslink">
+                    <property name="label" translatable="yes" context="editmodulesdialog|moredictslink">Get more dictionaries online...</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="relief">none</property>
+                    <property name="xalign">0</property>
+                    <property name="uri">https://extensions.libreoffice.org/dictionaries/</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="box1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="row_spacing">12</property>
+                    <property name="spacing">12</property>
                     <child>
-                      <object class="GtkLinkButton" id="moredictslink">
-                        <property name="label" translatable="yes" context="editmodulesdialog|moredictslink">Get more dictionaries online...</property>
+                      <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="relief">none</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes" context="editmodulesdialog|label2">Language:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">language</property>
                         <property name="xalign">0</property>
-                        <property name="uri">https://extensions.libreoffice.org/dictionaries/</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBox" id="language">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="model">liststore6</property>
+                        <property name="entry_text_column">0</property>
+                        <property name="id_column">1</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="cellrenderertext9"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
+                        <child>
+                          <object class="GtkCellRendererPixbuf" id="cellrenderertext6"/>
+                          <attributes>
+                            <attribute name="pixbuf">2</attribute>
+                          </attributes>
+                        </child>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="language-atkobject">
+                            <property name="AtkObject::accessible-description" translatable="yes" context="language">Specifies the language of the module.</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="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <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="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="column_spacing">12</property>
                     <child>
-                      <object class="GtkBox" id="box1">
+                      <object class="GtkButtonBox" id="buttonbox1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="spacing">12</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
+                        <property name="layout_style">start</property>
                         <child>
-                          <object class="GtkLabel" id="label2">
+                          <object class="GtkButton" id="up">
+                            <property name="label" translatable="yes" context="editmodulesdialog|up">Move Up</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes" context="editmodulesdialog|label2">Language:</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
                             <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">language</property>
-                            <property name="xalign">0</property>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="up-atkobject">
+                                <property name="AtkObject::accessible-description" translatable="yes" context="up">Increases the priority of the module selected in the list box by one level.</property>
+                              </object>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -144,27 +211,15 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkComboBox" id="language">
+                          <object class="GtkButton" id="down">
+                            <property name="label" translatable="yes" context="editmodulesdialog|down">Move Down</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="model">liststore6</property>
-                            <property name="entry_text_column">0</property>
-                            <property name="id_column">1</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="cellrenderertext9"/>
-                              <attributes>
-                                <attribute name="text">0</attribute>
-                              </attributes>
-                            </child>
-                            <child>
-                              <object class="GtkCellRendererPixbuf" id="cellrenderertext6"/>
-                              <attributes>
-                                <attribute name="pixbuf">2</attribute>
-                              </attributes>
-                            </child>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="use_underline">True</property>
                             <child internal-child="accessible">
-                              <object class="AtkObject" id="language-atkobject">
-                                <property name="AtkObject::accessible-description" translatable="yes" context="language">Specifies the language of the module.</property>
+                              <object class="AtkObject" id="down-atkobject">
+                                <property name="AtkObject::accessible-description" translatable="yes" context="down">Decreases the priority of the module selected in the list box by one level.</property>
                               </object>
                             </child>
                           </object>
@@ -174,158 +229,97 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkButton" id="back">
+                            <property name="label" translatable="yes" context="editmodulesdialog|back">_Back</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="use_underline">True</property>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="back-atkobject">
+                                <property name="AtkObject::accessible-description" translatable="yes" context="back">Click here to undo the current changes in the list box.</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
+                        <property name="left_attach">1</property>
                         <property name="top_attach">0</property>
                       </packing>
                     </child>
                     <child>
-                      <!-- n-columns=1 n-rows=1 -->
-                      <object class="GtkGrid" id="grid2">
+                      <object class="GtkScrolledWindow">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="hexpand">True</property>
                         <property name="vexpand">True</property>
-                        <property name="column_spacing">12</property>
+                        <property name="shadow_type">in</property>
                         <child>
-                          <object class="GtkButtonBox" id="buttonbox1">
+                          <object class="GtkTreeView" id="lingudicts">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <property name="spacing">6</property>
-                            <property name="layout_style">start</property>
-                            <child>
-                              <object class="GtkButton" id="up">
-                                <property name="label" translatable="yes" context="editmodulesdialog|up">Move Up</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="use_underline">True</property>
-                                <child internal-child="accessible">
-                                  <object class="AtkObject" id="up-atkobject">
-                                    <property name="AtkObject::accessible-description" translatable="yes" context="up">Increases the priority of the module selected in the list box by one level.</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="vexpand">True</property>
+                            <property name="model">liststore1</property>
+                            <property name="headers_visible">False</property>
+                            <property name="search_column">0</property>
+                            <property name="show_expanders">False</property>
+                            <child internal-child="selection">
+                              <object class="GtkTreeSelection" id="Macro Library List-selection2"/>
                             </child>
                             <child>
-                              <object class="GtkButton" id="down">
-                                <property name="label" translatable="yes" context="editmodulesdialog|down">Move Down</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="use_underline">True</property>
-                                <child internal-child="accessible">
-                                  <object class="AtkObject" id="down-atkobject">
-                                    <property name="AtkObject::accessible-description" translatable="yes" context="down">Decreases the priority of the module selected in the list box by one level.</property>
-                                  </object>
+                              <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+                                <property name="resizable">True</property>
+                                <property name="spacing">6</property>
+                                <property name="alignment">0,50000000000000000000</property>
+                                <child>
+                                  <object class="GtkCellRendererToggle" id="cellrenderer5"/>
+                                  <attributes>
+                                    <attribute name="visible">3</attribute>
+                                    <attribute name="active">0</attribute>
+                                  </attributes>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
                             </child>
                             <child>
-                              <object class="GtkButton" id="back">
-                                <property name="label" translatable="yes" context="editmodulesdialog|back">_Back</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="use_underline">True</property>
-                                <child internal-child="accessible">
-                                  <object class="AtkObject" id="back-atkobject">
-                                    <property name="AtkObject::accessible-description" translatable="yes" context="back">Click here to undo the current changes in the list box.</property>
-                                  </object>
+                              <object class="GtkTreeViewColumn" id="treeviewcolumn2">
+                                <property name="resizable">True</property>
+                                <property name="spacing">6</property>
+                                <property name="alignment">0,50000000000000000000</property>
+                                <child>
+                                  <object class="GtkCellRendererText" id="cellrenderer4"/>
+                                  <attributes>
+                                    <attribute name="text">1</attribute>
+                                    <attribute name="weight">5</attribute>
+                                  </attributes>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
                             </child>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkScrolledWindow">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="hexpand">True</property>
-                            <property name="vexpand">True</property>
-                            <property name="shadow_type">in</property>
-                            <child>
-                              <object class="GtkTreeView" id="lingudicts">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="vexpand">True</property>
-                                <property name="model">liststore1</property>
-                                <property name="headers_visible">False</property>
-                                <property name="search_column">0</property>
-                                <property name="show_expanders">False</property>
-                                <child internal-child="selection">
-                                  <object class="GtkTreeSelection" id="Macro Library List-selection2"/>
-                                </child>
-                                <child>
-                                  <object class="GtkTreeViewColumn" id="treeviewcolumn1">
-                                    <property name="resizable">True</property>
-                                    <property name="spacing">6</property>
-                                    <property name="alignment">0,50000000000000000000</property>
-                                    <child>
-                                      <object class="GtkCellRendererToggle" id="cellrenderer5"/>
-                                      <attributes>
-                                        <attribute name="visible">3</attribute>
-                                        <attribute name="active">0</attribute>
-                                      </attributes>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkTreeViewColumn" id="treeviewcolumn2">
-                                    <property name="resizable">True</property>
-                                    <property name="spacing">6</property>
-                                    <property name="alignment">0,50000000000000000000</property>
-                                    <child>
-                                      <object class="GtkCellRendererText" id="cellrenderer4"/>
-                                      <attributes>
-                                        <attribute name="text">1</attribute>
-                                        <attribute name="weight">5</attribute>
-                                      </attributes>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child internal-child="accessible">
-                                  <object class="AtkObject" id="lingudicts-atkobject">
-                                    <property name="AtkObject::accessible-description" translatable="yes" context="lingudicts">Specifies the language and the available spelling, hyphenation and Thesaurus sub-modules for the selected module.</property>
-                                  </object>
-                                </child>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="lingudicts-atkobject">
+                                <property name="AtkObject::accessible-description" translatable="yes" context="lingudicts">Specifies the language and the available spelling, hyphenation and Thesaurus sub-modules for the selected module.</property>
                               </object>
                             </child>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                          </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
+                        <property name="top_attach">0</property>
                       </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
                 </child>
               </object>
             </child>