Notebookbar: sync tabbedbar

Change-Id: I6441f66f7cd078dae0c81cb1a5c62b5130187536
Reviewed-on: https://gerrit.libreoffice.org/61858
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>

1 files changed, 19 insertions, 26 deletions

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index a1c5cecedee6..ca39249bc22f 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="sc">
   <requires lib="gtk+" version="3.18"/>
   <requires lib="LibreOffice" version="1.0"/>
@@ -2001,13 +2001,13 @@
                             <property name="label" translatable="yes" context="CalcNotebookbar|FileMenuButton">_File</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
                             <property name="resize_mode">immediate</property>
                             <property name="relief">none</property>
                             <property name="use_underline">True</property>
-                            <property name="focus_on_click">False</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -2020,13 +2020,13 @@
                             <property name="label" translatable="yes" context="CalcNotebookbar|HelpMenuButton">_Help</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
                             <property name="resize_mode">immediate</property>
                             <property name="relief">none</property>
                             <property name="use_underline">True</property>
-                            <property name="focus_on_click">False</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -2217,11 +2217,11 @@
                               <object class="svtlo-ManagedMenuButton" id="File-RecentFileList">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">False</property>
                                 <property name="action_name">.uno:RecentFileList</property>
                                 <property name="image">RecentFilesImg</property>
                                 <property name="use_underline">True</property>
-                                <property name="focus_on_click">False</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -4453,12 +4453,12 @@
                             <property name="label" translatable="yes" context="CalcNotebookbar|HomeMenuButton">_Home</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
                             <property name="relief">none</property>
                             <property name="use_underline">True</property>
-                            <property name="focus_on_click">False</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -4564,6 +4564,7 @@
                   <class name="context-default"/>
                   <class name="context-any"/>
                   <class name="context-Text"/>
+                  <class name="context-DrawText"/>
                 </style>
               </object>
               <packing>
@@ -5495,12 +5496,12 @@
                             <property name="label" translatable="yes" context="CalcNotebookbar|InsertMenuButton">_Insert</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
                             <property name="relief">none</property>
                             <property name="use_underline">True</property>
-                            <property name="focus_on_click">False</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -5609,12 +5610,12 @@
                             <property name="label" translatable="yes" context="CalcNotebookbar|reviewb">Pag_e</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
                             <property name="relief">none</property>
                             <property name="use_underline">True</property>
-                            <property name="focus_on_click">False</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -7267,12 +7268,12 @@
                             <property name="label" translatable="yes" context="CalcNotebookbar|DataMenuButton">_Data</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
                             <property name="relief">none</property>
                             <property name="use_underline">True</property>
-                            <property name="focus_on_click">False</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -7980,12 +7981,12 @@
                             <property name="label" translatable="yes" context="CalcNotebookbar|ReviewMenuButton">_Review</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
                             <property name="relief">none</property>
                             <property name="use_underline">True</property>
-                            <property name="focus_on_click">False</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -8823,12 +8824,12 @@
                             <property name="label" translatable="yes" context="CalcNotebookbar|ViewMenuButton">_View</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
                             <property name="relief">none</property>
                             <property name="use_underline">True</property>
-                            <property name="focus_on_click">False</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -8935,11 +8936,11 @@
                             <property name="label" translatable="yes" context="CalcNotebookbar|GraphicMenuButton">Image</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="relief">none</property>
                             <property name="use_underline">True</property>
-                            <property name="focus_on_click">False</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -10962,12 +10963,12 @@
                             <property name="label" translatable="yes" context="CalcNotebookbar|DrawMenuButton">D_raw</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
                             <property name="relief">none</property>
                             <property name="use_underline">True</property>
-                            <property name="focus_on_click">False</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -11059,9 +11060,6 @@
                     <property name="position">3</property>
                   </packing>
                 </child>
-                <style>
-                  <class name="Context-Draw"/>
-                </style>
               </object>
               <packing>
                 <property name="position">9</property>
@@ -11074,6 +11072,8 @@
                 <property name="label" translatable="yes" context="CalcNotebookbar|DrawLabel">Draw</property>
                 <style>
                   <class name="context-Draw"/>
+                  <class name="context-DrawLine"/>
+                  <class name="context-ThreeDObject"/>
                 </style>
               </object>
               <packing>
@@ -11580,11 +11580,11 @@
                             <property name="label" translatable="yes" context="CalcNotebookbar|MediaMenuButton">_Media</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="halign">start</property>
                             <property name="relief">none</property>
                             <property name="use_underline">True</property>
-                            <property name="focus_on_click">False</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -11651,9 +11651,6 @@
                     <property name="position">3</property>
                   </packing>
                 </child>
-                <style>
-                  <class name="context-Media"/>
-                </style>
               </object>
               <packing>
                 <property name="position">10</property>
@@ -12380,12 +12377,12 @@
                             <property name="label" translatable="yes" context="CalcNotebookbar|frame:MenuDraw">Object</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
                             <property name="relief">none</property>
                             <property name="use_underline">True</property>
-                            <property name="focus_on_click">False</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -12477,10 +12474,6 @@
                     <property name="position">3</property>
                   </packing>
                 </child>
-                <style>
-                  <class name="Context-Frame"/>
-                  <class name="Context-OLE"/>
-                </style>
               </object>
               <packing>
                 <property name="position">10</property>
@@ -12766,12 +12759,12 @@
                             <property name="label" translatable="yes" context="CalcNotebookbar|PrintMenuButton">_Print</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="halign">end</property>
                             <property name="hexpand">True</property>
                             <property name="relief">none</property>
                             <property name="use_underline">True</property>
-                            <property name="focus_on_click">False</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -12877,12 +12870,12 @@
                             <property name="label" translatable="yes" context="CalcNotebookbar|ToolsMenuButton">_Tools</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
                             <property name="relief">none</property>
                             <property name="use_underline">True</property>
-                            <property name="focus_on_click">False</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>