Tweaks to page deck footer content panel

Change-Id: Iba59edf038d802530d3758915479dbf19a75e8ca
Reviewed-on: https://gerrit.libreoffice.org/28046
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Tested-by: Yousuf Philips <philipz85@hotmail.com>

1 files changed, 33 insertions, 44 deletions

diff --git a/sw/uiconfig/swriter/ui/pagefooterpanel.ui b/sw/uiconfig/swriter/ui/pagefooterpanel.ui
index ccadeb0bd58f..a709475c73f7 100644
--- a/sw/uiconfig/swriter/ui/pagefooterpanel.ui
+++ b/sw/uiconfig/swriter/ui/pagefooterpanel.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkListStore" id="spacinglist">
@@ -77,10 +77,12 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="samecontent">
+              <object class="GtkLabel" id="margins">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Same Content:</property>
+                <property name="halign">end</property>
+                <property name="hexpand">True</property>
+                <property name="label" translatable="yes">Margins:</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -92,95 +94,84 @@
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="margins">
-            <property name="visible">True</property>
+          <object class="GtkLabel" id="customlabel">
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Margins:</property>
+            <property name="label" translatable="yes">Custom</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">3</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="spacing">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="halign">end</property>
             <property name="label" translatable="yes">Spacing:</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
+            <property name="top_attach">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkComboBox" id="spacingpreset">
+          <object class="GtkLabel" id="samecontent">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_markup" translatable="yes">Set the amount of space between the image and surrounding text</property>
-            <property name="tooltip_text" translatable="yes">Set the amount of space between the image and surrounding text</property>
-            <property name="model">spacinglist</property>
+            <property name="halign">end</property>
+            <property name="label" translatable="yes">Same Content:</property>
           </object>
           <packing>
-            <property name="left_attach">1</property>
+            <property name="left_attach">0</property>
             <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkComboBoxText" id="samecontentLB">
+          <object class="GtkComboBox" id="footermarginpreset">
+            <property name="width_request">150</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
-            <items>
-              <item translatable="yes">First &amp; Left/Right</item>
-              <item translatable="yes">Left/Right</item>
-              <item translatable="yes">First Page</item>
-              <item translatable="yes">All Pages</item>
-            </items>
+            <property name="halign">end</property>
+            <property name="model">spacinglist</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
             <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkComboBox" id="footermarginpreset">
+          <object class="GtkComboBox" id="spacingpreset">
+            <property name="width_request">150</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_markup" translatable="yes">Set the amount of space between the image and surrounding text</property>
-            <property name="tooltip_text" translatable="yes">Set the amount of space between the image and surrounding text</property>
+            <property name="halign">end</property>
             <property name="model">spacinglist</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
             <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="customlabel">
+          <object class="GtkComboBoxText" id="samecontentLB">
+            <property name="width_request">150</property>
+            <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Custom</property>
+            <property name="halign">end</property>
+            <items>
+              <item translatable="yes">All Pages</item>
+              <item translatable="yes">First Page</item>
+              <item translatable="yes">Left and Right Pages</item>
+              <item translatable="yes">First, Left and Right Pages</item>
+            </items>
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
+            <property name="top_attach">2</property>
           </packing>
         </child>
         <child>
@@ -190,8 +181,6 @@
       <packing>
         <property name="left_attach">0</property>
         <property name="top_attach">0</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
       </packing>
     </child>
   </object>