Hiding the line style label in sidebar

Fixes the cropped controls.

Change-Id: I08d59ccd40e745148f9f6a4d5f61e507697b3ce8
Reviewed-on: https://gerrit.libreoffice.org/16436
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Tested-by: Yousuf Philips <philipz85@hotmail.com>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

1 files changed, 72 insertions, 59 deletions

diff --git a/svx/uiconfig/ui/sidebarline.ui b/svx/uiconfig/ui/sidebarline.ui
index 630919837a9e..e8506dbe2e68 100644
--- a/svx/uiconfig/ui/sidebarline.ui
+++ b/svx/uiconfig/ui/sidebarline.ui
@@ -25,72 +25,78 @@
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
-              <object class="GtkGrid" id="grid4">
+              <object class="GtkBox" id="box1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="row_spacing">6</property>
-                <property name="column_spacing">6</property>
                 <child>
-                  <object class="GtkLabel" id="translabel">
-                    <property name="visible">True</property>
+                  <object class="GtkLabel" id="stylelabel">
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Transparency:</property>
+                    <property name="label" translatable="yes">_Style:</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkSpinButton" id="linetransparency:0%">
+                  <object class="GtkComboBoxText" id="linestyle">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Specify the transparency of the line.</property>
-                    <property name="tooltip_text" translatable="yes">Specify the transparency of the line.</property>
+                    <property name="tooltip_markup" translatable="yes">Select the style of the line.</property>
+                    <property name="tooltip_text" translatable="yes">Select the style of the line.</property>
                     <property name="hexpand">True</property>
-                    <property name="invisible_char">•</property>
-                    <property name="adjustment">adjustment1</property>
-                    <property name="climb_rate">5</property>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">3</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkGrid" id="grid4">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">6</property>
                 <child>
-                  <object class="GtkLabel" id="colorlabel">
+                  <object class="GtkLabel" id="widthlabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Color:</property>
+                    <property name="label" translatable="yes">_Width:</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="sfxlo-SidebarToolBox" id="color">
+                  <object class="GtkToolbar" id="width">
+                    <property name="width_request">120</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Select the color of the line.</property>
-                    <property name="tooltip_text" translatable="yes">Select the color of the line.</property>
+                    <property name="tooltip_markup" translatable="yes">Select the width of the line.</property>
+                    <property name="tooltip_text" translatable="yes">Select the width of the line.</property>
                     <child>
-                      <object class="GtkMenuToolButton" id="setcolor">
+                      <object class="GtkMenuToolButton" id="setwidth">
                         <property name="width_request">105</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_markup" translatable="yes">Select the color of the line.</property>
-                        <property name="tooltip_text" translatable="yes">Select the color of the line.</property>
-                        <property name="margin_left">20</property>
-                        <property name="action_name">.uno:XLineColor</property>
+                        <property name="action_name">.uno:SelectWidth</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -101,23 +107,39 @@
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
-                    <property name="top_attach">2</property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkToolbar" id="width">
-                    <property name="width_request">120</property>
+                  <object class="GtkLabel" id="colorlabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">_Color:</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="sfxlo-SidebarToolBox" id="color">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Select the width of the line.</property>
-                    <property name="tooltip_text" translatable="yes">Select the width of the line.</property>
+                    <property name="tooltip_markup" translatable="yes">Select the color of the line.</property>
+                    <property name="tooltip_text" translatable="yes">Select the color of the line.</property>
                     <child>
-                      <object class="GtkMenuToolButton" id="setwidth">
+                      <object class="GtkMenuToolButton" id="setcolor">
                         <property name="width_request">105</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="action_name">.uno:SelectWidth</property>
+                        <property name="has_tooltip">True</property>
+                        <property name="tooltip_markup" translatable="yes">Select the color of the line.</property>
+                        <property name="tooltip_text" translatable="yes">Select the color of the line.</property>
+                        <property name="margin_left">20</property>
+                        <property name="action_name">.uno:XLineColor</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -132,49 +154,40 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="widthlabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Width:</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="stylelabel">
+                  <object class="GtkLabel" id="translabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Style:</property>
+                    <property name="label" translatable="yes">_Transparency:</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <property name="top_attach">2</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkComboBoxText" id="linestyle">
+                  <object class="GtkSpinButton" id="linetransparency:0%">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Select the style of the line.</property>
-                    <property name="tooltip_text" translatable="yes">Select the style of the line.</property>
+                    <property name="tooltip_markup" translatable="yes">Specify the transparency of the line.</property>
+                    <property name="tooltip_text" translatable="yes">Specify the transparency of the line.</property>
+                    <property name="hexpand">True</property>
+                    <property name="invisible_char">•</property>
+                    <property name="adjustment">adjustment1</property>
+                    <property name="climb_rate">5</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
+                    <property name="top_attach">2</property>
                   </packing>
                 </child>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child>