chart sidebar chart type alignment update

Change-Id: I22a72ec8354ea3832ab27f362b1487894283305e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88749
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>

1 files changed, 20 insertions, 32 deletions

diff --git a/chart2/uiconfig/ui/sidebartype.ui b/chart2/uiconfig/ui/sidebartype.ui
index d8b82bae4fb3..d6d9dbaa0cc0 100644
--- a/chart2/uiconfig/ui/sidebartype.ui
+++ b/chart2/uiconfig/ui/sidebartype.ui
@@ -29,18 +29,14 @@
   <object class="GtkGrid" id="ChartTypePanel">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="margin_left">6</property>
-    <property name="margin_right">6</property>
-    <property name="margin_top">6</property>
-    <property name="margin_bottom">6</property>
-    <property name="row_spacing">6</property>
-    <property name="column_spacing">6</property>
+    <property name="border_width">6</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
-        <property name="row_spacing">6</property>
+        <property name="row_spacing">3</property>
+        <property name="column_spacing">6</property>
         <child>
           <object class="GtkScrolledWindow" id="subtypewin">
             <property name="visible">True</property>
@@ -73,12 +69,13 @@
           <object class="GtkGrid" id="3dblock">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="row_spacing">6</property>
+            <property name="row_spacing">3</property>
             <child>
               <object class="GtkGrid" id="grid9">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="column_spacing">12</property>
+                <property name="hexpand">True</property>
+                <property name="column_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="3dlook">
                     <property name="label" translatable="yes" context="sidebartype|3dlook">_3D Look</property>
@@ -99,6 +96,7 @@
                 <child>
                   <object class="GtkComboBoxText" id="3dscheme">
                     <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
                     <items>
                       <item translatable="yes" context="sidebartype|3dscheme">Simple</item>
                       <item translatable="yes" context="sidebartype|3dscheme">Realistic</item>
@@ -180,7 +178,7 @@
           <object class="GtkGrid" id="stackblock">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="row_spacing">6</property>
+            <property name="row_spacing">3</property>
             <child>
               <object class="GtkCheckButton" id="stack">
                 <property name="label" translatable="yes" context="sidebartype|stack">_Stack series</property>
@@ -204,7 +202,7 @@
                   <object class="GtkGrid" id="grid6">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="row_spacing">6</property>
+                    <property name="row_spacing">3</property>
                     <child>
                       <object class="GtkRadioButton" id="ontop">
                         <property name="label" translatable="yes" context="sidebartype|ontop">On top</property>
@@ -262,7 +260,8 @@
               <object class="GtkGrid" id="grid7">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="column_spacing">12</property>
+                <property name="hexpand">True</property>
+                <property name="column_spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="linetypeft">
                     <property name="can_focus">False</property>
@@ -279,6 +278,7 @@
                 <child>
                   <object class="GtkComboBoxText" id="linetype">
                     <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
                     <items>
                       <item translatable="yes" context="sidebartype|linetype">Straight</item>
                       <item translatable="yes" context="sidebartype|linetype">Smooth</item>
@@ -326,7 +326,8 @@
               <object class="GtkGrid" id="grid8">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="column_spacing">12</property>
+                <property name="hexpand">True</property>
+                <property name="column_spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="nolinesft">
                     <property name="can_focus">False</property>
@@ -346,6 +347,7 @@
                   <object class="GtkSpinButton" id="nolines">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="hexpand">True</property>
                     <property name="activates_default">True</property>
                     <property name="adjustment">adjustment1</property>
                   </object>
@@ -370,25 +372,13 @@
           <object class="GtkGrid" id="charttypeblock">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="row_spacing">6</property>
+            <property name="row_spacing">3</property>
             <property name="column_spacing">6</property>
             <child>
-              <object class="GtkLabel" id="lbl_chartType">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="sidebartype|lbl_chartType">Chart Type:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">cmb_chartType</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-            <child>
               <object class="GtkComboBox" id="cmb_chartType">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="valign">center</property>
                 <property name="hexpand">True</property>
                 <property name="model">liststore2</property>
                 <property name="entry_text_column">0</property>
@@ -407,8 +397,9 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">1</property>
+                <property name="left_attach">0</property>
                 <property name="top_attach">0</property>
+                <property name="width">2</property>
               </packing>
             </child>
           </object>
@@ -420,11 +411,8 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">1</property>
+        <property name="top_attach">0</property>
       </packing>
     </child>
-    <child>
-      <placeholder/>
-    </child>
   </object>
 </interface>