From 22f2d93f1626765b16e390a18a267f9c46dab59c Mon Sep 17 00:00:00 2001
From: andreas kainz <kainz.a@gmail.com>
Date: Wed, 28 Nov 2018 13:22:18 +0100
Subject: NB tabbed compact: update toolbar

Change-Id: I5c2cd3339634cbb88f2c89226ff46d342eebc3a1
Reviewed-on: https://gerrit.libreoffice.org/64160
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
---
 sc/uiconfig/scalc/ui/notebookbar_compact.ui   | 59 +++++++++++++++------------
 sw/uiconfig/swriter/ui/notebookbar_compact.ui | 47 +++++++++++++--------
 2 files changed, 62 insertions(+), 44 deletions(-)

diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
index 97ed18278bf8..e9eab32b947b 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
@@ -1149,6 +1149,13 @@
         <property name="action_name">.uno:DrawText</property>
       </object>
     </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuInsert-VerticalText">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:VerticalText</property>
+      </object>
+    </child>
     <child>
       <object class="GtkMenuItem" id="FontworkGalleryFloaterD">
         <property name="visible">True</property>
@@ -2607,8 +2614,8 @@
             <child type="tab">
               <object class="GtkLabel" id="FileLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label" translatable="yes" context="notebookbar_compact|FileLabel">~File</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes" context="notebookbar_compact|FileLabel">File</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -3843,8 +3850,8 @@
             <child type="tab">
               <object class="GtkLabel" id="HomeLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label" translatable="yes" context="notebookbar_compact|CalcLabel">~Home</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes" context="notebookbar_compact|CalcLabel">Home</property>
                 <property name="use_underline">True</property>
                 <style>
                   <class name="context-default"/>
@@ -4500,8 +4507,8 @@
             <child type="tab">
               <object class="GtkLabel" id="InsertLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label" translatable="yes" context="notebookbar_compact|InsertLabel">~Insert</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes" context="notebookbar_compact|InsertLabel">Insert</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -5032,8 +5039,8 @@
             <child type="tab">
               <object class="GtkLabel" id="LayoutLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label" translatable="yes" context="notebookbar_compact|LayoutLabel">~Layout</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes" context="notebookbar_compact|LayoutLabel">Layout</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -5720,8 +5727,8 @@
             <child type="tab">
               <object class="GtkLabel" id="DataLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label" translatable="yes" context="notebookbar_compact|DataLabel">~Data</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes" context="notebookbar_compact|DataLabel">Data</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -6128,8 +6135,8 @@
             <child type="tab">
               <object class="GtkLabel" id="ReviewLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label" translatable="yes" context="notebookbar_compact|ReviewLabel">~Review</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes" context="notebookbar_compact|ReviewLabel">Review</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -6657,8 +6664,8 @@
             <child type="tab">
               <object class="GtkLabel" id="ViewLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label" translatable="yes" context="notebookbar_compact|ViewLabel">~View</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes" context="notebookbar_compact|ViewLabel">View</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -7352,8 +7359,8 @@
             <child type="tab">
               <object class="GtkLabel" id="ImageLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label" translatable="yes" context="notebookbar_compact|ImageLabel">Ima~ge</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes" context="notebookbar_compact|ImageLabel">Image</property>
                 <property name="use_underline">True</property>
                 <style>
                   <class name="context-Graphic"/>
@@ -8150,8 +8157,8 @@
             <child type="tab">
               <object class="GtkLabel" id="ShapeLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label" translatable="yes" context="notebookbar_compact|ShapeLabel"> ~Draw</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes" context="notebookbar_compact|ShapeLabel">Draw</property>
                 <property name="use_underline">True</property>
                 <style>
                   <class name="context-Draw"/>
@@ -8732,8 +8739,8 @@
             <child type="tab">
               <object class="GtkLabel" id="FrameLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label" translatable="yes" context="notebookbar_compact|FrameLabel">~Object</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes" context="notebookbar_compact|FrameLabel">Object</property>
                 <property name="use_underline">True</property>
                 <style>
                   <class name="context-Frame"/>
@@ -8846,10 +8853,10 @@
                             <property name="toolbar_style">both-horiz</property>
                             <property name="show_arrow">False</property>
                             <child>
-                              <object class="GtkToolButton" id="Tools-MacroRecorder">
+                              <object class="GtkToolButton" id="Tools-RunMacro">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="action_name">.uno:MacroRecorder</property>
+                                <property name="action_name">.uno:RunMacro</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -8857,10 +8864,10 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkToolButton" id="Tools-RunMacro">
+                              <object class="GtkToolButton" id="Tools-BasicIDEAppear">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="action_name">.uno:RunMacro</property>
+                                <property name="action_name">.uno:BasicIDEAppear</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -9637,8 +9644,8 @@
             <child type="tab">
               <object class="GtkLabel" id="DevLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label" translatable="yes" context="notebookbar_compact|DevLabel">~Tools</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes" context="notebookbar_compact|DevLabel">Tools</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
index 9546dc08f381..631bedd28544 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
@@ -1108,6 +1108,13 @@
         <property name="action_name">.uno:DrawText</property>
       </object>
     </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuInsert-VerticalText">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:VerticalText</property>
+      </object>
+    </child>
     <child>
       <object class="GtkMenuItem" id="FontworkGalleryFloaterD">
         <property name="visible">True</property>
@@ -2912,7 +2919,7 @@
               <object class="GtkLabel" id="FileLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="notebookbar_compact|FileLabel">~File</property>
+                <property name="label" translatable="yes" context="notebookbar_compact|FileLabel">File</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -4020,7 +4027,7 @@
               <object class="GtkLabel" id="HomeLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="notebookbar_compact|HomeLabel">~Home</property>
+                <property name="label" translatable="yes" context="notebookbar_compact|HomeLabel">Home</property>
                 <property name="use_underline">True</property>
                 <style>
                   <class name="context-any"/>
@@ -4692,7 +4699,7 @@
               <object class="GtkLabel" id="InsertLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="notebookbar_compact|InsertLabel">~Insert</property>
+                <property name="label" translatable="yes" context="notebookbar_compact|InsertLabel">Insert</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -5463,7 +5470,7 @@
               <object class="GtkLabel" id="LayoutLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="notebookbar_compact|LayoutLabel">~Layout</property>
+                <property name="label" translatable="yes" context="notebookbar_compact|LayoutLabel">Layout</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -5898,7 +5905,7 @@
               <object class="GtkLabel" id="ReferencesLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="notebookbar_compact|ReferencesLabel">Reference~s</property>
+                <property name="label" translatable="yes" context="notebookbar_compact|ReferencesLabel">References</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -6427,7 +6434,7 @@
               <object class="GtkLabel" id="ReviewLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="notebookbar_compact|ReviewLabel">~Review</property>
+                <property name="label" translatable="yes" context="notebookbar_compact|ReviewLabel">Review</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -6948,7 +6955,7 @@
               <object class="GtkLabel" id="ViewLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="notebookbar_compact|ViewLabel">~View</property>
+                <property name="label" translatable="yes" context="notebookbar_compact|ViewLabel">View</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -7728,7 +7735,7 @@
               <object class="GtkLabel" id="TableLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="notebookbar_compact|TableLabel">~Table</property>
+                <property name="label" translatable="yes" context="notebookbar_compact|TableLabel">Table</property>
                 <property name="use_underline">True</property>
                 <style>
                   <class name="context-Table"/>
@@ -8505,7 +8512,7 @@
               <object class="GtkLabel" id="ImageLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="notebookbar_compact|ImageLabel">Ima~ge</property>
+                <property name="label" translatable="yes" context="notebookbar_compact|ImageLabel">Image</property>
                 <property name="use_underline">True</property>
                 <style>
                   <class name="context-Graphic"/>
@@ -9303,7 +9310,8 @@
               <object class="GtkLabel" id="ShapeLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="notebookbar_compact|ShapeLabel">~Draw</property>
+                <property name="label" translatable="yes" context="notebookbar_compact|ShapeLabel">Draw</property>
+                <property name="use_underline">True</property>
                 <style>
                   <class name="context-Draw"/>
                 </style>
@@ -9884,7 +9892,8 @@
               <object class="GtkLabel" id="FrameLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="notebookbar_compact|FrameLabel">~Object</property>
+                <property name="label" translatable="yes" context="notebookbar_compact|FrameLabel">Object</property>
+                <property name="use_underline">True</property>
                 <style>
                   <class name="context-Frame"/>
                   <class name="context-OLE"/>
@@ -10399,7 +10408,8 @@
               <object class="GtkLabel" id="MediaLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="notebookbar_compact|MediaLabel">~Media</property>
+                <property name="label" translatable="yes" context="notebookbar_compact|MediaLabel">Media</property>
+                <property name="use_underline">True</property>
                 <style>
                   <class name="context-Media"/>
                 </style>
@@ -10896,7 +10906,8 @@
               <object class="GtkLabel" id="PrintPreviewLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="notebookbar_compact|PrintPreviewLabel">~Print</property>
+                <property name="label" translatable="yes" context="notebookbar_compact|PrintPreviewLabel">Print</property>
+                <property name="use_underline">True</property>
                 <style>
                   <class name="context-Printpreview"/>
                 </style>
@@ -11007,10 +11018,10 @@
                             <property name="toolbar_style">both-horiz</property>
                             <property name="show_arrow">False</property>
                             <child>
-                              <object class="GtkToolButton" id="Tools-MacroRecorder">
+                              <object class="GtkToolButton" id="Tools-RunMacro">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="action_name">.uno:MacroRecorder</property>
+                                <property name="action_name">.uno:RunMacro</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -11018,10 +11029,10 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkToolButton" id="Tools-RunMacro">
+                              <object class="GtkToolButton" id="Tools-BasicIDEAppear">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="action_name">.uno:RunMacro</property>
+                                <property name="action_name">.uno:BasicIDEAppear</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -11788,7 +11799,7 @@
               <object class="GtkLabel" id="DevLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="notebookbar_compact|DevLabel">~Tools</property>
+                <property name="label" translatable="yes" context="notebookbar_compact|DevLabel">Tools</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
-- 
cgit