tdf#148539 sc notebookbar: add Sparklines to MenuData

Sparklines do not have an icon yet,
so I didn't attempt to add any (visible) entries
to the notebookbar itself.

Change-Id: I144ff76306aef0ec184794878a449e0cefd09280
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157978
Tested-by: Justin Luth <jluth@mail.com>
Reviewed-by: Justin Luth <jluth@mail.com>

9 files changed, 99 insertions, 31 deletions

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 637a1ac2eca6..d6ea2fe8947b 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/scalc,\
 	sc/uiconfig/scalc/popupmenu/row_operations \
 	sc/uiconfig/scalc/popupmenu/sheettab \
 	sc/uiconfig/scalc/popupmenu/sparkline \
+	sc/uiconfig/scalc/popupmenu/sparklinemenu \
 ))
 
 $(eval $(call gb_UIConfig_add_statusbarfiles,modules/scalc,\
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index cbb352c7ac6a..bfcac17c9602 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -433,15 +433,7 @@
           <menu:menuitem menu:id=".uno:ExportAsGraphic"/>
         </menu:menupopup>
       </menu:menu>
-      <menu:menu menu:id=".uno:FormatSparklineMenu">
-        <menu:menupopup>
-          <menu:menuitem menu:id=".uno:EditSparklineGroup"/>
-          <menu:menuitem menu:id=".uno:DeleteSparkline"/>
-          <menu:menuitem menu:id=".uno:DeleteSparklineGroup"/>
-          <menu:menuitem menu:id=".uno:GroupSparklines"/>
-          <menu:menuitem menu:id=".uno:UngroupSparklines"/>
-        </menu:menupopup>
-      </menu:menu>
+      <menu:menu menu:id=".uno:FormatSparklineMenu"/>
       <menu:menu menu:id=".uno:FormatObjectMenu">
         <menu:menupopup>
           <menu:menuitem menu:id=".uno:TransformDialog"/>
diff --git a/sc/uiconfig/scalc/popupmenu/cell.xml b/sc/uiconfig/scalc/popupmenu/cell.xml
index fb7f4ff9ecd8..163c54b09bc6 100644
--- a/sc/uiconfig/scalc/popupmenu/cell.xml
+++ b/sc/uiconfig/scalc/popupmenu/cell.xml
@@ -63,17 +63,7 @@
   <menu:menuitem menu:id=".uno:ShowNote"/>
   <menu:menuitem menu:id=".uno:HideNote"/>
   <menu:menuseparator/>
-  <menu:menu menu:id=".uno:FormatSparklineMenu">
-    <menu:menupopup>
-      <menu:menuitem menu:id=".uno:InsertSparkline"/>
-      <menu:menuitem menu:id=".uno:DeleteSparkline"/>
-      <menu:menuitem menu:id=".uno:DeleteSparklineGroup"/>
-      <menu:menuitem menu:id=".uno:EditSparklineGroup"/>
-      <menu:menuitem menu:id=".uno:EditSparkline"/>
-      <menu:menuitem menu:id=".uno:GroupSparklines"/>
-      <menu:menuitem menu:id=".uno:UngroupSparklines"/>
-    </menu:menupopup>
-  </menu:menu>
+  <menu:menu menu:id=".uno:FormatSparklineMenu"/>
   <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:CurrentConditionalFormatDialog"/>
   <menu:menuitem menu:id=".uno:CurrentConditionalFormatManagerDialog"/>
diff --git a/sc/uiconfig/scalc/popupmenu/sparkline.xml b/sc/uiconfig/scalc/popupmenu/sparkline.xml
index fb7f4ff9ecd8..163c54b09bc6 100644
--- a/sc/uiconfig/scalc/popupmenu/sparkline.xml
+++ b/sc/uiconfig/scalc/popupmenu/sparkline.xml
@@ -63,17 +63,7 @@
   <menu:menuitem menu:id=".uno:ShowNote"/>
   <menu:menuitem menu:id=".uno:HideNote"/>
   <menu:menuseparator/>
-  <menu:menu menu:id=".uno:FormatSparklineMenu">
-    <menu:menupopup>
-      <menu:menuitem menu:id=".uno:InsertSparkline"/>
-      <menu:menuitem menu:id=".uno:DeleteSparkline"/>
-      <menu:menuitem menu:id=".uno:DeleteSparklineGroup"/>
-      <menu:menuitem menu:id=".uno:EditSparklineGroup"/>
-      <menu:menuitem menu:id=".uno:EditSparkline"/>
-      <menu:menuitem menu:id=".uno:GroupSparklines"/>
-      <menu:menuitem menu:id=".uno:UngroupSparklines"/>
-    </menu:menupopup>
-  </menu:menu>
+  <menu:menu menu:id=".uno:FormatSparklineMenu"/>
   <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:CurrentConditionalFormatDialog"/>
   <menu:menuitem menu:id=".uno:CurrentConditionalFormatManagerDialog"/>
diff --git a/sc/uiconfig/scalc/popupmenu/sparklinemenu.xml b/sc/uiconfig/scalc/popupmenu/sparklinemenu.xml
new file mode 100644
index 000000000000..1abc1da66e94
--- /dev/null
+++ b/sc/uiconfig/scalc/popupmenu/sparklinemenu.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:InsertSparkline"/>
+  <menu:menuitem menu:id=".uno:DeleteSparkline"/>
+  <menu:menuitem menu:id=".uno:DeleteSparklineGroup"/>
+  <menu:menuitem menu:id=".uno:EditSparklineGroup"/>
+  <menu:menuitem menu:id=".uno:EditSparkline"/>
+  <menu:menuitem menu:id=".uno:GroupSparklines"/>
+  <menu:menuitem menu:id=".uno:UngroupSparklines"/>
+</menu:menupopup>
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index 9fa7632cd732..5094f94198b4 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -153,6 +153,19 @@
       </object>
     </child>
     <child>
+      <object class="GtkMenuItem" id="MenuData-FormatSparklineMenu">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:FormatSparklineMenu</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuData-separator4b">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="MenuData-Calculate">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
index 0bc0f5c5d364..1328f59d7463 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
@@ -153,6 +153,19 @@
       </object>
     </child>
     <child>
+      <object class="GtkMenuItem" id="MenuData-FormatSparklineMenu">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:FormatSparklineMenu</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuData-separator4b">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="CalculateD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -4714,6 +4727,31 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom38b">
+                            <property name="visible">False</property> <!-- no icon yet -->
+                            <property name="can_focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar_style">icons</property>
+                            <property name="show_arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="Insert-Sparkline">
+                                <property name="visible">True</property>
+                                <property name="action_name">.uno:InsertSparkline</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </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>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
index 9cee8585cfa9..0587bab1025c 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
@@ -2836,6 +2836,19 @@
       </object>
     </child>
     <child>
+      <object class="GtkMenuItem" id="MenuData-FormatSparklineMenu">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:FormatSparklineMenu</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuData-separator4b">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="MenuData-Calculate">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
index 979a38230dca..df313f917d57 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
@@ -522,6 +522,19 @@
       </object>
     </child>
     <child>
+      <object class="GtkMenuItem" id="MenuData-FormatSparklineMenu">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:FormatSparklineMenu</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuData-separator4b">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="MenuData-Calculate">
         <property name="visible">True</property>
         <property name="can_focus">False</property>