From d04f044f05b4d13c3c6ea3f33fddd9c05a0ab3ad Mon Sep 17 00:00:00 2001
From: andreas kainz <kainz.a@gmail.com>
Date: Fri, 18 Oct 2019 14:06:26 +0200
Subject: tdf#127927 Character dialog update position tab

Change-Id: I336f7457ad92d505755abe8dca8bbc1ca813ce4c
Reviewed-on: https://gerrit.libreoffice.org/81040
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
---
 cui/uiconfig/ui/positionpage.ui | 98 +++++++++++++++++++++++++++++------------
 1 file changed, 69 insertions(+), 29 deletions(-)

diff --git a/cui/uiconfig/ui/positionpage.ui b/cui/uiconfig/ui/positionpage.ui
index 8329705586e8..cecdea979fa1 100644
--- a/cui/uiconfig/ui/positionpage.ui
+++ b/cui/uiconfig/ui/positionpage.ui
@@ -19,7 +19,7 @@
   <object class="GtkAdjustment" id="adjustment3">
     <property name="lower">-2</property>
     <property name="upper">1000</property>
-    <property name="step_increment">0.10000000000000001</property>
+    <property name="step_increment">0.1</property>
     <property name="page_increment">1</property>
   </object>
   <object class="GtkAdjustment" id="adjustment4">
@@ -52,23 +52,25 @@
               <object class="GtkBox" id="box2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</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="margin_bottom">4</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <property name="homogeneous">True</property>
                     <child>
-                      <object class="GtkRadioButton" id="superscript">
-                        <property name="label" translatable="yes" context="positionpage|superscript">Superscript</property>
+                      <object class="GtkRadioButton" id="normal">
+                        <property name="label" translatable="yes" context="positionpage|normal">Normal</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>
-                        <property name="group">normal</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -77,15 +79,15 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="normal">
-                        <property name="label" translatable="yes" context="positionpage|normal">Normal</property>
+                      <object class="GtkRadioButton" id="superscript">
+                        <property name="label" translatable="yes" context="positionpage|superscript">Superscript</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>
+                        <property name="group">normal</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -121,7 +123,7 @@
                   <object class="GtkGrid" id="grid4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">48</property>
+                    <property name="valign">end</property>
                     <property name="row_spacing">6</property>
                     <property name="column_spacing">12</property>
                     <child>
@@ -236,13 +238,13 @@
               <object class="GtkBox" id="box5">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
-                <property name="spacing">6</property>
+                <property name="spacing">12</property>
                 <child>
                   <object class="GtkBox" id="rotationcontainer">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="spacing">12</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="0deg">
                         <property name="label" translatable="yes" context="positionpage|0deg">0 degrees</property>
@@ -293,22 +295,6 @@
                         <property name="position">2</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkCheckButton" id="fittoline">
-                        <property name="label" translatable="yes" context="positionpage|fittoline">Fit to line</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>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -320,6 +306,7 @@
                   <object class="GtkBox" id="box7">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="valign">center</property>
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkLabel" id="label24">
@@ -328,6 +315,7 @@
                         <property name="label" translatable="yes" context="positionpage|label24">Scale width</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">scalewidthsb</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -347,6 +335,22 @@
                         <property name="position">1</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkCheckButton" id="fittoline">
+                        <property name="label" translatable="yes" context="positionpage|fittoline">Fit to line</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>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -434,6 +438,20 @@
                     <property name="position">0</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkBox" id="box6">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
                 <child>
                   <object class="GtkSpinButton" id="kerningsb">
                     <property name="visible">True</property>
@@ -444,7 +462,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
                 <child>
@@ -460,7 +478,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">2</property>
+                    <property name="position">3</property>
                   </packing>
                 </child>
               </object>
@@ -529,4 +547,26 @@
       </packing>
     </child>
   </object>
+  <object class="GtkSizeGroup" id="sizegroup1">
+    <widgets>
+      <widget name="box3"/>
+      <widget name="rotationcontainer"/>
+    </widgets>
+  </object>
+  <object class="GtkSizeGroup" id="sizegroup2">
+    <widgets>
+      <widget name="raiselower"/>
+      <widget name="relativefontsize"/>
+      <widget name="label24"/>
+      <widget name="box6"/>
+    </widgets>
+  </object>
+  <object class="GtkSizeGroup" id="sizegroup3">
+    <widgets>
+      <widget name="raiselowersb"/>
+      <widget name="fontsizesb"/>
+      <widget name="scalewidthsb"/>
+      <widget name="kerningsb"/>
+    </widgets>
+  </object>
 </interface>
-- 
cgit