svtools/uiconfig/ui/addresstemplatedialog.ui |  728 ++++++++++----------
 svtools/uiconfig/ui/graphicexport.ui         |  950 ++++++++++++---------------
 svtools/uiconfig/ui/printersetupdialog.ui    |  288 ++++----
 3 files changed, 935 insertions(+), 1031 deletions(-)

New commits:
commit 50da44b42dcac738e8ad0f21cbd5e97a6871bd4f
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Dec 22 12:40:21 2020 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Dec 22 21:10:57 2020 +0100

    drop deprecated GtkAlignment, move left/top-padding into child 
margin-start/top
    
    for svtools
    
    Change-Id: Iea5d5996cfcd6fe2e356e6565b8366e0db7a0424
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108199
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/svtools/uiconfig/ui/addresstemplatedialog.ui 
b/svtools/uiconfig/ui/addresstemplatedialog.ui
index 1ad79067b02e..16523b8d686e 100644
--- a/svtools/uiconfig/ui/addresstemplatedialog.ui
+++ b/svtools/uiconfig/ui/addresstemplatedialog.ui
@@ -89,114 +89,108 @@
                 <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="grid2">
                     <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="row_spacing">6</property>
+                    <property name="column_spacing">12</property>
+                    <property name="margin-start">12</property>
+                    <property name="margin-top">6</property>
                     <child>
-                      <!-- n-columns=1 n-rows=1 -->
-                      <object class="GtkGrid" id="grid2">
+                      <object class="GtkLabel" id="label33">
                         <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="GtkLabel" id="label33">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes" 
context="addresstemplatedialog|label33">Data source:</property>
-                            <property name="use_underline">True</property>
-                            <property 
name="mnemonic_widget">datasource</property>
-                            <property name="xalign">1</property>
+                        <property name="label" translatable="yes" 
context="addresstemplatedialog|label33">Data source:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">datasource</property>
+                        <property name="xalign">1</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label43">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes" 
context="addresstemplatedialog|label43">Table:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">datatable</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="datasource">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="has_entry">True</property>
+                        <child internal-child="entry">
+                          <object class="GtkEntry" id="comboboxtext-entry">
+                            <property name="can_focus">True</property>
+                            <property name="activates_default">True</property>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                          </packing>
                         </child>
-                        <child>
-                          <object class="GtkLabel" id="label43">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes" 
context="addresstemplatedialog|label43">Table:</property>
-                            <property name="use_underline">True</property>
-                            <property 
name="mnemonic_widget">datatable</property>
-                            <property name="xalign">1</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="datasource-atkobject">
+                            <property name="AtkObject::accessible-description" 
translatable="yes" 
context="addresstemplatedialog|extended_tip|datasource">Select the data source 
for your address book.</property>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
-                          </packing>
                         </child>
-                        <child>
-                          <object class="GtkComboBoxText" id="datasource">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="hexpand">True</property>
-                            <property name="has_entry">True</property>
-                            <child internal-child="entry">
-                              <object class="GtkEntry" id="comboboxtext-entry">
-                                <property name="can_focus">True</property>
-                                <property 
name="activates_default">True</property>
-                              </object>
-                            </child>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" 
id="datasource-atkobject">
-                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="addresstemplatedialog|extended_tip|datasource">Select the data source 
for your address book.</property>
-                              </object>
-                            </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBoxText" id="datatable">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="has_entry">True</property>
+                        <child internal-child="entry">
+                          <object class="GtkEntry" id="comboboxtext-entry1">
+                            <property name="can_focus">True</property>
+                            <property name="activates_default">True</property>
                           </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
-                          </packing>
                         </child>
-                        <child>
-                          <object class="GtkComboBoxText" id="datatable">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="hexpand">True</property>
-                            <property name="has_entry">True</property>
-                            <child internal-child="entry">
-                              <object class="GtkEntry" 
id="comboboxtext-entry1">
-                                <property name="can_focus">True</property>
-                                <property 
name="activates_default">True</property>
-                              </object>
-                            </child>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" 
id="datatable-atkobject">
-                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="addresstemplatedialog|extended_tip|datatable">Select the data table 
for your address book.</property>
-                              </object>
-                            </child>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="datatable-atkobject">
+                            <property name="AtkObject::accessible-description" 
translatable="yes" 
context="addresstemplatedialog|extended_tip|datatable">Select the data table 
for your address book.</property>
                           </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">1</property>
-                          </packing>
                         </child>
-                        <child>
-                          <object class="GtkButton" id="admin">
-                            <property name="label" translatable="yes" 
context="addresstemplatedialog|admin">_Assign</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="admin-atkobject">
-                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="addresstemplatedialog|extended_tip|admin">Add a new data source to the 
Address Book Source list.</property>
-                              </object>
-                            </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="admin">
+                        <property name="label" translatable="yes" 
context="addresstemplatedialog|admin">_Assign</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="admin-atkobject">
+                            <property name="AtkObject::accessible-description" 
translatable="yes" context="addresstemplatedialog|extended_tip|admin">Add a new 
data source to the Address Book Source list.</property>
                           </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <placeholder/>
                         </child>
                       </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
                     </child>
                   </object>
                 </child>
@@ -225,172 +219,51 @@
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment2">
+                  <object class="GtkScrolledWindow" id="scrollwindow">
                     <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">True</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="hscrollbar_policy">never</property>
+                    <property name="vscrollbar_policy">always</property>
+                    <property name="shadow_type">in</property>
+                    <property name="margin-start">12</property>
+                    <property name="margin-top">6</property>
                     <child>
-                      <object class="GtkScrolledWindow" id="scrollwindow">
+                      <object class="GtkViewport" id="viewport1">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hexpand">True</property>
-                        <property name="vexpand">True</property>
-                        <property name="hscrollbar_policy">never</property>
-                        <property name="vscrollbar_policy">always</property>
-                        <property name="shadow_type">in</property>
+                        <property name="can_focus">False</property>
                         <child>
-                          <object class="GtkViewport" id="viewport1">
+                          <!-- n-columns=1 n-rows=1 -->
+                          <object class="GtkGrid" id="grid">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <child>
                               <!-- n-columns=1 n-rows=1 -->
-                              <object class="GtkGrid" id="grid">
+                              <object class="GtkGrid">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="hexpand">True</property>
+                                <property name="border_width">6</property>
+                                <property name="column_spacing">18</property>
+                                <property 
name="column_homogeneous">True</property>
                                 <child>
                                   <!-- n-columns=1 n-rows=1 -->
-                                  <object class="GtkGrid">
+                                  <object class="GtkGrid" id="grid5">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="hexpand">True</property>
-                                    <property name="border_width">6</property>
-                                    <property 
name="column_spacing">18</property>
-                                    <property 
name="column_homogeneous">True</property>
+                                    <property name="vexpand">True</property>
+                                    <property name="row_spacing">6</property>
+                                    <property 
name="column_spacing">12</property>
                                     <child>
-                                      <!-- n-columns=1 n-rows=1 -->
-                                      <object class="GtkGrid" id="grid5">
+                                      <object class="GtkLabel" id="label0">
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">False</property>
-                                        <property 
name="hexpand">True</property>
-                                        <property 
name="vexpand">True</property>
-                                        <property 
name="row_spacing">6</property>
-                                        <property 
name="column_spacing">12</property>
-                                        <child>
-                                          <object class="GtkLabel" id="label0">
-                                            <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
-                                            <property name="label" 
translatable="no">label</property>
-                                            <property 
name="use_underline">True</property>
-                                            <property 
name="mnemonic_widget">box0</property>
-                                            <property 
name="xalign">1</property>
-                                          </object>
-                                          <packing>
-                                            <property 
name="left_attach">0</property>
-                                            <property 
name="top_attach">0</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkComboBoxText" 
id="box0">
-                                            <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
-                                            <property 
name="hexpand">True</property>
-                                          </object>
-                                          <packing>
-                                            <property 
name="left_attach">1</property>
-                                            <property 
name="top_attach">0</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label2">
-                                            <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
-                                            <property name="label" 
translatable="no">label</property>
-                                            <property 
name="use_underline">True</property>
-                                            <property 
name="mnemonic_widget">box2</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="GtkLabel" id="label4">
-                                            <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
-                                            <property name="label" 
translatable="no">label</property>
-                                            <property 
name="use_underline">True</property>
-                                            <property 
name="mnemonic_widget">box4</property>
-                                            <property 
name="xalign">1</property>
-                                          </object>
-                                          <packing>
-                                            <property 
name="left_attach">0</property>
-                                            <property 
name="top_attach">2</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label6">
-                                            <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
-                                            <property name="label" 
translatable="no">label</property>
-                                            <property 
name="use_underline">True</property>
-                                            <property 
name="mnemonic_widget">box6</property>
-                                            <property 
name="xalign">1</property>
-                                          </object>
-                                          <packing>
-                                            <property 
name="left_attach">0</property>
-                                            <property 
name="top_attach">3</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label8">
-                                            <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
-                                            <property name="label" 
translatable="no">label</property>
-                                            <property 
name="use_underline">True</property>
-                                            <property 
name="mnemonic_widget">box8</property>
-                                            <property 
name="xalign">1</property>
-                                          </object>
-                                          <packing>
-                                            <property 
name="left_attach">0</property>
-                                            <property 
name="top_attach">4</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkComboBoxText" 
id="box2">
-                                            <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
-                                            <property 
name="hexpand">True</property>
-                                          </object>
-                                          <packing>
-                                            <property 
name="left_attach">1</property>
-                                            <property 
name="top_attach">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkComboBoxText" 
id="box4">
-                                            <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
-                                            <property 
name="hexpand">True</property>
-                                          </object>
-                                          <packing>
-                                            <property 
name="left_attach">1</property>
-                                            <property 
name="top_attach">2</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkComboBoxText" 
id="box6">
-                                            <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
-                                            <property 
name="hexpand">True</property>
-                                          </object>
-                                          <packing>
-                                            <property 
name="left_attach">1</property>
-                                            <property 
name="top_attach">3</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkComboBoxText" 
id="box8">
-                                            <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
-                                            <property 
name="hexpand">True</property>
-                                          </object>
-                                          <packing>
-                                            <property 
name="left_attach">1</property>
-                                            <property 
name="top_attach">4</property>
-                                          </packing>
-                                        </child>
+                                        <property name="label" 
translatable="no">label</property>
+                                        <property 
name="use_underline">True</property>
+                                        <property 
name="mnemonic_widget">box0</property>
+                                        <property name="xalign">1</property>
                                       </object>
                                       <packing>
                                         <property 
name="left_attach">0</property>
@@ -398,152 +271,267 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <!-- n-columns=1 n-rows=1 -->
-                                      <object class="GtkGrid" id="grid6">
+                                      <object class="GtkComboBoxText" 
id="box0">
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">False</property>
                                         <property 
name="hexpand">True</property>
-                                        <property 
name="vexpand">True</property>
-                                        <property 
name="row_spacing">6</property>
-                                        <property 
name="column_spacing">12</property>
-                                        <child>
-                                          <object class="GtkLabel" id="label1">
-                                            <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
-                                            <property name="label" 
translatable="no">label</property>
-                                            <property 
name="use_underline">True</property>
-                                            <property 
name="mnemonic_widget">box1</property>
-                                            <property 
name="xalign">1</property>
-                                          </object>
-                                          <packing>
-                                            <property 
name="left_attach">0</property>
-                                            <property 
name="top_attach">0</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkComboBoxText" 
id="box1">
-                                            <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
-                                            <property 
name="hexpand">True</property>
-                                          </object>
-                                          <packing>
-                                            <property 
name="left_attach">1</property>
-                                            <property 
name="top_attach">0</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label3">
-                                            <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
-                                            <property name="label" 
translatable="no">label</property>
-                                            <property 
name="use_underline">True</property>
-                                            <property 
name="mnemonic_widget">box3</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="GtkLabel" id="label5">
-                                            <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
-                                            <property name="label" 
translatable="no">label</property>
-                                            <property 
name="use_underline">True</property>
-                                            <property 
name="mnemonic_widget">box5</property>
-                                            <property 
name="xalign">1</property>
-                                          </object>
-                                          <packing>
-                                            <property 
name="left_attach">0</property>
-                                            <property 
name="top_attach">2</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label7">
-                                            <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
-                                            <property name="label" 
translatable="no">label</property>
-                                            <property 
name="use_underline">True</property>
-                                            <property 
name="mnemonic_widget">box7</property>
-                                            <property 
name="xalign">1</property>
-                                          </object>
-                                          <packing>
-                                            <property 
name="left_attach">0</property>
-                                            <property 
name="top_attach">3</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label9">
-                                            <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
-                                            <property name="label" 
translatable="no">label</property>
-                                            <property 
name="use_underline">True</property>
-                                            <property 
name="mnemonic_widget">box9</property>
-                                            <property 
name="xalign">1</property>
-                                          </object>
-                                          <packing>
-                                            <property 
name="left_attach">0</property>
-                                            <property 
name="top_attach">4</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkComboBoxText" 
id="box3">
-                                            <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
-                                            <property 
name="hexpand">True</property>
-                                          </object>
-                                          <packing>
-                                            <property 
name="left_attach">1</property>
-                                            <property 
name="top_attach">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkComboBoxText" 
id="box5">
-                                            <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
-                                            <property 
name="hexpand">True</property>
-                                          </object>
-                                          <packing>
-                                            <property 
name="left_attach">1</property>
-                                            <property 
name="top_attach">2</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkComboBoxText" 
id="box7">
-                                            <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
-                                            <property 
name="hexpand">True</property>
-                                          </object>
-                                          <packing>
-                                            <property 
name="left_attach">1</property>
-                                            <property 
name="top_attach">3</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkComboBoxText" 
id="box9">
-                                            <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
-                                            <property 
name="hexpand">True</property>
-                                          </object>
-                                          <packing>
-                                            <property 
name="left_attach">1</property>
-                                            <property 
name="top_attach">4</property>
-                                          </packing>
-                                        </child>
                                       </object>
                                       <packing>
                                         <property 
name="left_attach">1</property>
                                         <property 
name="top_attach">0</property>
                                       </packing>
                                     </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label2">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="no">label</property>
+                                        <property 
name="use_underline">True</property>
+                                        <property 
name="mnemonic_widget">box2</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="GtkLabel" id="label4">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="no">label</property>
+                                        <property 
name="use_underline">True</property>
+                                        <property 
name="mnemonic_widget">box4</property>
+                                        <property name="xalign">1</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="left_attach">0</property>
+                                        <property 
name="top_attach">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label6">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="no">label</property>
+                                        <property 
name="use_underline">True</property>
+                                        <property 
name="mnemonic_widget">box6</property>
+                                        <property name="xalign">1</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="left_attach">0</property>
+                                        <property 
name="top_attach">3</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label8">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="no">label</property>
+                                        <property 
name="use_underline">True</property>
+                                        <property 
name="mnemonic_widget">box8</property>
+                                        <property name="xalign">1</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="left_attach">0</property>
+                                        <property 
name="top_attach">4</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkComboBoxText" 
id="box2">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property 
name="hexpand">True</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="left_attach">1</property>
+                                        <property 
name="top_attach">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkComboBoxText" 
id="box4">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property 
name="hexpand">True</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="left_attach">1</property>
+                                        <property 
name="top_attach">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkComboBoxText" 
id="box6">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property 
name="hexpand">True</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="left_attach">1</property>
+                                        <property 
name="top_attach">3</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkComboBoxText" 
id="box8">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property 
name="hexpand">True</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="left_attach">1</property>
+                                        <property 
name="top_attach">4</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="grid6">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="vexpand">True</property>
+                                    <property name="row_spacing">6</property>
+                                    <property 
name="column_spacing">12</property>
+                                    <child>
+                                      <object class="GtkLabel" id="label1">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="no">label</property>
+                                        <property 
name="use_underline">True</property>
+                                        <property 
name="mnemonic_widget">box1</property>
+                                        <property name="xalign">1</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="left_attach">0</property>
+                                        <property 
name="top_attach">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkComboBoxText" 
id="box1">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property 
name="hexpand">True</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="left_attach">1</property>
+                                        <property 
name="top_attach">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label3">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="no">label</property>
+                                        <property 
name="use_underline">True</property>
+                                        <property 
name="mnemonic_widget">box3</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="GtkLabel" id="label5">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="no">label</property>
+                                        <property 
name="use_underline">True</property>
+                                        <property 
name="mnemonic_widget">box5</property>
+                                        <property name="xalign">1</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="left_attach">0</property>
+                                        <property 
name="top_attach">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label7">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="no">label</property>
+                                        <property 
name="use_underline">True</property>
+                                        <property 
name="mnemonic_widget">box7</property>
+                                        <property name="xalign">1</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="left_attach">0</property>
+                                        <property 
name="top_attach">3</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label9">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="no">label</property>
+                                        <property 
name="use_underline">True</property>
+                                        <property 
name="mnemonic_widget">box9</property>
+                                        <property name="xalign">1</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="left_attach">0</property>
+                                        <property 
name="top_attach">4</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkComboBoxText" 
id="box3">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property 
name="hexpand">True</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="left_attach">1</property>
+                                        <property 
name="top_attach">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkComboBoxText" 
id="box5">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property 
name="hexpand">True</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="left_attach">1</property>
+                                        <property 
name="top_attach">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkComboBoxText" 
id="box7">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property 
name="hexpand">True</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="left_attach">1</property>
+                                        <property 
name="top_attach">3</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkComboBoxText" 
id="box9">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property 
name="hexpand">True</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="left_attach">1</property>
+                                        <property 
name="top_attach">4</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">0</property>
+                                  </packing>
+                                </child>
                               </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">0</property>
+                              </packing>
                             </child>
                           </object>
                         </child>
diff --git a/svtools/uiconfig/ui/graphicexport.ui 
b/svtools/uiconfig/ui/graphicexport.ui
index 850e5c3c277b..b07c8cd7b47a 100644
--- a/svtools/uiconfig/ui/graphicexport.ui
+++ b/svtools/uiconfig/ui/graphicexport.ui
@@ -114,162 +114,156 @@
                 <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="top_padding">6</property>
-                    <property name="left_padding">12</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">6</property>
+                    <property name="margin-start">12</property>
+                    <property name="margin-top">6</property>
                     <child>
-                      <!-- n-columns=1 n-rows=1 -->
-                      <object class="GtkGrid" id="grid1">
+                      <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="row_spacing">6</property>
-                        <property name="column_spacing">6</property>
-                        <child>
-                          <object class="GtkLabel" id="label5">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes" 
context="graphicexport|label5">Width:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">widthmf</property>
-                            <property name="xalign">1</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label6">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes" 
context="graphicexport|label6">Height:</property>
-                            <property name="use_underline">True</property>
-                            <property 
name="mnemonic_widget">heightmf</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="GtkLabel" id="resolutionft">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes" 
context="graphicexport|resolutionft">Resolution:</property>
-                            <property name="use_underline">True</property>
-                            <property 
name="mnemonic_widget">resolutionmf</property>
-                            <property name="xalign">1</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="widthmf">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="activates_default">True</property>
-                            <property name="xalign">1</property>
-                            <property name="adjustment">adjustment3</property>
-                            <property name="digits">2</property>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" id="widthmf-atkobject">
-                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="graphicexport|extended_tip|widthmf">Specifies the measurement 
units.</property>
-                              </object>
-                            </child>
+                        <property name="label" translatable="yes" 
context="graphicexport|label5">Width:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">widthmf</property>
+                        <property name="xalign">1</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label6">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes" 
context="graphicexport|label6">Height:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">heightmf</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="GtkLabel" id="resolutionft">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes" 
context="graphicexport|resolutionft">Resolution:</property>
+                        <property name="use_underline">True</property>
+                        <property 
name="mnemonic_widget">resolutionmf</property>
+                        <property name="xalign">1</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" id="widthmf">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="activates_default">True</property>
+                        <property name="xalign">1</property>
+                        <property name="adjustment">adjustment3</property>
+                        <property name="digits">2</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="widthmf-atkobject">
+                            <property name="AtkObject::accessible-description" 
translatable="yes" context="graphicexport|extended_tip|widthmf">Specifies the 
measurement units.</property>
                           </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
-                          </packing>
                         </child>
-                        <child>
-                          <object class="GtkSpinButton" id="heightmf">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="activates_default">True</property>
-                            <property name="xalign">1</property>
-                            <property name="adjustment">adjustment4</property>
-                            <property name="digits">2</property>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" 
id="heightmf-atkobject">
-                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="graphicexport|extended_tip|heightmf">Specifies the height.</property>
-                              </object>
-                            </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" id="heightmf">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="activates_default">True</property>
+                        <property name="xalign">1</property>
+                        <property name="adjustment">adjustment4</property>
+                        <property name="digits">2</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="heightmf-atkobject">
+                            <property name="AtkObject::accessible-description" 
translatable="yes" context="graphicexport|extended_tip|heightmf">Specifies the 
height.</property>
                           </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">1</property>
-                          </packing>
                         </child>
-                        <child>
-                          <object class="GtkSpinButton" id="resolutionmf">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="activates_default">True</property>
-                            <property name="xalign">1</property>
-                            <property name="adjustment">adjustment5</property>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" 
id="resolutionmf-atkobject">
-                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="graphicexport|extended_tip|resolutionmf">Enter the image resolution. 
Select the measurement units from the list box.</property>
-                              </object>
-                            </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" id="resolutionmf">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="activates_default">True</property>
+                        <property name="xalign">1</property>
+                        <property name="adjustment">adjustment5</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" 
id="resolutionmf-atkobject">
+                            <property name="AtkObject::accessible-description" 
translatable="yes" context="graphicexport|extended_tip|resolutionmf">Enter the 
image resolution. Select the measurement units from the list box.</property>
                           </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">2</property>
-                          </packing>
                         </child>
-                        <child>
-                          <object class="GtkComboBoxText" id="widthlb">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <items>
-                              <item translatable="yes" 
context="graphicexport|liststore2">inches</item>
-                              <item translatable="yes" 
context="graphicexport|liststore2">cm</item>
-                              <item translatable="yes" 
context="graphicexport|liststore2">mm</item>
-                              <item translatable="yes" 
context="graphicexport|liststore2">points</item>
-                              <item translatable="yes" 
context="graphicexport|liststore2">pixels</item>
-                            </items>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" id="widthlb-atkobject">
-                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="graphicexport|extended_tip|widthlb">Specifies the width.</property>
-                              </object>
-                            </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBoxText" id="widthlb">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <items>
+                          <item translatable="yes" 
context="graphicexport|liststore2">inches</item>
+                          <item translatable="yes" 
context="graphicexport|liststore2">cm</item>
+                          <item translatable="yes" 
context="graphicexport|liststore2">mm</item>
+                          <item translatable="yes" 
context="graphicexport|liststore2">points</item>
+                          <item translatable="yes" 
context="graphicexport|liststore2">pixels</item>
+                        </items>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="widthlb-atkobject">
+                            <property name="AtkObject::accessible-description" 
translatable="yes" context="graphicexport|extended_tip|widthlb">Specifies the 
width.</property>
                           </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">0</property>
-                          </packing>
                         </child>
-                        <child>
-                          <object class="GtkComboBoxText" id="resolutionlb">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <items>
-                              <item translatable="yes" 
context="graphicexport|liststore1">pixels/cm</item>
-                              <item translatable="yes" 
context="graphicexport|liststore1">pixels/inch</item>
-                              <item translatable="yes" 
context="graphicexport|liststore1">pixels/meter</item>
-                            </items>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" 
id="resolutionlb-atkobject">
-                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="graphicexport|extended_tip|resolutionlb">Enter the image resolution. 
Select the measurement units from the list box.</property>
-                              </object>
-                            </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBoxText" id="resolutionlb">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <items>
+                          <item translatable="yes" 
context="graphicexport|liststore1">pixels/cm</item>
+                          <item translatable="yes" 
context="graphicexport|liststore1">pixels/inch</item>
+                          <item translatable="yes" 
context="graphicexport|liststore1">pixels/meter</item>
+                        </items>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" 
id="resolutionlb-atkobject">
+                            <property name="AtkObject::accessible-description" 
translatable="yes" context="graphicexport|extended_tip|resolutionlb">Enter the 
image resolution. Select the measurement units from the list box.</property>
                           </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <placeholder/>
                         </child>
                       </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="top_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
                     </child>
                   </object>
                 </child>
@@ -296,20 +290,14 @@
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment2">
+                  <object class="GtkComboBoxText" id="colordepthlb">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="top_padding">6</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <object class="GtkComboBoxText" id="colordepthlb">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" 
id="colordepthlb-atkobject">
-                            <property name="AtkObject::accessible-description" 
translatable="yes" context="graphicexport|extended_tip|colordepthlb">Select the 
color depth from 8 bit grayscale or 24 bit true color.</property>
-                          </object>
-                        </child>
+                    <property name="margin-start">12</property>
+                    <property name="margin-top">6</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="colordepthlb-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="graphicexport|extended_tip|colordepthlb">Select the 
color depth from 8 bit grayscale or 24 bit true color.</property>
                       </object>
                     </child>
                   </object>
@@ -337,50 +325,44 @@
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment5">
+                  <!-- n-columns=1 n-rows=1 -->
+                  <object class="GtkGrid" id="grid2">
                     <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="column_spacing">6</property>
+                    <property name="margin-start">12</property>
+                    <property name="margin-top">6</property>
                     <child>
-                      <!-- n-columns=1 n-rows=1 -->
-                      <object class="GtkGrid" id="grid2">
+                      <object class="GtkSpinButton" id="compressionjpgnf">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="column_spacing">6</property>
-                        <child>
-                          <object class="GtkSpinButton" id="compressionjpgnf">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="activates_default">True</property>
-                            <property name="xalign">1</property>
-                            <property name="adjustment">adjustment1</property>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" 
id="compressionjpgnf-atkobject">
-                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="graphicexport|extended_tip|compressionjpgnf">Sets the quality for the 
export. Choose from a low quality with minimal file size, up to a high quality 
and big file size</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkScale" id="compressionjpgsb">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="hexpand">True</property>
-                            <property name="adjustment">adjustment1</property>
-                            <property name="digits">0</property>
+                        <property name="can_focus">True</property>
+                        <property name="activates_default">True</property>
+                        <property name="xalign">1</property>
+                        <property name="adjustment">adjustment1</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" 
id="compressionjpgnf-atkobject">
+                            <property name="AtkObject::accessible-description" 
translatable="yes" context="graphicexport|extended_tip|compressionjpgnf">Sets 
the quality for the export. Choose from a low quality with minimal file size, 
up to a high quality and big file size</property>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                          </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkScale" id="compressionjpgsb">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="valign">center</property>
+                        <property name="hexpand">True</property>
+                        <property name="adjustment">adjustment1</property>
+                        <property name="digits">0</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
                     </child>
                   </object>
                 </child>
@@ -407,50 +389,44 @@
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment13">
+                  <!-- n-columns=1 n-rows=1 -->
+                  <object class="GtkGrid" id="grid9">
                     <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="column_spacing">6</property>
+                    <property name="margin-start">12</property>
+                    <property name="margin-top">6</property>
                     <child>
-                      <!-- n-columns=1 n-rows=1 -->
-                      <object class="GtkGrid" id="grid9">
+                      <object class="GtkSpinButton" id="compressionpngnf">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="column_spacing">6</property>
-                        <child>
-                          <object class="GtkSpinButton" id="compressionpngnf">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="activates_default">True</property>
-                            <property name="xalign">1</property>
-                            <property name="adjustment">adjustment2</property>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" 
id="compressionpngnf-atkobject">
-                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="graphicexport|extended_tip|compressionpngnf">Sets the compression for 
the export. A high compression means a smaller, but slower to load 
image.</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkScale" id="compressionpngsb">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="hexpand">True</property>
-                            <property name="adjustment">adjustment2</property>
-                            <property name="digits">0</property>
+                        <property name="can_focus">True</property>
+                        <property name="activates_default">True</property>
+                        <property name="xalign">1</property>
+                        <property name="adjustment">adjustment2</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" 
id="compressionpngnf-atkobject">
+                            <property name="AtkObject::accessible-description" 
translatable="yes" context="graphicexport|extended_tip|compressionpngnf">Sets 
the compression for the export. A high compression means a smaller, but slower 
to load image.</property>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                          </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkScale" id="compressionpngsb">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="valign">center</property>
+                        <property name="hexpand">True</property>
+                        <property name="adjustment">adjustment2</property>
+                        <property name="digits">0</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
                     </child>
                   </object>
                 </child>
@@ -477,26 +453,20 @@
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment3">
+                  <object class="GtkCheckButton" id="rlecb">
+                    <property name="label" translatable="yes" 
context="graphicexport|rlecb">RLE encoding</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="top_padding">6</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <object class="GtkCheckButton" id="rlecb">
-                        <property name="label" translatable="yes" 
context="graphicexport|rlecb">RLE encoding</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>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="rlecb-atkobject">
-                            <property name="AtkObject::accessible-description" 
translatable="yes" context="graphicexport|extended_tip|rlecb">Applies RLE (Run 
Length Encoding) to the BMP graphics.</property>
-                          </object>
-                        </child>
+                    <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>
+                    <property name="margin-start">12</property>
+                    <property name="margin-top">6</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="rlecb-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="graphicexport|extended_tip|rlecb">Applies RLE (Run 
Length Encoding) to the BMP graphics.</property>
                       </object>
                     </child>
                   </object>
@@ -524,26 +494,20 @@
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment6">
+                  <object class="GtkCheckButton" id="interlacedcb">
+                    <property name="label" translatable="yes" 
context="graphicexport|interlacedcb">Interlaced</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="top_padding">6</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <object class="GtkCheckButton" id="interlacedcb">
-                        <property name="label" translatable="yes" 
context="graphicexport|interlacedcb">Interlaced</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>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" 
id="interlacedcb-atkobject">
-                            <property name="AtkObject::accessible-description" 
translatable="yes" context="graphicexport|extended_tip|interlacedcb">Specifies 
whether the graphic is to be saved in interlaced mode.</property>
-                          </object>
-                        </child>
+                    <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>
+                    <property name="margin-start">12</property>
+                    <property name="margin-top">6</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="interlacedcb-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="graphicexport|extended_tip|interlacedcb">Specifies 
whether the graphic is to be saved in interlaced mode.</property>
                       </object>
                     </child>
                   </object>
@@ -571,26 +535,20 @@
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment7">
+                  <object class="GtkCheckButton" id="savetransparencycb">
+                    <property name="label" translatable="yes" 
context="graphicexport|savetransparencycb">Save transparency</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="top_padding">6</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <object class="GtkCheckButton" id="savetransparencycb">
-                        <property name="label" translatable="yes" 
context="graphicexport|savetransparencycb">Save transparency</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>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" 
id="savetransparencycb-atkobject">
-                            <property name="AtkObject::accessible-description" 
translatable="yes" 
context="graphicexport|extended_tip|savetransparencycb">Specifies whether to 
save the background of the picture as transparent. Only objects will be visible 
in the GIF image. Use the Color Replacer to set the transparent color in the 
picture.</property>
-                          </object>
-                        </child>
+                    <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>
+                    <property name="margin-start">12</property>
+                    <property name="margin-top">6</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" 
id="savetransparencycb-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" 
context="graphicexport|extended_tip|savetransparencycb">Specifies whether to 
save the background of the picture as transparent. Only objects will be visible 
in the GIF image. Use the Color Replacer to set the transparent color in the 
picture.</property>
                       </object>
                     </child>
                   </object>
@@ -618,59 +576,53 @@
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment8">
+                  <!-- n-columns=1 n-rows=1 -->
+                  <object class="GtkGrid" id="grid3">
                     <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="margin-start">12</property>
+                    <property name="margin-top">6</property>
                     <child>
-                      <!-- n-columns=1 n-rows=1 -->
-                      <object class="GtkGrid" id="grid3">
+                      <object class="GtkRadioButton" id="binarycb">
+                        <property name="label" translatable="yes" 
context="graphicexport|binarycb">Binary</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkRadioButton" id="binarycb">
-                            <property name="label" translatable="yes" 
context="graphicexport|binarycb">Binary</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">textcb</property>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" 
id="binarycb-atkobject">
-                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="graphicexport|extended_tip|binarycb">Exports the file in binary 
format. The resulting file is smaller than a text file.</property>
-                              </object>
-                            </child>
+                        <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">textcb</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="binarycb-atkobject">
+                            <property name="AtkObject::accessible-description" 
translatable="yes" context="graphicexport|extended_tip|binarycb">Exports the 
file in binary format. The resulting file is smaller than a text 
file.</property>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                          </packing>
                         </child>
-                        <child>
-                          <object class="GtkRadioButton" id="textcb">
-                            <property name="label" translatable="yes" 
context="graphicexport|textcb">Text</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>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" id="textcb-atkobject">

... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to