Groupedbar Impress add priority feature anf fix conatext-drefault

Change-Id: I84faaa1497d652a86183064be7f012948c7a7ef8 Reviewed-on: https://gerrit.libreoffice.org/49676 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: andreas_kainz <kainz.a@gmail.com>
author: andreas kainz <kainz.a@gmail.com> 2018-02-13 18:18:27 +0100
committer: andreas_kainz <kainz.a@gmail.com> 2018-02-14 08:03:34 +0100
commit: 418dc19266519067ef8f3a2290ae9cb515677d43 (patch)
tree: 0666ae2b6b894dcf7a923054036de9296b2fe316 /sd
parent: 92dbf3f70eafd4974290fc488f51c05093950dbf (diff)
2 files changed, 1166 insertions, 571 deletions
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
index 5e1b3f0d7e1b..ca09d73bf235 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
@@ -10,35 +10,41 @@
     <child>
       <object class="GtkMenuItem" id="ExtrusionToggleD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ExtrusionToggle</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator138">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ExtrusionTiltDownD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ExtrusionTiltDown</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ExtrusionTiltUpD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ExtrusionTiltUp</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ExtrusionTiltLeftD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ExtrusionTiltLeft</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ExtrusionTiltRightD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ExtrusionTiltRight</property>
       </object>
     </child>
@@ -49,12 +55,14 @@
     <child>
       <object class="GtkMenuItem" id="TableSortD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:TableSort</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="AutoSumD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:AutoSum</property>
       </object>
     </child>
@@ -65,72 +73,84 @@
     <child>
       <object class="GtkMenuItem" id="GraphicFilterSepiaD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:GraphicFilterSepia</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="GraphicFilterSobelD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:GraphicFilterSobel</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="GraphicFilterInvertD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:GraphicFilterInvert</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="GraphicFilterMosaicD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:GraphicFilterMosaic</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="GraphicFilterPopart">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:GraphicFilterPopart</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="GraphicFilterPosterD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:GraphicFilterPoster</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="GraphicFilterReliefD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:GraphicFilterRelief</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="GraphicFilterRemoveNoiseD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:GraphicFilterRemoveNoise</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="GraphicFilterSharpenD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:GraphicFilterSharpen</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="GraphicFilterSmoothD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:GraphicFilterSmooth</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="GraphicFilterSolarizeD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:GraphicFilterSolarize</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="GrafModeD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:GrafMode</property>
       </object>
     </child>
@@ -141,129 +161,151 @@
     <child>
       <object class="GtkMenuItem" id="LineD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Line</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="Freeline_UnfilledD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Freeline_Unfilled</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="FreelineD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Freeline</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="Bezier_UnfilledD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Bezier_Unfilled</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="BezierFillD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:BezierFill</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="Polygon_UnfilledD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Polygon_Unfilled</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="Polygon_Diagonal_UnfilledD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Polygon_Diagonal_Unfilled</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="Polygon_DiagonalD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Polygon_Diagonal</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator131">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="BasicShapesD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:BasicShapes</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SymbolShapesD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SymbolShapes</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ArrowShapesD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ArrowShapes</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="StarShapesD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:StarShapes</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="CalloutShapesD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:CalloutShapes</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="FlowChartShapesD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:FlowChartShapes</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator134">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="DrawCaptionD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:DrawCaption</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertGraphicD2">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertGraphic</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="FontworkGalleryFloaterD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:FontworkGalleryFloater</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator136">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ExtrusionToggleD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ExtrusionToggle</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ToggleObjectBezierModeD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ToggleObjectBezierMode</property>
       </object>
     </child>
@@ -274,70 +316,82 @@
     <child>
       <object class="GtkMenuItem" id="SelectObjectD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SelectObject</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ToggleObjectRotateModeD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ToggleObjectRotateMode</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SelectObjectD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ToggleObjectBezierMode</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator129">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="FlipVerticald">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:FlipVertical</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="FlipHorizontalD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:FlipHorizontal</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator120">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="TransformDialogD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:TransformDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="FormatLineD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:FormatLine</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="FormatAreaD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:FormatArea</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="TextAttributesD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:TextAttributes</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="FontWorkD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:FontWork</property>
       </object>
     </child>
@@ -348,120 +402,141 @@
     <child>
       <object class="GtkMenuItem" id="undoi2">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Undo</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="redod2">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Redo</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="repeati2">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Repeat</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator65">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="cutd2">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Cut</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="copyd2">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Copy</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="pasted2">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Paste</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="pastespeciald2">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:PasteSpecial</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="pasteunformatted2">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:PasteUnformatted</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator66">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SelectAlld2">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SelectAll</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator67">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="FocusToFindbarD2">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">vnd.sun.star.findbar:FocusToFindbar</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SearchDialogD2">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SearchDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator68">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ImageMapDialogD2">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ImageMapDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator71">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SwitchControlDesignModeD2">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SwitchControlDesignMode</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="EditDocD2">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:EditDoc</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator141">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menubarD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:MenuBar</property>
         <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|menubarD1">Menubar</property>
       </object>
@@ -469,6 +544,7 @@
     <child>
       <object class="GtkMenuItem" id="OptionsTreeDialogD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:OptionsTreeDialog</property>
       </object>
     </child>
@@ -479,207 +555,243 @@
     <child>
       <object class="GtkMenuItem" id="AddDirectD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:AddDirect</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="AutoPilotMenuD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:AutoPilotMenu</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="NewDocD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:NewDoc</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator61">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="OpenFromWriterD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:OpenFromWriter</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="OpenRemoteD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:OpenRemote</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="RecentFileListD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:RecentFileList</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator42">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ReloadD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Reload</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="VersionDialogD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:VersionDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="CloseDocD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:CloseDoc</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator39">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SaveD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Save</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SaveAsRemoteD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SaveAsRemote</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SaveAsD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SaveAs</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator58">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="CheckOutD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:CheckOut</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="CancelCheckOutD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:CancelCheckOut</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="CheckInD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:CheckIn</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator43">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ExportToD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ExportTo</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ExportToPDFD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ExportToPDF</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator44">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SendMailD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SendMail</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SendViaBluetoothD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SendViaBluetooth</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="NewGlobalDocD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:NewGlobalDoc</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator48">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="PrintPreviewD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:PrintPreview</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="PrintD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Print</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="PrinterSetupD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:PrinterSetup</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator50">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SignatureD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Signature</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SignPDFD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SignPDF</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SetDocumentPropertiesD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SetDocumentProperties</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator64">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="QuitD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Quit</property>
       </object>
     </child>
@@ -690,185 +802,217 @@
     <child>
       <object class="GtkMenuItem" id="GrowD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Grow</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ShrinkD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Shrink</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator72">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="BoldD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Bold</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ItalicD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Italic</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="UnderlineD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Underline</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator5">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ShadowedD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Shadowed</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="OutlineFontD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:OutlineFont</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="StrikeoutD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Strikeout</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="OverlineD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Overline</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator52">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SuperScript2">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SuperScript</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SubScriptD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SubScript</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator35">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ChangeCaseToUpperD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ChangeCaseToUpper</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ChangeCaseToLowerD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ChangeCaseToLower</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ChangeCaseRotateCaseD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ChangeCaseRotateCase</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator54">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ChangeCaseToSentenceCaseD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ChangeCaseToSentenceCase</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ChangeCaseToTitleCaseD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ChangeCaseToTitleCase</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ChangeCaseToToggleCaseD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ChangeCaseToToggleCase</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator40">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertNonBreakingSpaceD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertNonBreakingSpace</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertHardHyphenD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertHardHyphen</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertSoftHyphenD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertSoftHyphen</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertZWSPD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertZWSP</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertZWNBSPD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertZWNBSP</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertLRMD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertLRM</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertRLMD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertRLM</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator2">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertRLMD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:FontDialog</property>
       </object>
     </child>
@@ -879,69 +1023,81 @@
     <child>
       <object class="GtkMenuItem" id="InsertCaptionDialogD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertCaptionDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator36">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="CropD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Crop</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ExternalEditD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ExternalEdit</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ChangePictureD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ChangePicture</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="CompressGraphicD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:CompressGraphic</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SaveGraphicD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SaveGraphic</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator37">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="FlipVerticalD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:FlipVertical</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="FlipHorizontalD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:FlipHorizontal</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator38">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ImageMapDialogD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ImageMapDialog</property>
       </object>
     </child>
@@ -952,18 +1108,21 @@
     <child>
       <object class="GtkMenuItem" id="GridVisibleD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:GridVisible</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="GridUseD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:GridUse</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="HelplinesMoveD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:HelplinesMove</property>
       </object>
     </child>
@@ -974,164 +1133,192 @@
     <child>
       <object class="GtkMenuItem" id="GroupBoxD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:GroupBox</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="NameGroupD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:NameGroup</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ObjectTitleDescriptionD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ObjectTitleDescription</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator119">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="FormatGroupD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:FormatGroup</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="FormatUngroupD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:FormatUngroup</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="EnterGroupD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:EnterGroup</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="LeaveGroupD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:LeaveGroup</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator145">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ChangeBezierD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ChangeBezier</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ChangePolygonD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ChangePolygon</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="convert_to_contourD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:convert_to_contour</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ConvertInto3DD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ConvertInto3D</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ConvertInto3DLatheFastD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ConvertInto3DLatheFast</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ConvertIntoBitmapD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ConvertIntoBitmap</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ConvertIntoMetaFileD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ConvertIntoMetaFile</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator146">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="CombineD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Combine</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="DismantleD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Dismantle</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ConnectD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Connect</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="BreakD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Break</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MergeD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Merge</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SubstractD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Substract</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="IntersectD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Intersect</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="EqualizeWidthD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:EqualizeWidth</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="EqualizeHeightD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:EqualizeHeight</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator150">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="GroupBoxD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:DistributeSelection</property>
       </object>
     </child>
@@ -1142,325 +1329,381 @@
     <child>
       <object class="GtkMenuItem" id="InsertGraphicD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertGraphic</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="Gallery">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Gallery</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="TwainSelect">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:TwainSelect</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="AnimationObjectsD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:AnimationObjects</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="PhotoAlbumDialogD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:PhotoAlbumDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertAVMedia">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertAVMedia</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator80">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="TextD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Text</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="FontworkGalleryFloater">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:FontworkGalleryFloater</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertObjectFloatingFrameD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertObjectFloatingFrame</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator46">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertSymbolD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertSymbol</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertMathD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertMath</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertObjectChartD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertObjectChart</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertTableD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertTable</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator84">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="Insert3DModelD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Insert3DModel</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertObjectDD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertObject</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ImportFromFileD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ImportFromFile</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator81">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertPageNumberD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertPageNumber</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertDateFieldFixD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertDateFieldFix</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertDateFieldVarD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertDateFieldVar</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertTimeFieldFixD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertTimeFieldFix</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertTimeFieldVarD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertTimeFieldVar</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator82">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertAuthorFieldD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertAuthorField</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertPageFieldD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertPageField</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertPageTitleFieldD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertPageTitleField</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertPagesFieldD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertPagesField</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertFileFieldD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertFileField</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator83">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="HeaderAndFooterD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:HeaderAndFooter</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator159">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertFootnoteD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertFootnote</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertEndnoteD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertEndnote</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertFootnoteDialogD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertFootnoteDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator160">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertPageNumberFieldD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertPageNumberField</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertFieldCtrlD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertFieldCtrl</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator161">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertIndexesEntryD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertIndexesEntry</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertMultiIndexD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertMultiIndex</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator162">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="BibliographyComponentD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:BibliographyComponent</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertAuthoritiesEntryD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertAuthoritiesEntry</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="AddressBookSourceD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:AddressBookSource</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator163">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="UpdateAllD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:UpdateAll</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="RepaginateD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Repaginate</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="UpdateFieldsD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:UpdateFields</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="UpdateAllIndexesD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:UpdateAllIndexes</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="UpdateCurIndexD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:UpdateCurIndex</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="UpdateAllLinksD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:UpdateAllLinks</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="UpdateChartsD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:UpdateCharts</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="CalculateSel1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:CalculateSel</property>
       </object>
     </child>
@@ -1471,24 +1714,28 @@
     <child>
       <object class="GtkMenuItem" id="InsertMasterPageD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertMasterPage</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="RenameMasterPageD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:RenameMasterPage</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="DeleteMasterPageD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:DeleteMasterPage</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="CloseMasterViewD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:CloseMasterView</property>
       </object>
     </child>
@@ -1499,134 +1746,157 @@
     <child>
       <object class="GtkMenuItem" id="ObjectMenue">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ObjectMenue</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator154">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertCaptionDialog3">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertCaptionDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator147">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ChangeBezierD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ChangeBezier</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ChangePolygonD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ChangePolygon</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="convert_to_contourD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:convert_to_contour</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ConvertInto3DD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ConvertInto3D</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ConvertInto3DLatheFastD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ConvertInto3DLatheFast</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ConvertIntoBitmapD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ConvertIntoBitmap</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ConvertIntoMetaFileD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ConvertIntoMetaFile</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator156">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="CombineD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Combine</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="DismantleD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Dismantle</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ConnectD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Connect</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="BreakD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Break</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MergeD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Merge</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SubstractD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Substract</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="IntersectD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Intersect</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="EqualizeWidthD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:EqualizeWidth</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="EqualizeHeightD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:EqualizeHeight</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator164">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="DistributeSelection1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:DistributeSelection</property>
       </object>
     </child>
@@ -1637,63 +1907,74 @@
     <child>
       <object class="GtkMenuItem" id="ParaLeftToRightD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ParaLeftToRight</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ParaRightToLeftD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ParaRightToLeft</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator78">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ParagraphDialogD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ParagraphDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator79">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SpacePara1D">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SpacePara1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SpacePara15D">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SpacePara15</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SpacePara2D">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SpacePara2</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator57">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ParaspaceIncreaseD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ParaspaceIncrease</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ParaspaceDecreaseD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ParaspaceDecrease</property>
       </object>
     </child>
@@ -1704,87 +1985,102 @@
     <child>
       <object class="GtkMenuItem" id="SpellingAndGrammarDialogD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SpellingAndGrammarDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SpellOnlineD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SpellOnline</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ThesaurusDialogD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ThesaurusDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator89">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SetLanguageSelectionMenuD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SetLanguageSelectionMenu</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SetLanguageParagraphMenuD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SetLanguageParagraphMenu</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SetLanguageAllTextMenuD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SetLanguageAllTextMenu</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator90">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="HyphenateD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Hyphenate</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ChineseConversionD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ChineseConversion</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="HangulHanjaConversionD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:HangulHanjaConversion</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MoreDictionariesD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:MoreDictionaries</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator91">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertAnnotationD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertAnnotation</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ShowAnnotationsD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ShowAnnotations</property>
       </object>
     </child>
@@ -1795,81 +2091,95 @@
     <child>
       <object class="GtkMenuItem" id="InsertRowsBeforeD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertRowsBefore</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertRowsAfterD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertRowsAfter</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertRowDialogD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertRowDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator30">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertColumnsBeforeD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertColumnsBefore</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertColumnsAfterD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertColumnsAfter</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertColumnDialogD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertColumnDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator45">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="DeleteRowsD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:DeleteRows</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="DeleteColumnsD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:DeleteColumns</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator33">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="EntireRowD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:EntireRow</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="EntireColumnD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:EntireColumn</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SelectTableD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SelectTable</property>
       </object>
     </child>
@@ -1880,6 +2190,7 @@
     <child>
       <object class="GtkMenuItem" id="menubarD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:MenuBar</property>
         <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|menubarD">Menubar</property>
       </object>
@@ -1887,109 +2198,128 @@
     <child>
       <object class="GtkMenuItem" id="StatusBarVisibleD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:StatusBarVisible</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SidebarD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Sidebar</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator99">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ConfigureDialogD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ConfigureDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ToolbarModeD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ToolbarMode</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="NotebookbarD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Notebookbar</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator100">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ExtensionsD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="OptionsTreeDialogD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:OptionsTreeDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator101">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="HelpIndexD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:HelpIndex</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ExtendedHelpD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ExtendedHelp</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="DocumentationD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Documentation</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator127">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="NewWindowD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:NewWindow</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="CloseWinD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:CloseWin</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="WindowListD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:OpenWindow</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator96">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="AboutD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:About</property>
       </object>
     </child>
@@ -2000,168 +2330,197 @@
     <child>
       <object class="GtkMenuItem" id="InsertSlideD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertSlide</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="DuplicateSlide">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:DuplicateSlide</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="DeleteSlide">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:DeleteSlide</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator102">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="InsertMasterPageD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertMasterPage</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="DeleteMasterPageD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:DeleteMasterPage</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator103">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ModifyPageD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ModifyPage</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SlideSetupD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SlideSetup</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SelectBackgroundD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SelectBackground</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SaveBackgroundD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SaveBackground</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator104">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="PresentationLayoutD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:PresentationLayout</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MasterLayoutsD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:MasterLayouts</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="DisplayMasterBackgroundD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:DisplayMasterBackground</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="DisplayMasterObjectsD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:DisplayMasterObjects</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator157">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="HideSlideD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:HideSlide</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ShowSlideD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ShowSlide</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="RenameSlideD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:RenameSlide</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator153">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SummaryPageD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SummaryPage</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ExpandPageD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ExpandPage</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator165">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="FirstSlideD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:FirstSlide</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="LastSlideD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:LastSlide</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="RestoreEditingViewD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:RestoreEditingView</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MoveSlideUpD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:MoveSlideUp</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MoveSlideDownD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:MoveSlideDown</property>
       </object>
     </child>
@@ -2173,52 +2532,61 @@
       <object class="GtkMenuItem" id="PresentationD">
         <property name="use_action_appearance">True</property>
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Presentation</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="PresentationCurrentSlideD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:PresentationCurrentSlide</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator151">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="RehearseTimingsD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:RehearseTimings</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="CustomShowDialogD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:CustomShowDialog</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="RemoteD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Remote</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator152">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SlideChangeWindowD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SlideChangeWindow</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="PresentationDialogD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:PresentationDialog</property>
       </object>
     </child>
@@ -2229,87 +2597,102 @@
     <child>
       <object class="GtkMenuItem" id="AddressBookSource">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:AddressBookSource</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator109">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="BibliographyComponent">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:BibliographyComponent</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ChangeDatabaseFieldD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ChangeDatabaseField</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ViewDataSourceBrowserD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ViewDataSourceBrowser</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator110">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MacroRecorderD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:MacroRecorder</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="RunMacroD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:RunMacro</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="BasicIDEAppearD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:BasicIDEAppear</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ScriptOrganizerD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ScriptOrganizer</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MacroSignatureD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:MacroSignature</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="MacroOrganizerD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:MacroOrganizer?TabId:short=1</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator111">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="OpenXMLFilterSettingsD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:OpenXMLFilterSettings</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SafeModeD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SafeMode</property>
       </object>
     </child>
@@ -2320,187 +2703,219 @@
     <child>
       <object class="GtkMenuItem" id="NormalMultiPaneGUID">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:NormalMultiPaneGUI</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="OutlineModeD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:OutlineMode</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="NotesModeD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:NotesMode</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="DiaModeD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:DiaMode</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="SlideMasterPageD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:SlideMasterPage</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="NotesMasterPageD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:NotesMasterPage</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="HandoutModeD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:HandoutMode</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator116">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="AvailableToolbarsD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:AvailableToolbars</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="StatusBarVisible">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:StatusBarVisible</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="LeftPaneImpressD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:LeftPaneImpress</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ToggleTabBarVisibilityD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ToggleTabBarVisibility</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator117">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ShowGraphicsD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:GridVisible</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="GridUseD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:GridUse</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="GridFrontD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:GridFront</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="HelplinesMoveD1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:HelplinesMove</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator118">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="HelplinesVisibleD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:HelplinesVisible</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="HelplinesUseD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:HelplinesUse</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="HelplinesFrontD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:HelplinesFront</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator121">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="OutputQualityColorD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:OutputQualityColor</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="OutputQualityGrayscaleD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:OutputQualityGrayscale</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="OutputQualityBlackWhiteD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:OutputQualityBlackWhite</property>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="separator158">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ZoomPageD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ZoomPage</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ZoomPageWidthD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ZoomPageWidth</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ZoomOptimalD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ZoomOptimal</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="Zoom100PercentD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Zoom100Percent</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ZoomD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:Zoom</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ZoomPanningD">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:ZoomPanning</property>
       </object>
     </child>
@@ -2511,6 +2926,7 @@
     <child>
       <object class="GtkBox" id="box1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="sfxlo-PriorityHBox" id="DefaultBox">
@@ -2520,43 +2936,61 @@
             <property name="margin_right">5</property>
             <property name="baseline_position">bottom</property>
             <child>
-              <object class="sfxlo-DropdownBox" id="FileSection">
+              <object class="sfxlo-DropdownBox" id="ToolsSection">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_left">5</property>
-                <property name="baseline_position">bottom</property>
+                <property name="halign">end</property>
+                <property name="margin_right">5</property>
                 <child>
-                  <object class="GtkBox" id="Section">
+                  <object class="GtkBox" id="Ext2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="orientation">vertical</property>
-                    <property name="baseline_position">top</property>
                     <child>
-                      <object class="sfxlo-NotebookbarToolBox" id="SectionBottom">
+                      <object class="GtkBox" id="Section2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="toolbar_style">icons</property>
-                        <property name="show_arrow">False</property>
+                        <property name="halign">end</property>
                         <child>
-                          <object class="GtkMenuToolButton" id="Open">
+                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="action_name">.uno:Open</property>
+                            <property name="toolbar_style">icons</property>
+                            <property name="show_arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="SearchDialog">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="action_name">.uno:SearchDialog</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="homogeneous">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkMenuToolButton" id="Save">
+                          <object class="svtlo-ManagedMenuButton" id="menub:MenuSettings">
+                            <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|menub">_Menu</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="action_name">.uno:Save</property>
+                            <property name="can_focus">True</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>
-                            <property name="homogeneous">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
@@ -2567,29 +3001,11 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkBox" id="box12">
+                      <object class="GtkBox" id="box34">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="fileb:MenuFile">
-                            <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|fileb">_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="relief">none</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="ExtBottom3">
+                          <object class="sfxlo-NotebookbarToolBox" id="thirdExt2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">end</property>
@@ -2598,10 +3014,10 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkToolButton" id="Print">
+                              <object class="GtkToolButton" id="HelpIndex1">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:Print</property>
+                                <property name="can_focus">True</property>
+                                <property name="action_name">.uno:HelpIndex</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -2612,6 +3028,22 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="svtlo-ManagedMenuButton" id="toolsb:MenuTools">
+                            <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|toolsb">_Tools</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</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>
+                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -2632,7 +3064,8 @@
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">True</property>
+                <property name="fill">False</property>
+                <property name="pack_type">end</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -2715,12 +3148,12 @@
                             <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|editb">_Edit</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>
@@ -2788,15 +3221,147 @@
               </packing>
             </child>
             <child>
+              <object class="GtkSeparator" id="separator122">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">end</property>
+                <property name="orientation">vertical</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="padding">5</property>
+                <property name="pack_type">end</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="sfxlo-DropdownBox" id="FileSection">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_left">5</property>
+                <property name="baseline_position">bottom</property>
+                <child>
+                  <object class="GtkBox" id="Section">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
+                    <property name="baseline_position">top</property>
+                    <child>
+                      <object class="sfxlo-NotebookbarToolBox" id="SectionBottom">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="toolbar_style">icons</property>
+                        <property name="show_arrow">False</property>
+                        <child>
+                          <object class="GtkMenuToolButton" id="Open">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="action_name">.uno:Open</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="homogeneous">True</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkMenuToolButton" id="Save">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="action_name">.uno:Save</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">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="box12">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="svtlo-ManagedMenuButton" id="fileb:MenuFile">
+                            <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|fileb">_File</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</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>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="ExtBottom3">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="hexpand">True</property>
+                            <property name="toolbar_style">icons</property>
+                            <property name="show_arrow">False</property>
+                            <property name="icon_size">1</property>
+                            <child>
+                              <object class="GtkToolButton" id="Print">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="action_name">.uno:Print</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">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <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>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">4</property>
+              </packing>
+            </child>
+            <child>
               <object class="sfxlo-ContextVBox" id="ContextContainer">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
                 <child>
-                  <object class="sfxlo-PriorityHBox" id="DefaultContainer">
+                  <object class="sfxlo-PriorityMergedHBox" id="DefaultContainer">
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionSlideShow">
+                      <object class="sfxlo-OptionalBox" id="SectionSlideShow">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -2886,11 +3451,11 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|reviewb">_Slide Show</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>
                                     <property name="always_show_image">True</property>
                                   </object>
                                   <packing>
@@ -2949,7 +3514,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionSlideShow1">
+                      <object class="sfxlo-OptionalBox" id="SectionSlideShow1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -3015,11 +3580,11 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphstylet">S_lide</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>
@@ -3077,7 +3642,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionInsert">
+                      <object class="sfxlo-OptionalBox" id="SectionInsert">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -3167,11 +3732,11 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|insertText">_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="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>
@@ -3193,6 +3758,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-5"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -3201,7 +3769,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionDraw">
+                      <object class="sfxlo-OptionalBox" id="SectionDraw">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -3337,11 +3905,11 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|draw">D_raw</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>
@@ -3402,6 +3970,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-4"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -3410,7 +3981,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="ArrangeSection3">
+                      <object class="sfxlo-OptionalBox" id="ArrangeSection3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -3513,6 +4084,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-3"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -3521,7 +4095,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="ViewSection">
+                      <object class="sfxlo-OptionalBox" id="ViewSection">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -3622,11 +4196,11 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewb">_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="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>
@@ -3676,6 +4250,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-2"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -3684,7 +4261,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="ReviewSection">
+                      <object class="sfxlo-OptionalBox" id="ReviewSection">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -3774,12 +4351,12 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|reviewb">_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>
@@ -3801,6 +4378,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-1"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -3821,10 +4401,10 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="sfxlo-PriorityHBox" id="DrawTextContainer">
+                  <object class="sfxlo-PriorityMergedHBox" id="DrawTextContainer">
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionSlideShow2">
+                      <object class="sfxlo-OptionalBox" id="SectionSlideShow2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -3914,11 +4494,11 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|slideshowf">_Slide Show</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>
                                     <property name="always_show_image">True</property>
                                   </object>
                                   <packing>
@@ -3977,7 +4557,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="FormatSection1">
+                      <object class="sfxlo-OptionalBox" id="FormatSection1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -4080,10 +4660,10 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|formatt">F_ormat</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="relief">none</property>
                                     <property name="use_underline">True</property>
+                                    <property name="focus_on_click">False</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -4184,7 +4764,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="ParagraphSection2">
+                      <object class="sfxlo-OptionalBox" id="ParagraphSection2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -4331,10 +4911,10 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragrapht">_Paragraph</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="relief">none</property>
                                     <property name="use_underline">True</property>
+                                    <property name="focus_on_click">False</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -4405,6 +4985,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-4"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -4413,7 +4996,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionInsert2">
+                      <object class="sfxlo-OptionalBox" id="SectionInsert2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -4503,11 +5086,11 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|insertTextO">_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="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>
@@ -4529,6 +5112,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-3"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -4537,7 +5123,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="ViewSection2">
+                      <object class="sfxlo-OptionalBox" id="ViewSection2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -4638,11 +5224,11 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewT">_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="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>
@@ -4692,6 +5278,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-2"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -4700,7 +5289,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="ReviewSection1">
+                      <object class="sfxlo-OptionalBox" id="ReviewSection1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -4790,12 +5379,12 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|reviewb">_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>
@@ -4817,6 +5406,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-1"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -4835,10 +5427,10 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="sfxlo-PriorityHBox" id="TableBox">
+                  <object class="sfxlo-PriorityMergedHBox" id="TableBox">
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionSlideShow3">
+                      <object class="sfxlo-OptionalBox" id="SectionSlideShow3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -4928,11 +5520,11 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|slideshowb">_Slide Show</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>
                                     <property name="always_show_image">True</property>
                                   </object>
                                   <packing>
@@ -4991,7 +5583,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="FormatSection2">
+                      <object class="sfxlo-OptionalBox" id="FormatSection2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -5094,10 +5686,10 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|formatt">F_ormat</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="relief">none</property>
                                     <property name="use_underline">True</property>
+                                    <property name="focus_on_click">False</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -5198,7 +5790,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="ParagraphSection1">
+                      <object class="sfxlo-OptionalBox" id="ParagraphSection1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -5345,10 +5937,10 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragrapht">_Paragraph</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="relief">none</property>
                                     <property name="use_underline">True</property>
+                                    <property name="focus_on_click">False</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -5419,6 +6011,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-4"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -5427,7 +6022,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="TableSection">
+                      <object class="sfxlo-OptionalBox" id="TableSection">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -5496,11 +6091,11 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|rowscolumnst">R_ows</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>
@@ -5560,6 +6155,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-3"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -5568,7 +6166,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="RowsTableSection">
+                      <object class="sfxlo-OptionalBox" id="RowsTableSection">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -5715,6 +6313,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-2"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -5723,7 +6324,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="CalcSection">
+                      <object class="sfxlo-OptionalBox" id="CalcSection">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -5813,11 +6414,11 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|calculatet">_Calc</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>
@@ -5839,6 +6440,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-1"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -5857,10 +6461,10 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="sfxlo-PriorityHBox" id="DrawBox">
+                  <object class="sfxlo-PriorityMergedHBox" id="DrawBox">
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="EditSection">
+                      <object class="sfxlo-OptionalBox" id="EditSection">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -6006,10 +6610,10 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|editdrawb">St_yles</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="relief">none</property>
                                     <property name="use_underline">True</property>
+                                    <property name="focus_on_click">False</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -6077,7 +6681,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="DrawSelect">
+                      <object class="sfxlo-OptionalBox" id="DrawSelect">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -6234,10 +6838,10 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|drawb">D_raw</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="relief">none</property>
                                     <property name="use_underline">True</property>
+                                    <property name="focus_on_click">False</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -6327,7 +6931,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="ArrangeSection4">
+                      <object class="sfxlo-OptionalBox" id="ArrangeSection4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -6521,6 +7125,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-4"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -6529,7 +7136,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="GroupBox">
+                      <object class="sfxlo-OptionalBox" id="GroupBox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -6606,10 +7213,10 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewDrawb">Grou_p</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="relief">none</property>
                                     <property name="use_underline">True</property>
+                                    <property name="focus_on_click">False</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -6631,6 +7238,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-3"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -6639,7 +7249,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="GridSection2">
+                      <object class="sfxlo-OptionalBox" id="GridSection2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -6716,10 +7326,10 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridO">_Grid</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="relief">none</property>
                                     <property name="use_underline">True</property>
+                                    <property name="focus_on_click">False</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -6741,6 +7351,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-2"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -6749,7 +7362,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="3dBox">
+                      <object class="sfxlo-OptionalBox" id="3dBox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -6859,10 +7472,10 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|3Db">3_D</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="relief">none</property>
                                     <property name="use_underline">True</property>
+                                    <property name="focus_on_click">False</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -6922,6 +7535,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-1"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -6940,10 +7556,10 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="sfxlo-PriorityHBox" id="GraphicContainer">
+                  <object class="sfxlo-PriorityMergedHBox" id="GraphicContainer">
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="GraphicSection">
+                      <object class="sfxlo-OptionalBox" id="GraphicSection">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -7032,11 +7648,11 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|graphicB">_Graphic</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>
@@ -7093,7 +7709,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="ColorSection">
+                      <object class="sfxlo-OptionalBox" id="ColorSection">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -7148,10 +7764,10 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|colorb">C_olor</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="relief">none</property>
                                     <property name="use_underline">True</property>
+                                    <property name="focus_on_click">False</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -7217,7 +7833,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="ColorSectionExt">
+                      <object class="sfxlo-OptionalBox" id="ColorSectionExt">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -7310,6 +7926,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-3"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -7318,7 +7937,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="ArrangeSection">
+                      <object class="sfxlo-OptionalBox" id="ArrangeSection">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -7536,6 +8155,9 @@
                             <property name="position">3</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-2"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -7544,7 +8166,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="GridSection">
+                      <object class="sfxlo-OptionalBox" id="GridSection">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -7622,11 +8244,11 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridB">_Grid</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>
@@ -7648,6 +8270,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-1"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -7666,10 +8291,10 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="sfxlo-PriorityHBox" id="OLEContainer">
+                  <object class="sfxlo-PriorityMergedHBox" id="OLEContainer">
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionSlideShow4">
+                      <object class="sfxlo-OptionalBox" id="SectionSlideShow4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -7759,11 +8384,11 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|slideshowOLE">_Slide Show</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>
                                     <property name="always_show_image">True</property>
                                   </object>
                                   <packing>
@@ -7822,7 +8447,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="EditSection1">
+                      <object class="sfxlo-OptionalBox" id="EditSection1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -7985,11 +8610,11 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|oleB">F_rame</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>
@@ -8091,6 +8716,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-4"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -8099,7 +8727,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="ArrangeSection1">
+                      <object class="sfxlo-OptionalBox" id="ArrangeSection1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -8293,6 +8921,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-3"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -8301,7 +8932,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="GridSection1">
+                      <object class="sfxlo-OptionalBox" id="GridSection1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -8379,11 +9010,11 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridB">_Grid</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>
@@ -8405,6 +9036,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-2"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -8413,7 +9047,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="ViewSection1">
+                      <object class="sfxlo-OptionalBox" id="ViewSection1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -8514,11 +9148,11 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewOLE">_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="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>
@@ -8568,6 +9202,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-1"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -8590,10 +9227,10 @@
                   <placeholder/>
                 </child>
                 <child>
-                  <object class="sfxlo-PriorityHBox" id="MasterPageBox">
+                  <object class="sfxlo-PriorityMergedHBox" id="MasterPageBox">
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionSlideShow5">
+                      <object class="sfxlo-OptionalBox" id="SectionSlideShow5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -8694,11 +9331,11 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|oleB">_Master Page</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>
@@ -8728,7 +9365,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionInsert4">
+                      <object class="sfxlo-OptionalBox" id="SectionInsert4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -8840,11 +9477,11 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|insertTextb">_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="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>
@@ -8905,6 +9542,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-4"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -8913,7 +9553,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionDraw1">
+                      <object class="sfxlo-OptionalBox" id="SectionDraw1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -9049,11 +9689,11 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|drawMaster">D_raw</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>
@@ -9114,6 +9754,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-3"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -9122,7 +9765,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="ArrangeSection2">
+                      <object class="sfxlo-OptionalBox" id="ArrangeSection2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -9316,6 +9959,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-2"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -9324,7 +9970,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="ViewSection3">
+                      <object class="sfxlo-OptionalBox" id="ViewSection3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="baseline_position">bottom</property>
@@ -9425,11 +10071,11 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewMaster">_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="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>
@@ -9479,6 +10125,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-1"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -9498,155 +10147,9 @@
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">4</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSeparator" id="separator122">
-                <property name="visible">True</property>
-                <property name="halign">end</property>
-                <property name="hexpand">True</property>
-                <property name="orientation">vertical</property>
-              </object>
-              <packing>
                 <property name="expand">True</property>
                 <property name="fill">True</property>
-                <property name="padding">5</property>
-                <property name="position">5</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-DropdownBox" id="ToolsSection">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_right">5</property>
-                <child>
-                  <object class="GtkBox" id="Ext2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
-                    <child>
-                      <object class="GtkBox" id="Section2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="halign">end</property>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="toolbar_style">icons</property>
-                            <property name="show_arrow">False</property>
-                            <child>
-                              <object class="GtkToolButton" id="SearchDialog">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="action_name">.uno:SearchDialog</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">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="svtlo-ManagedMenuButton" id="menub:MenuSettings">
-                            <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|menub">_Menu</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>
-                          </object>
-                          <packing>
-                            <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="GtkBox" id="box34">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="thirdExt2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="halign">end</property>
-                            <property name="hexpand">True</property>
-                            <property name="toolbar_style">icons</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">1</property>
-                            <child>
-                              <object class="GtkToolButton" id="HelpIndex1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="action_name">.uno:HelpIndex</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">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="svtlo-ManagedMenuButton" id="toolsb:MenuTools">
-                            <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|toolsb">_Tools</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="relief">none</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <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">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">6</property>
+                <property name="position">4</property>
               </packing>
             </child>
           </object>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
index 43102d2b1e9a..83a5943f326c 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
@@ -3160,6 +3160,204 @@
             <property name="margin_right">5</property>
             <property name="baseline_position">bottom</property>
             <child>
+              <object class="sfxlo-DropdownBox" id="SectionTools">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">end</property>
+                <child>
+                  <object class="GtkBox" id="horizontal2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkBox" id="vertical2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="halign">end</property>
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <object class="GtkBox" id="box45">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="hexpand">True</property>
+                            <child>
+                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom2">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="toolbar_style">icons</property>
+                                <property name="show_arrow">False</property>
+                                <child>
+                                  <object class="GtkToolButton" id="SearchDialog1">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="action_name">.uno:SearchDialog</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">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="svtlo-ManagedMenuButton" id="menub:MenuSettings">
+                                <property name="label" translatable="yes" context="notebookbar_groupedbar_full|menub">_Menu</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</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>
+                                <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="GtkBox" id="box46">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="hexpand">True</property>
+                            <child>
+                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom3">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="toolbar_style">icons</property>
+                                <property name="show_arrow">False</property>
+                                <child>
+                                  <object class="GtkToolButton" id="PresentationCurrentSlide">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="action_name">.uno:PresentationCurrentSlide</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">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="svtlo-ManagedMenuButton" id="toolsb:MenuTools">
+                                <property name="label" translatable="yes" context="notebookbar_groupedbar_full|toolsb">_Tools</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</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>
+                                <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">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="box44">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="hexpand">True</property>
+                            <child>
+                              <object class="sfxlo-NotebookbarToolBox" id="thirdExt2">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="resize_mode">immediate</property>
+                                <property name="toolbar_style">icons</property>
+                                <property name="show_arrow">False</property>
+                                <property name="icon_size">1</property>
+                                <child>
+                                  <object class="GtkToolButton" id="HelpIndex1">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="action_name">.uno:HelpIndex</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">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="svtlo-ManagedMenuButton" id="helpb:MenuHelp">
+                                <property name="label" translatable="yes" context="notebookbar_groupedbar_full|helpb">_Help</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</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>
+                                <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">2</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <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>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="pack_type">end</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
               <object class="sfxlo-DropdownBox" id="SectionFile">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -3227,11 +3425,11 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_full|fileb">_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="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>
@@ -3290,7 +3488,22 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSeparator" id="separator7">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">end</property>
+                <property name="orientation">vertical</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="padding">5</property>
+                <property name="pack_type">end</property>
+                <property name="position">2</property>
               </packing>
             </child>
             <child>
@@ -3450,11 +3663,11 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_full|editb">_Edit</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>
@@ -3513,7 +3726,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="position">3</property>
               </packing>
             </child>
             <child>
@@ -3522,11 +3735,11 @@
                 <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
                 <child>
-                  <object class="sfxlo-PriorityHBox" id="DefaultBox">
+                  <object class="sfxlo-PriorityMergedHBox" id="DefaultBox">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionSlideShow">
+                      <object class="sfxlo-OptionalBox" id="SectionSlideShow">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -3610,11 +3823,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|slideshowb">_Slide Show</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>
                                         <property name="always_show_image">True</property>
                                       </object>
                                       <packing>
@@ -3689,7 +3902,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionSlide">
+                      <object class="sfxlo-OptionalBox" id="SectionSlide">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -3808,11 +4021,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphstylet">S_lide</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>
@@ -3875,7 +4088,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionInsert3">
+                      <object class="sfxlo-OptionalBox" id="SectionInsert3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -3960,11 +4173,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|insertText">_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="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>
@@ -4009,6 +4222,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-5"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -4017,7 +4233,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionDraw1">
+                      <object class="sfxlo-OptionalBox" id="SectionDraw1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -4307,11 +4523,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|draw">D_raw</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>
@@ -4378,6 +4594,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="prioritiy-4"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -4386,7 +4605,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionView">
+                      <object class="sfxlo-OptionalBox" id="SectionView">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -4492,11 +4711,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewb">_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="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>
@@ -4525,6 +4744,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-3"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -4533,7 +4755,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionReview">
+                      <object class="sfxlo-OptionalBox" id="SectionReview">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -4639,11 +4861,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|reviewb">_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="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>
@@ -4672,6 +4894,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-2"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -4680,7 +4905,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionArrang1">
+                      <object class="sfxlo-OptionalBox" id="SectionArrang1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -4928,11 +5153,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrangedrawb">_Arrange</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>
@@ -4977,6 +5202,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-1"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -4985,7 +5213,7 @@
                       </packing>
                     </child>
                     <style>
-                      <class name="context-Default"/>
+                      <class name="context-default"/>
                       <class name="context-DrawPage"/>
                       <class name="context-TextObject"/>
                     </style>
@@ -4997,10 +5225,10 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="sfxlo-PriorityHBox" id="DrawTextBox">
+                  <object class="sfxlo-PriorityMergedHBox" id="DrawTextBox">
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionSlideShow1">
+                      <object class="sfxlo-OptionalBox" id="SectionSlideShow1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -5084,11 +5312,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|slideshowt">_Slide Show</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>
                                         <property name="always_show_image">True</property>
                                       </object>
                                       <packing>
@@ -5152,7 +5380,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionFormat">
+                      <object class="sfxlo-OptionalBox" id="SectionFormat">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -5337,11 +5565,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|formatd">F_ormat</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>
@@ -5441,7 +5669,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionParagraph">
+                      <object class="sfxlo-OptionalBox" id="SectionParagraph">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -5662,11 +5890,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphTextb">_Paragraph</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>
@@ -5722,6 +5950,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-4"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -5730,7 +5961,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionInsert1">
+                      <object class="sfxlo-OptionalBox" id="SectionInsert1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -5906,11 +6137,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|insertTextt">_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="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>
@@ -5955,6 +6186,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-3"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -5963,7 +6197,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionView1">
+                      <object class="sfxlo-OptionalBox" id="SectionView1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -6069,11 +6303,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewt">_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="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>
@@ -6102,6 +6336,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-2"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -6110,7 +6347,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionReview1">
+                      <object class="sfxlo-OptionalBox" id="SectionReview1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -6216,11 +6453,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|reviewb">_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="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>
@@ -6249,6 +6486,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-1"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -6267,10 +6507,10 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="sfxlo-PriorityHBox" id="TableBox">
+                  <object class="sfxlo-PriorityMergedHBox" id="TableBox">
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionSlideShow2">
+                      <object class="sfxlo-OptionalBox" id="SectionSlideShow2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -6354,11 +6594,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|slideshowtt">_Slide Show</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>
                                         <property name="always_show_image">True</property>
                                       </object>
                                       <packing>
@@ -6422,7 +6662,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionFormat1">
+                      <object class="sfxlo-OptionalBox" id="SectionFormat1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -6608,11 +6848,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|formatd">F_ormat</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>
@@ -6712,7 +6952,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionParagraph1">
+                      <object class="sfxlo-OptionalBox" id="SectionParagraph1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -6935,11 +7175,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphTextb">_Paragraph</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>
@@ -6995,6 +7235,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-4"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -7003,7 +7246,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionTable">
+                      <object class="sfxlo-OptionalBox" id="SectionTable">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -7115,11 +7358,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|tabled">T_able</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>
@@ -7175,6 +7418,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-3"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -7183,7 +7429,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionRowsColumns">
+                      <object class="sfxlo-OptionalBox" id="SectionRowsColumns">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -7381,11 +7627,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|rowscolumnst">R_ows</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>
@@ -7414,6 +7660,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-2"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -7422,7 +7671,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionCalculate">
+                      <object class="sfxlo-OptionalBox" id="SectionCalculate">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -7502,11 +7751,11 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_full|calculatet">_Calc</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>
@@ -7528,6 +7777,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-1"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -7546,10 +7798,10 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="sfxlo-PriorityHBox" id="DrawBox">
+                  <object class="sfxlo-PriorityMergedHBox" id="DrawBox">
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionDraw3">
+                      <object class="sfxlo-OptionalBox" id="SectionDraw3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -7839,11 +8091,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|drawb">D_raw</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>
@@ -7918,7 +8170,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionDrawEdit">
+                      <object class="sfxlo-OptionalBox" id="SectionDrawEdit">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -8136,11 +8388,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|editdrawb">_Edit</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>
@@ -8293,6 +8545,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-5"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -8301,7 +8556,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionArrang3">
+                      <object class="sfxlo-OptionalBox" id="SectionArrang3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -8549,11 +8804,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrangedrawb">_Arrange</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>
@@ -8598,6 +8853,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-4"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -8606,7 +8864,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionDrawGrid">
+                      <object class="sfxlo-OptionalBox" id="SectionDrawGrid">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -8701,11 +8959,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|GridDrawB">_Grid</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>
@@ -8734,6 +8992,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-3"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -8742,7 +9003,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionDrawView">
+                      <object class="sfxlo-OptionalBox" id="SectionDrawView">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -8844,11 +9105,11 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewDrawb">Grou_p</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>
@@ -8870,6 +9131,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-2"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -8878,7 +9142,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="Section3D">
+                      <object class="sfxlo-OptionalBox" id="Section3D">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -8984,11 +9248,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|3Db">3_D</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>
@@ -9055,6 +9319,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-1"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -9073,10 +9340,10 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="sfxlo-PriorityHBox" id="GraphicBox">
+                  <object class="sfxlo-PriorityMergedHBox" id="GraphicBox">
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionGraphic">
+                      <object class="sfxlo-OptionalBox" id="SectionGraphic">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -9243,11 +9510,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|graphicB">_Graphic</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>
@@ -9311,7 +9578,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionColor">
+                      <object class="sfxlo-OptionalBox" id="SectionColor">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -9415,10 +9682,10 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_full|colorb">C_olor</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="relief">none</property>
                                     <property name="use_underline">True</property>
+                                    <property name="focus_on_click">False</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -9563,6 +9830,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-3"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -9571,7 +9841,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionArrang4">
+                      <object class="sfxlo-OptionalBox" id="SectionArrang4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -9819,11 +10089,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrangedrawb">_Arrange</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>
@@ -9868,6 +10138,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-2"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -9876,7 +10149,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionDrawGrid1">
+                      <object class="sfxlo-OptionalBox" id="SectionDrawGrid1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -9971,11 +10244,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|GridDrawB">_Grid</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>
@@ -10004,6 +10277,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-1"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -10022,10 +10298,10 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="sfxlo-PriorityHBox" id="MediaBox">
+                  <object class="sfxlo-PriorityMergedHBox" id="MediaBox">
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionFormat2">
+                      <object class="sfxlo-OptionalBox" id="SectionFormat2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -10375,11 +10651,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|media">_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>
@@ -10447,6 +10723,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-1"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -10465,10 +10744,10 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="sfxlo-PriorityHBox" id="OLEBox">
+                  <object class="sfxlo-PriorityMergedHBox" id="OLEBox">
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionSlideShow3">
+                      <object class="sfxlo-OptionalBox" id="SectionSlideShow3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -10552,11 +10831,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|slideshowOLE">_Slide Show</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>
                                         <property name="always_show_image">True</property>
                                       </object>
                                       <packing>
@@ -10620,7 +10899,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionDrawEdit1">
+                      <object class="sfxlo-OptionalBox" id="SectionDrawEdit1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -10838,11 +11117,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|editdrawb">F_rame</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>
@@ -10995,6 +11274,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-4"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -11003,7 +11285,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionArrang5">
+                      <object class="sfxlo-OptionalBox" id="SectionArrang5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -11251,11 +11533,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrangedrawb">_Arrange</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>
@@ -11300,6 +11582,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-3"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -11308,7 +11593,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionDrawGrid2">
+                      <object class="sfxlo-OptionalBox" id="SectionDrawGrid2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -11403,11 +11688,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|GridDrawB">_Grid</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>
@@ -11436,6 +11721,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-2"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -11444,7 +11732,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionView2">
+                      <object class="sfxlo-OptionalBox" id="SectionView2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -11550,11 +11838,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewtOLE">_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="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>
@@ -11583,6 +11871,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-1"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -11602,10 +11893,10 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="sfxlo-PriorityHBox" id="MasterPageBox">
+                  <object class="sfxlo-PriorityMergedHBox" id="MasterPageBox">
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionGraphic4">
+                      <object class="sfxlo-OptionalBox" id="SectionGraphic4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -11711,11 +12002,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|oleB">_Master Page</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>
@@ -11752,7 +12043,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionInsert2">
+                      <object class="sfxlo-OptionalBox" id="SectionInsert2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -11950,11 +12241,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|insertTextm">_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="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>
@@ -11999,6 +12290,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-4"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -12007,7 +12301,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionDraw2">
+                      <object class="sfxlo-OptionalBox" id="SectionDraw2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -12180,11 +12474,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|drawm">D_raw</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>
@@ -12251,6 +12545,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-3"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -12259,7 +12556,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionArrang2">
+                      <object class="sfxlo-OptionalBox" id="SectionArrang2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -12507,11 +12804,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrangedrawb">_Arrange</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>
@@ -12556,6 +12853,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-2"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -12564,7 +12864,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-DropdownBox" id="SectionView4">
+                      <object class="sfxlo-OptionalBox" id="SectionView4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -12670,11 +12970,11 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|masterviewm">_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="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>
@@ -12703,6 +13003,9 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-1"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -12722,219 +13025,8 @@
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSeparator" id="separator7">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">end</property>
-                <property name="hexpand">True</property>
-                <property name="orientation">vertical</property>
-              </object>
-              <packing>
                 <property name="expand">True</property>
                 <property name="fill">True</property>
-                <property name="padding">5</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-DropdownBox" id="SectionTools">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkBox" id="horizontal2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkBox" id="vertical2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="halign">end</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="GtkBox" id="box45">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="halign">end</property>
-                            <property name="hexpand">True</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="SearchDialog1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:SearchDialog</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">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="svtlo-ManagedMenuButton" id="menub:MenuSettings">
-                                <property name="label" translatable="yes" context="notebookbar_groupedbar_full|menub">_Menu</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="relief">none</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <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="GtkBox" id="box46">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="halign">end</property>
-                            <property name="hexpand">True</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom3">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="PresentationCurrentSlide">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:PresentationCurrentSlide</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">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="svtlo-ManagedMenuButton" id="toolsb:MenuTools">
-                                <property name="label" translatable="yes" context="notebookbar_groupedbar_full|toolsb">_Tools</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="relief">none</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <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">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="box44">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="halign">end</property>
-                            <property name="hexpand">True</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="thirdExt2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="resize_mode">immediate</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <property name="icon_size">1</property>
-                                <child>
-                                  <object class="GtkToolButton" id="HelpIndex1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:HelpIndex</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">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="svtlo-ManagedMenuButton" id="helpb:MenuHelp">
-                                <property name="label" translatable="yes" context="notebookbar_groupedbar_full|helpb">_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="relief">none</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <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">2</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <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>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
                 <property name="position">4</property>
               </packing>
             </child>
author	andreas kainz <kainz.a@gmail.com>	2018-02-13 18:18:27 +0100
committer	andreas_kainz <kainz.a@gmail.com>	2018-02-14 08:03:34 +0100
commit	418dc19266519067ef8f3a2290ae9cb515677d43 (patch)
tree	0666ae2b6b894dcf7a923054036de9296b2fe316 /sd
parent	92dbf3f70eafd4974290fc488f51c05093950dbf (diff)