tdf#136099 Sidebar position and size alignment update

Change-Id: I36dfcea69395295fb480422126bbe31497773de8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102017
Tested-by: Jenkins
Reviewed-by: Andreas Kainz <kainz.a@gmail.com>

1 files changed, 141 insertions, 130 deletions

diff --git a/svx/uiconfig/ui/sidebarpossize.ui b/svx/uiconfig/ui/sidebarpossize.ui
index 73ab5a0f2241..a791bbbc11d6 100644
--- a/svx/uiconfig/ui/sidebarpossize.ui
+++ b/svx/uiconfig/ui/sidebarpossize.ui
@@ -31,15 +31,17 @@
   <object class="GtkGrid" id="PosSizePropertyPanel">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <property name="hexpand">True</property>
+    <property name="vexpand">True</property>
     <child>
       <object class="GtkGrid" id="grid3">
         <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="row_spacing">3</property>
         <property name="column_spacing">6</property>
-        <property name="column_homogeneous">True</property>
         <child>
           <object class="GtkLabel" id="horizontallabel">
             <property name="visible">True</property>
@@ -58,6 +60,7 @@
           <object class="GtkSpinButton" id="horizontalpos">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="hexpand">True</property>
             <property name="tooltip_text" translatable="yes" context="sidebarpossize|horizontalpos|tooltip_text">Enter the value for the horizontal position.</property>
             <property name="adjustment">adjustmentPOS</property>
             <property name="digits">2</property>
@@ -68,8 +71,8 @@
             </child>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">0</property>
           </packing>
         </child>
         <child>
@@ -82,14 +85,15 @@
             <property name="xalign">0</property>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkSpinButton" id="verticalpos">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="hexpand">True</property>
             <property name="tooltip_text" translatable="yes" context="sidebarpossize|verticalpos|tooltip_text">Enter the value for the vertical position.</property>
             <property name="adjustment">adjustmentPOS1</property>
             <child internal-child="accessible">
@@ -121,6 +125,7 @@
           <object class="GtkSpinButton" id="selectwidth">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="hexpand">True</property>
             <property name="tooltip_text" translatable="yes" context="sidebarpossize|selectwidth|tooltip_text">Enter a width for the selected object.</property>
             <property name="adjustment">adjustmentSIZE</property>
             <property name="digits">2</property>
@@ -131,8 +136,8 @@
             </child>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">2</property>
           </packing>
         </child>
         <child>
@@ -145,14 +150,15 @@
             <property name="xalign">0</property>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">3</property>
           </packing>
         </child>
         <child>
           <object class="GtkSpinButton" id="selectheight">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="hexpand">True</property>
             <property name="tooltip_text" translatable="yes" context="sidebarpossize|selectheight|tooltip_text">Enter a height for the selected object.</property>
             <property name="adjustment">adjustmentSIZE1</property>
             <property name="digits">2</property>
@@ -168,6 +174,17 @@
           </packing>
         </child>
         <child>
+            <object class="GtkLabel" id="transparancylabel">
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes" context="sidebarpossize|transparancylabel">Transparancy:</property>
+                <property name="xalign">0</property>
+            </object>
+            <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">4</property>
+            </packing>
+        </child>
+        <child>
           <object class="GtkCheckButton" id="ratio">
             <property name="label" translatable="yes" context="sidebarpossize|ratio">_Keep ratio</property>
             <property name="visible">True</property>
@@ -179,17 +196,11 @@
             <property name="draw_indicator">True</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
+            <property name="left_attach">1</property>
             <property name="top_attach">4</property>
-            <property name="width">2</property>
           </packing>
         </child>
         <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <child>
               <object class="GtkLabel" id="arrangelabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -198,12 +209,18 @@
                 <property name="mnemonic_widget">arrangetoolbar</property>
                 <property name="xalign">0</property>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">7</property>
+          </packing>
             </child>
+        <child>
+          <object class="GtkBox" id="arrangetools">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="orientation">horizontal</property>
+            <property name="spacing">3</property>
             <child>
               <object class="GtkToolbar" id="arrangetoolbar">
                 <property name="visible">True</property>
@@ -297,21 +314,15 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">2</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="left_attach">0</property>
+            <property name="left_attach">1</property>
             <property name="top_attach">7</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkGrid">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="row_spacing">3</property>
-            <property name="column_spacing">3</property>
             <child>
               <object class="GtkLabel" id="fliplabel">
                 <property name="visible">True</property>
@@ -323,55 +334,40 @@
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
+                <property name="top_attach">6</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkToolbar" id="selectrotationtype">
+        <child>
+              <object class="GtkLabel" id="rotationlabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="valign">start</property>
-                <property name="hexpand">True</property>
-                <property name="toolbar_style">icons</property>
-                <property name="show_arrow">False</property>
-                <property name="icon_size">2</property>
-                <child>
-                  <object class="GtkToolButton" id=".uno:FlipVertical">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes" context="sidebarpossize|flipvertical|tooltip_text">Flip the selected object vertically.</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id=".uno:FlipHorizontal">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes" context="sidebarpossize|fliphorizontal|tooltip_text">Flip the selected object horizontally.</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">False</property>
-                  </packing>
-                </child>
+                <property name="label" translatable="yes" context="sidebarpossize|rotationlabel">_Rotation:</property>
+                <property name="use_underline">True</property>
+                <property name="xalign">0</property>
+                <accessibility>
+                  <relation type="label-for" target="orientationcontrol"/>
+                  <relation type="label-for" target="rotation"/>
+                </accessibility>
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
+                <property name="top_attach">5</property>
               </packing>
             </child>
+        <child>
+          <object class="GtkGrid">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="row_spacing">3</property>
+            <property name="column_spacing">6</property>
             <child>
               <object class="GtkDrawingArea" id="orientationcontrol">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
                 <property name="tooltip_text" translatable="yes" context="rotationtabpage|CTL_ANGLE|tooltip_text">Rotation Angle</property>
-                <property name="halign">end</property>
+                <property name="halign">center</property>
                 <property name="valign">center</property>
                 <accessibility>
                   <relation type="labelled-by" target="rotationlabel"/>
@@ -383,108 +379,101 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">1</property>
+                <property name="left_attach">0</property>
                 <property name="top_attach">0</property>
                 <property name="height">2</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">6</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkGrid">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="row_spacing">3</property>
-            <property name="column_spacing">3</property>
             <child>
-              <object class="GtkLabel" id="rotationlabel">
+              <object class="GtkSpinButton" id="rotation">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="sidebarpossize|rotationlabel">_Rotation:</property>
-                <property name="use_underline">True</property>
-                <property name="xalign">0</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="tooltip_text" translatable="yes" context="sidebarpossize|rotation|tooltip_text">Select the angle for rotation.</property>
+                <property name="hexpand">True</property>
+                <property name="adjustment">adjustmentSpinDegrees</property>
+                <property name="wrap">True</property>
                 <accessibility>
-                  <relation type="label-for" target="orientationcontrol"/>
-                  <relation type="label-for" target="rotation"/>
+                  <relation type="labelled-by" target="rotationlabel"/>
                 </accessibility>
               </object>
               <packing>
-                <property name="left_attach">0</property>
+                <property name="left_attach">1</property>
                 <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkSpinButton" id="rotation">
+              <object class="GtkToolbar" id="selectrotationtype">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes" context="sidebarpossize|rotation|tooltip_text">Select the angle for rotation.</property>
-                <property name="valign">end</property>
+                <property name="can_focus">False</property>
+                <property name="valign">start</property>
                 <property name="hexpand">True</property>
-                <property name="adjustment">adjustmentSpinDegrees</property>
-                <property name="wrap">True</property>
-                <accessibility>
-                  <relation type="labelled-by" target="rotationlabel"/>
-                </accessibility>
+                <property name="toolbar_style">icons</property>
+                <property name="show_arrow">False</property>
+                <property name="icon_size">2</property>
+                <child>
+                  <object class="GtkToolButton" id=".uno:FlipVertical">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarpossize|flipvertical|tooltip_text">Flip the selected object vertically.</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToolButton" id=".uno:FlipHorizontal">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarpossize|fliphorizontal|tooltip_text">Flip the selected object horizontally.</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">False</property>
+                  </packing>
+                </child>
               </object>
               <packing>
-                <property name="left_attach">0</property>
+                <property name="left_attach">1</property>
                 <property name="top_attach">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="top_attach">6</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkSeparator">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_left">3</property>
-            <property name="margin_right">3</property>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
             <property name="top_attach">5</property>
-            <property name="width">2</property>
+            <property name="height">2</property>
           </packing>
         </child>
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="valign">end</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkButton" id="btnEditChart">
                 <property name="label" translatable="yes" context="sidebarpossize|btnEditChart">Edit Chart</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="valign">top</property>
                 <property name="receives_default">True</property>
               </object>
               <packing>
-                <property name="expand">False</property>
+                <property name="expand">True</property>
                 <property name="fill">True</property>
-                <property name="position">2</property>
+                <property name="position">0</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="top_attach">8</property>
+            <property name="top_attach">9</property>
           </packing>
         </child>
         <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <child>
               <object class="GtkLabel" id="alignlabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -493,12 +482,18 @@
                 <property name="mnemonic_widget">aligntoolbar</property>
                 <property name="xalign">0</property>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">8</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="aligntools">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="orientation">horizontal</property>
+            <property name="spacing">3</property>
             <child>
               <object class="GtkToolbar" id="aligntoolbar">
                 <property name="visible">True</property>
@@ -544,7 +539,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -592,23 +587,39 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">2</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="top_attach">7</property>
+            <property name="top_attach">8</property>
           </packing>
         </child>
         <child>
           <placeholder/>
         </child>
       </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
-      </packing>
-    </child>
+  </child>
+</object>
+  <object class="GtkSizeGroup" id="SizeGroupLabel">
+    <widgets>
+      <widget name="horizontallabel"/>
+      <widget name="verticallabel"/>
+      <widget name="widthlabel"/>
+      <widget name="heightlabel"/>
+      <widget name="transparancylabel"/>
+      <widget name="rotationlabel"/>
+      <widget name="fliplabel"/>
+      <widget name="arrangelabel"/>
+      <widget name="alignlabel"/>
+    </widgets>
+  </object>
+  <object class="GtkSizeGroup" id="SizeGroupLabel1">
+    <widgets>
+      <widget name="selectwidth"/>
+      <widget name="arrangetools"/>
+      <widget name="aligntools"/>
+    </widgets>
   </object>
 </interface>