consume hectares of empty space on outline and numbering tab page

We now have hectares of empty space in the English ui on the right side because
the other tabs are wider than this one.

What to do with the extra space, leave it on the right, or consume it in some
other way ? I'm inclined to spread things around the available space. If we set
our elements to expand to consume it (but left align the spinbuttons within
their expanded space) then we get a page that looks very like the original.

I'm not entirely sure if I prefer it this way because it's genuinely more
pleasing to the eye, or because it's just familiar looking this way.

Change-Id: Iafe60713eb8c6f0bd1ecd70e3f288d52b453a247

1 files changed, 26 insertions, 0 deletions

diff --git a/sw/uiconfig/swriter/ui/numparapage.ui b/sw/uiconfig/swriter/ui/numparapage.ui
index 6ccd65ac1e06..79f0793e38bf 100644
--- a/sw/uiconfig/swriter/ui/numparapage.ui
+++ b/sw/uiconfig/swriter/ui/numparapage.ui
@@ -16,6 +16,7 @@
   <object class="GtkBox" id="NumParaPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <property name="hexpand">True</property>
     <property name="border_width">6</property>
     <property name="orientation">vertical</property>
     <property name="spacing">12</property>
@@ -23,24 +24,28 @@
       <object class="GtkFrame" id="frameFL_OUTLINE_START">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
         <property name="label_xalign">0</property>
         <property name="shadow_type">none</property>
         <child>
           <object class="GtkAlignment" id="alignment1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
             <property name="top_padding">6</property>
             <property name="left_padding">12</property>
             <child>
               <object class="GtkBox" id="boxOUTLINE">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkLabel" id="labelFT_OUTLINE_LEVEL">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
+                    <property name="hexpand">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Outline level:</property>
                     <property name="use_underline">True</property>
@@ -56,6 +61,7 @@
                   <object class="GtkComboBoxText" id="comboLB_OUTLINE_LEVEL">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
                     <property name="entry_text_column">0</property>
                     <property name="id_column">1</property>
                     <items>
@@ -103,30 +109,35 @@
       <object class="GtkFrame" id="frameFL_NEW_START">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
         <property name="label_xalign">0</property>
         <property name="shadow_type">none</property>
         <child>
           <object class="GtkAlignment" id="alignment2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
             <property name="top_padding">6</property>
             <property name="left_padding">12</property>
             <child>
               <object class="GtkBox" id="box2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkBox" id="boxNUMBER_STYLE">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkLabel" id="labelFT_NUMBER_STYLE">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
+                        <property name="hexpand">True</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">_Numbering style:</property>
                         <property name="use_underline">True</property>
@@ -141,6 +152,7 @@
                       <object class="GtkComboBoxText" id="comboLB_NUMBER_STYLE">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
                         <property name="entry_text_column">0</property>
                         <property name="id_column">1</property>
                         <items>
@@ -166,6 +178,7 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="no_show_all">True</property>
+                    <property name="hexpand">True</property>
                     <property name="relief">none</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
@@ -182,11 +195,13 @@
                   <object class="GtkBox" id="boxNEW_START">
                     <property name="sensitive">False</property>
                     <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkBox" id="box4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="GtkCheckButton" id="checkCB_NUMBER_NEW_START">
@@ -220,6 +235,8 @@
                       <object class="GtkSpinButton" id="spinNF_NEW_START">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="halign">start</property>
+                        <property name="hexpand">True</property>
                         <property name="invisible_char">•</property>
                         <property name="invisible_char_set">True</property>
                         <property name="adjustment">adjustmentSTART_WITH</property>
@@ -262,18 +279,21 @@
       <object class="GtkFrame" id="frameFL_COUNT_PARA">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
         <property name="label_xalign">0</property>
         <property name="shadow_type">none</property>
         <child>
           <object class="GtkAlignment" id="alignment3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
             <property name="top_padding">6</property>
             <property name="left_padding">12</property>
             <child>
               <object class="GtkBox" id="box1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
@@ -282,6 +302,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="hexpand">True</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="inconsistent">True</property>
@@ -299,6 +320,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="hexpand">True</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="inconsistent">True</property>
@@ -315,11 +337,13 @@
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkBox" id="box3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="GtkLabel" id="labelFT_RESTART_NO">
@@ -349,6 +373,8 @@
                       <object class="GtkSpinButton" id="spinNF_RESTART_PARA">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="halign">start</property>
+                        <property name="hexpand">True</property>
                         <property name="invisible_char">•</property>
                         <property name="invisible_char_set">True</property>
                         <property name="adjustment">adjustmentNF_RESTART_PARA</property>