align load/save buttons across dialogs

and restore strange custom unit multi unit mode
to these metricfields

Change-Id: I7e228f6fd658374e3f1588c757ef2ed1e6ba78c8

2 files changed, 82 insertions, 50 deletions

diff --git a/cui/uiconfig/ui/lineendstabpage.ui b/cui/uiconfig/ui/lineendstabpage.ui
index dc3fb73a671d..bfee0a84e525 100644
--- a/cui/uiconfig/ui/lineendstabpage.ui
+++ b/cui/uiconfig/ui/lineendstabpage.ui
@@ -37,8 +37,8 @@
                   <object class="GtkGrid" id="grid1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="valign">start</property>
                     <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
                     <property name="row_spacing">6</property>
                     <property name="column_spacing">12</property>
                     <child>
@@ -101,6 +101,22 @@
                         <property name="height">1</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkLabel" id="FI_TIP">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="valign">end</property>
+                        <property name="vexpand">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Add a selected object to create new arrow styles.</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">2</property>
+                        <property name="width">2</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -233,19 +249,6 @@
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
-                  <object class="GtkLabel" id="FI_TIP">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Add a selected object to create new arrow styles.</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
                   <object class="svxlo-SvxXLinePreview" id="CTL_PREVIEW">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -253,7 +256,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
               </object>
diff --git a/cui/uiconfig/ui/linestyletabpage.ui b/cui/uiconfig/ui/linestyletabpage.ui
index 12a2a8e95a58..d8d1c3b59c0f 100644
--- a/cui/uiconfig/ui/linestyletabpage.ui
+++ b/cui/uiconfig/ui/linestyletabpage.ui
@@ -3,9 +3,9 @@
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkAdjustment" id="adjustmentDIST">
-    <property name="upper">5000</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="upper">5</property>
+    <property name="step_increment">0.10000000000000001</property>
+    <property name="page_increment">1</property>
   </object>
   <object class="GtkAdjustment" id="adjustmentNUM">
     <property name="upper">99</property>
@@ -43,6 +43,8 @@
   <object class="GtkFrame" id="LineStylePage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <property name="hexpand">True</property>
+    <property name="vexpand">True</property>
     <property name="border_width">6</property>
     <property name="label_xalign">0</property>
     <property name="shadow_type">none</property>
@@ -50,23 +52,31 @@
       <object class="GtkAlignment" id="alignment1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">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="vexpand">True</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</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="vexpand">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="halign">start</property>
+                    <property name="hexpand">True</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
@@ -151,7 +161,7 @@
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Length:</property>
                             <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">MTR_FLD_LENGTH_1:0cm</property>
+                            <property name="mnemonic_widget">MTR_FLD_LENGTH_1:0.00cm</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -167,7 +177,7 @@
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Spacing:</property>
                             <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">MTR_FLD_DISTANCE:0cm</property>
+                            <property name="mnemonic_widget">MTR_FLD_DISTANCE:0.00cm</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -248,7 +258,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSpinButton" id="MTR_FLD_LENGTH_1:0cm">
+                          <object class="GtkSpinButton" id="MTR_FLD_LENGTH_1:0.00cm">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="invisible_char">•</property>
@@ -263,7 +273,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSpinButton" id="MTR_FLD_LENGTH_2:0cm">
+                          <object class="GtkSpinButton" id="MTR_FLD_LENGTH_2:0.00cm">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="invisible_char">•</property>
@@ -278,7 +288,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSpinButton" id="MTR_FLD_DISTANCE:0cm">
+                          <object class="GtkSpinButton" id="MTR_FLD_DISTANCE:0.00cm">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="invisible_char">•</property>
@@ -319,6 +329,8 @@
                   <object class="GtkButtonBox" id="buttonbox1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="halign">end</property>
+                    <property name="vexpand">True</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <property name="layout_style">start</property>
@@ -366,39 +378,55 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkButton" id="BTN_LOAD">
+                      <object class="GtkGrid" id="grid2">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_markup" translatable="yes">Load Line Styles</property>
-                        <property name="tooltip_text" translatable="yes">Load Line Styles</property>
-                        <property name="halign">start</property>
-                        <property name="hexpand">True</property>
-                        <property name="image">image1</property>
+                        <property name="can_focus">False</property>
+                        <property name="row_spacing">6</property>
+                        <property name="column_spacing">6</property>
+                        <child>
+                          <object class="GtkButton" id="BTN_LOAD">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="has_tooltip">True</property>
+                            <property name="tooltip_markup" translatable="yes">Load Line Styles</property>
+                            <property name="tooltip_text" translatable="yes">Load Line Styles</property>
+                            <property name="halign">center</property>
+                            <property name="hexpand">True</property>
+                            <property name="image">image1</property>
+                          </object>
+                          <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="GtkButton" id="BTN_SAVE">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="has_tooltip">True</property>
+                            <property name="tooltip_markup" translatable="yes">Save Line Styles</property>
+                            <property name="tooltip_text" translatable="yes">Save Line Styles</property>
+                            <property name="halign">center</property>
+                            <property name="hexpand">True</property>
+                            <property name="image">image2</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>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
                         <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="BTN_SAVE">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_markup" translatable="yes">Save Line Styles</property>
-                        <property name="tooltip_text" translatable="yes">Save Line Styles</property>
-                        <property name="halign">start</property>
-                        <property name="hexpand">True</property>
-                        <property name="image">image2</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
+                        <property name="secondary">True</property>
                       </packing>
                     </child>
                   </object>
@@ -419,6 +447,7 @@
               <object class="svxlo-SvxXLinePreview" id="CTL_PREVIEW">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="valign">end</property>
               </object>
               <packing>
                 <property name="expand">False</property>