Resolves: tdf#130035 reuse toolbar for arrow styles in sidebar

Change-Id: I8fdbf97a2e3f535767f0163a87c99ead8a3198cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87139
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 23 insertions, 83 deletions

diff --git a/svx/uiconfig/ui/sidebarline.ui b/svx/uiconfig/ui/sidebarline.ui
index d18b522417f7..997255fc5e80 100644
--- a/svx/uiconfig/ui/sidebarline.ui
+++ b/svx/uiconfig/ui/sidebarline.ui
@@ -7,18 +7,6 @@
     <property name="step_increment">10</property>
     <property name="page_increment">20</property>
   </object>
-  <object class="GtkListStore" id="liststore4">
-    <columns>
-      <!-- column-name text -->
-      <column type="gchararray"/>
-      <!-- column-name id -->
-      <column type="gchararray"/>
-      <!-- column-name image -->
-      <column type="GdkPixbuf"/>
-      <!-- column-name surface -->
-      <column type="CairoSurface"/>
-    </columns>
-  </object>
   <object class="GtkListStore" id="liststore5">
     <columns>
       <!-- column-name text -->
@@ -31,18 +19,6 @@
       <column type="CairoSurface"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="liststore6">
-    <columns>
-      <!-- column-name text -->
-      <column type="gchararray"/>
-      <!-- column-name id -->
-      <column type="gchararray"/>
-      <!-- column-name image -->
-      <column type="GdkPixbuf"/>
-      <!-- column-name surface -->
-      <column type="CairoSurface"/>
-    </columns>
-  </object>
   <object class="GtkGrid" id="LinePropertyPanel">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -64,48 +40,14 @@
               <object class="GtkBox" id="box1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
                 <property name="spacing">3</property>
                 <child>
-                  <object class="GtkComboBox" id="beginarrowstyle">
-                    <property name="width_request">65</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes" context="sidebarline|beginarrowstyle|tooltip_text">Select the style of the beginning arrowhead.</property>
-                    <property name="hexpand">True</property>
-                    <property name="model">liststore4</property>
-                    <property name="entry_text_column">0</property>
-                    <property name="id_column">1</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext1"/>
-                      <attributes>
-                        <attribute name="text">0</attribute>
-                      </attributes>
-                    </child>
-                    <child>
-                      <object class="GtkCellRendererPixbuf" id="cellrenderertext2"/>
-                      <attributes>
-                        <attribute name="surface">3</attribute>
-                      </attributes>
-                    </child>
-                    <child internal-child="accessible">
-                      <object class="AtkObject" id="beginarrowstyle-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebarline|beginarrowstyle-atkobject">Beginning Style</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
                   <object class="GtkComboBox" id="linestyle">
                     <property name="width_request">105</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes" context="sidebarline|linestyle|tooltip_text">Select the style of the line.</property>
+                    <property name="valign">center</property>
                     <property name="hexpand">True</property>
                     <property name="model">liststore5</property>
                     <property name="entry_text_column">0</property>
@@ -131,41 +73,39 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">2</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkComboBox" id="endarrowstyle">
-                    <property name="width_request">65</property>
+                  <object class="GtkToolbar" id="arrowheads">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="model">liststore6</property>
-                    <property name="tooltip_text" translatable="yes" context="sidebarline|endarrowstyle|tooltip_text">Select the style of the ending arrowhead.</property>
-                    <property name="entry_text_column">0</property>
-                    <property name="hexpand">True</property>
-                    <property name="id_column">1</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext5"/>
-                      <attributes>
-                        <attribute name="text">0</attribute>
-                      </attributes>
-                    </child>
+                    <property name="can_focus">True</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarline|arrowheads|tooltip_text">Select the style of the arrowheads.</property>
+                    <property name="toolbar_style">icons</property>
+                    <property name="show_arrow">False</property>
+                    <property name="icon_size">2</property>
                     <child>
-                      <object class="GtkCellRendererPixbuf" id="cellrenderertext6"/>
-                      <attributes>
-                        <attribute name="surface">3</attribute>
-                      </attributes>
+                      <object class="GtkMenuToolButton" id=".uno:LineEndStyle">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="tooltip_text" translatable="yes" context="sidebarline|arrowheads|tooltip_text">Select the style of the arrowheads.</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="homogeneous">False</property>
+                      </packing>
                     </child>
                     <child internal-child="accessible">
-                      <object class="AtkObject" id="endarrowstyle-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebarline|endarrowstyle-atkobject">Ending Style</property>
+                      <object class="AtkObject" id="arrowheads-atkobject">
+                        <property name="AtkObject::accessible-name" context="sidebarline|arrowheads-atkobject" translatable="yes">Arrow Styles</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">3</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
@@ -306,13 +246,13 @@
             </child>
             <child>
               <object class="GtkBox" id="arrowproperties">
+                <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
-                <property name="visible">True</property>
                 <child>
                   <object class="GtkGrid" id="grid5">
-                    <property name="can_focus">False</property>
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="row_spacing">6</property>
                     <property name="column_spacing">6</property>
                     <property name="column_homogeneous">True</property>