diff options
| author | andreas kainz <kainz.a@gmail.com> | 2018-02-13 14:03:10 +0100 |
|---|---|---|
| committer | andreas_kainz <kainz.a@gmail.com> | 2018-02-13 20:18:06 +0100 |
| commit | 57834438855d066c1ca16370a84fa862aea11ce1 (patch) | |
| tree | 605269737d6ecdb2b171754cd729dab24f844ee8 /sc | |
| parent | fc956e424b99492bbcd8a0df98c60e526ddb9bfd (diff) | |
Groupedbar Calc add priority feature and fix context-default
Change-Id: Ib376e8cec321e390bf59ffe8e2da84b71c6eeea5
Reviewed-on: https://gerrit.libreoffice.org/49650
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
Tested-by: andreas_kainz <kainz.a@gmail.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui | 607 | ||||
| -rw-r--r-- | sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui | 772 |
2 files changed, 758 insertions, 621 deletions
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui index d4d50d25b17a..6074d57023db 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui @@ -4588,6 +4588,140 @@ <property name="margin_right">5</property> <property name="baseline_position">bottom</property> <child> + <object class="sfxlo-DropdownBox" id="ToolsSection"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</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="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">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="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> + </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="FileSection"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -4643,12 +4777,12 @@ <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> + <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -4701,7 +4835,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="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> @@ -4783,12 +4932,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> @@ -4852,7 +5001,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> @@ -4861,10 +5010,10 @@ <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="StylesSection"> + <object class="sfxlo-OptionalBox" id="StylesSection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> @@ -4941,10 +5090,10 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphstyleb">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> @@ -4983,6 +5132,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-8"/> + </style> </object> <packing> <property name="expand">False</property> @@ -4991,7 +5143,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="FontSection"> + <object class="sfxlo-OptionalBox" id="FontSection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> @@ -5095,10 +5247,10 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|formatb">F_ont</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> @@ -5202,7 +5354,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="NumberSection"> + <object class="sfxlo-OptionalBox" id="NumberSection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> @@ -5250,7 +5402,6 @@ </child> <child> <object class="GtkToolButton" id="NumberFormatPercent"> - <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">center</property> <property name="hexpand">True</property> @@ -5319,10 +5470,10 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|numberb">_Number</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> @@ -5344,6 +5495,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-7"/> + </style> </object> <packing> <property name="expand">False</property> @@ -5352,7 +5506,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="AlignmentSection"> + <object class="sfxlo-OptionalBox" id="AlignmentSection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> @@ -5475,10 +5629,10 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphb">_Alignment</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> @@ -5527,6 +5681,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-6"/> + </style> </object> <packing> <property name="expand">False</property> @@ -5535,7 +5692,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="CellSection"> + <object class="sfxlo-OptionalBox" id="CellSection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> @@ -5639,10 +5796,10 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|cellb">_Cells</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> @@ -5694,6 +5851,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-5"/> + </style> </object> <packing> <property name="expand">False</property> @@ -5702,7 +5862,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="InsertSection"> + <object class="sfxlo-OptionalBox" id="InsertSection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> @@ -5779,12 +5939,12 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|insertb">_Insert</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="focus_on_click">False</property> <property name="receives_default">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="relief">none</property> <property name="use_underline">True</property> + <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -5822,6 +5982,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-4"/> + </style> </object> <packing> <property name="expand">False</property> @@ -5830,7 +5993,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="DataSection"> + <object class="sfxlo-OptionalBox" id="DataSection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> @@ -5909,10 +6072,10 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|datab">_Data</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="focus_on_click">False</property> <property name="receives_default">False</property> <property name="relief">none</property> <property name="use_underline">True</property> + <property name="focus_on_click">False</property> <property name="yalign">0.49000000953674316</property> </object> <packing> @@ -5935,6 +6098,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> </object> <packing> <property name="expand">False</property> @@ -5943,12 +6109,12 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="ViewSection"> + <object class="sfxlo-OptionalBox" id="ReviewSection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator24"> + <object class="GtkSeparator" id="separator27"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -5961,21 +6127,21 @@ </packing> </child> <child> - <object class="GtkBox" id="Section8"> + <object class="GtkBox" id="Section9"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom8"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom9"> <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="FreezePanes"> + <object class="GtkToolButton" id="SpellingAndGrammarDialog"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="action_name">.uno:FreezePanes</property> + <property name="action_name">.uno:SpellingAndGrammarDialog</property> </object> <packing> <property name="expand">False</property> @@ -5983,10 +6149,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="PrintPreview"> + <object class="GtkToolButton" id="InsertAnnotation"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:PrintPreview</property> + <property name="can_focus">True</property> + <property name="action_name">.uno:InsertAnnotation</property> </object> <packing> <property name="expand">False</property> @@ -5994,14 +6160,14 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Zoom2"> + <object class="GtkToolButton" id="TraceChangeMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Zoom</property> + <property name="action_name">.uno:TraceChangeMode</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -6012,18 +6178,20 @@ </packing> </child> <child> - <object class="GtkBox" id="box10"> + <object class="GtkBox" id="box14"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="viewb:MenuView"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewb">_View</property> + <object class="svtlo-ManagedMenuButton" id="reviewb:MenuReview"> + <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> @@ -6045,6 +6213,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-2"/> + </style> </object> <packing> <property name="expand">False</property> @@ -6053,12 +6224,12 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="ReviewSection"> + <object class="sfxlo-OptionalBox" id="ViewSection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator27"> + <object class="GtkSeparator" id="separator24"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -6071,21 +6242,21 @@ </packing> </child> <child> - <object class="GtkBox" id="Section9"> + <object class="GtkBox" id="Section8"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom9"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom8"> <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="SpellingAndGrammarDialog"> + <object class="GtkToolButton" id="FreezePanes"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="action_name">.uno:SpellingAndGrammarDialog</property> + <property name="action_name">.uno:FreezePanes</property> </object> <packing> <property name="expand">False</property> @@ -6093,10 +6264,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="InsertAnnotation"> + <object class="GtkToolButton" id="PrintPreview"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:InsertAnnotation</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PrintPreview</property> </object> <packing> <property name="expand">False</property> @@ -6104,14 +6275,14 @@ </packing> </child> <child> - <object class="GtkToolButton" id="TraceChangeMode"> + <object class="GtkToolButton" id="Zoom2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:TraceChangeMode</property> + <property name="action_name">.uno:Zoom</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -6122,20 +6293,18 @@ </packing> </child> <child> - <object class="GtkBox" id="box14"> + <object class="GtkBox" id="box10"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="reviewb:MenuReview"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|reviewb">_Review</property> + <object class="svtlo-ManagedMenuButton" id="viewb:MenuView"> + <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="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> @@ -6157,6 +6326,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-1"/> + </style> </object> <packing> <property name="expand">False</property> @@ -6166,7 +6338,7 @@ </child> <style> <class name="context-Cell"/> - <class name="context-Default"/> + <class name="context-default"/> <class name="context-Empty"/> <class name="context-EditCell"/> </style> @@ -6178,13 +6350,10 @@ </packing> </child> <child> - <placeholder/> - </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> @@ -6273,11 +6442,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> @@ -6323,7 +6492,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> @@ -6378,11 +6547,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|colorb">C_olor</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> @@ -6459,7 +6628,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> @@ -6552,6 +6721,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> </object> <packing> <property name="expand">False</property> @@ -6560,7 +6732,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> @@ -6718,11 +6890,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|arrange">_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> @@ -6793,6 +6965,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-2"/> + </style> </object> <packing> <property name="expand">False</property> @@ -6801,7 +6976,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> @@ -6879,11 +7054,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> @@ -6905,6 +7080,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-1"/> + </style> </object> <packing> <property name="expand">False</property> @@ -6919,14 +7097,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> - <object class="sfxlo-PriorityHBox" id="ReviewContainer"> + <placeholder/> + </child> + <child> + <object class="sfxlo-PriorityMergedHBox" id="ReviewContainer"> <property name="can_focus">False</property> <child> - <object class="sfxlo-DropdownBox" id="LanguageSection"> + <object class="sfxlo-OptionalBox" id="LanguageSection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> @@ -7000,11 +7181,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|languageb">_Language</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> @@ -7019,6 +7200,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> </object> <packing> <property name="expand">False</property> @@ -7027,7 +7211,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="ReviewSectio"> + <object class="sfxlo-OptionalBox" id="ReviewSectio"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> @@ -7127,11 +7311,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|revieb">_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> @@ -7188,23 +7372,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom19"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="valign">end</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <property name="icon_size">3</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="sfxlo-DropdownBox" id="CommentsSection"> + <object class="sfxlo-OptionalBox" id="CommentsSection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> @@ -7278,11 +7446,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|commentsb">_Comments</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> @@ -7305,7 +7473,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="FilesSectionsRev"> + <object class="sfxlo-OptionalBox" id="FilesSectionsRev"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> @@ -7379,11 +7547,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|compareb">Com_pare</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> @@ -7398,6 +7566,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-2"/> + </style> </object> <packing> <property name="expand">False</property> @@ -7406,7 +7577,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> @@ -7480,10 +7651,10 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewA">_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="relief">none</property> <property name="use_underline">True</property> + <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -7498,6 +7669,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-1"/> + </style> </object> <packing> <property name="expand">False</property> @@ -7516,10 +7690,10 @@ </packing> </child> <child> - <object class="sfxlo-PriorityHBox" id="DrawContainer"> + <object class="sfxlo-PriorityMergedHBox" id="DrawContainer"> <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> @@ -7654,10 +7828,10 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|editdrawb">_Styles</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> @@ -7725,7 +7899,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> @@ -7871,10 +8045,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> @@ -7953,7 +8127,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> @@ -8062,10 +8236,10 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|arrangeD">_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="relief">none</property> <property name="use_underline">True</property> + <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -8087,6 +8261,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-4"/> + </style> </object> <packing> <property name="expand">False</property> @@ -8095,7 +8272,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> @@ -8172,10 +8349,10 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|Grid">_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> @@ -8197,6 +8374,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> </object> <packing> <property name="expand">False</property> @@ -8205,7 +8385,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="GroupSection2"> + <object class="sfxlo-OptionalBox" id="GroupSection2"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -8282,10 +8462,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> @@ -8307,6 +8487,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-2"/> + </style> </object> <packing> <property name="expand">False</property> @@ -8315,7 +8498,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="3DSection"> + <object class="sfxlo-OptionalBox" id="3DSection"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -8391,10 +8574,10 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|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="relief">none</property> <property name="use_underline">True</property> + <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -8454,6 +8637,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-1"/> + </style> </object> <packing> <property name="expand">False</property> @@ -8472,10 +8658,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="EditSection1"> + <object class="sfxlo-OptionalBox" id="EditSection1"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -8575,11 +8761,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> @@ -8637,7 +8823,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> @@ -8783,10 +8969,10 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|arrangeO">_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="relief">none</property> <property name="use_underline">True</property> + <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -8808,6 +8994,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> </object> <packing> <property name="expand">False</property> @@ -8816,7 +9005,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> <child> @@ -8893,10 +9082,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> @@ -8918,6 +9107,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-2"/> + </style> </object> <packing> <property name="expand">False</property> @@ -8926,7 +9118,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> @@ -9004,10 +9196,10 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewO">_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="relief">none</property> <property name="use_underline">True</property> + <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -9029,6 +9221,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-1"/> + </style> </object> <packing> <property name="expand">False</property> @@ -9048,10 +9243,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="StylesSection2"> + <object class="sfxlo-OptionalBox" id="StylesSection2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> @@ -9110,10 +9305,10 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphstyles">_Styles</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> @@ -9182,7 +9377,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> @@ -9286,10 +9481,10 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|formats">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> @@ -9393,6 +9588,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> </object> <packing> <property name="expand">False</property> @@ -9401,7 +9599,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> @@ -9559,10 +9757,10 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphS">_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> @@ -9633,6 +9831,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-2"/> + </style> </object> <packing> <property name="expand">False</property> @@ -9641,7 +9842,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> @@ -9718,10 +9919,10 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewS">_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="relief">none</property> <property name="use_underline">True</property> + <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -9743,6 +9944,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-1"/> + </style> </object> <packing> <property name="expand">False</property> @@ -9765,156 +9969,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="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">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/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui index 5aee0e4c72fc..f5a9ef471a02 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui @@ -4522,6 +4522,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="FunctionDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FunctionDialog</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> @@ -4589,11 +4787,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> @@ -4652,7 +4850,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> @@ -4812,11 +5025,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> @@ -4875,7 +5088,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> @@ -4884,11 +5097,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="SectionStyle"> + <object class="sfxlo-OptionalBox" id="SectionStyle"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -5009,11 +5222,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphstyleb">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="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> @@ -5069,6 +5282,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-8"/> + </style> </object> <packing> <property name="expand">False</property> @@ -5077,7 +5293,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="SectionFont"> + <object class="sfxlo-OptionalBox" id="SectionFont"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -5281,11 +5497,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|formatb">F_ont</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> @@ -5372,7 +5588,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="SectionNumber"> + <object class="sfxlo-OptionalBox" id="SectionNumber"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -5529,10 +5745,10 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|numberb">_Number</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> @@ -5561,6 +5777,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-7"/> + </style> </object> <packing> <property name="expand">False</property> @@ -5569,7 +5788,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="SectionAlignment"> + <object class="sfxlo-OptionalBox" id="SectionAlignment"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -5741,11 +5960,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphb">_Alignment</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> @@ -5774,6 +5993,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-6"/> + </style> </object> <packing> <property name="expand">False</property> @@ -5782,7 +6004,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="SectionCell"> + <object class="sfxlo-OptionalBox" id="SectionCell"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -5980,10 +6202,10 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|cellb">_Cells</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> @@ -6029,6 +6251,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-5"/> + </style> </object> <packing> <property name="expand">False</property> @@ -6037,7 +6262,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> <child> @@ -6154,11 +6379,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|insertb">_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> @@ -6187,6 +6412,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-4"/> + </style> </object> <packing> <property name="expand">False</property> @@ -6195,7 +6423,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="SectionData"> + <object class="sfxlo-OptionalBox" id="SectionData"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -6325,10 +6553,10 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|datab">_Data</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="focus_on_click">False</property> <property name="receives_default">False</property> <property name="relief">none</property> <property name="use_underline">True</property> + <property name="focus_on_click">False</property> <property name="yalign">0.49000000953674316</property> </object> <packing> @@ -6358,6 +6586,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> </object> <packing> <property name="expand">False</property> @@ -6366,15 +6597,15 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="SectionView"> + <object class="sfxlo-OptionalBox" id="SectionReview"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkBox" id="horizontal12"> + <object class="GtkBox" id="horizontal11"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator11"> + <object class="GtkSeparator" id="separator10"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -6387,27 +6618,27 @@ </packing> </child> <child> - <object class="GtkBox" id="vertical12"> + <object class="GtkBox" id="vertical11"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box17"> + <object class="GtkBox" id="box16"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first11"> + <object class="sfxlo-NotebookbarToolBox" id="first10"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Zoom"> + <object class="GtkToolButton" id="InsertAnnotation1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Zoom</property> + <property name="action_name">.uno:InsertAnnotation</property> </object> <packing> <property name="expand">False</property> @@ -6417,58 +6648,43 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="first14"> - <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> - </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="fill">False</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="box18"> + <object class="GtkBox" id="box15"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="second11"> + <object class="sfxlo-NotebookbarToolBox" id="second14"> <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="FreezePanes"> + <object class="GtkToolButton" id="TraceChangeMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FreezePanes</property> + <property name="action_name">.uno:TraceChangeMode</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> - <object class="GtkToolButton" id="SplitWindow"> + <object class="GtkToolButton" id="SpellingAndGrammarDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SplitWindow</property> + <property name="action_name">.uno:SpellingAndGrammarDialog</property> </object> <packing> <property name="expand">False</property> @@ -6476,10 +6692,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="PrintPreview"> + <object class="GtkToolButton" id="Protect2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:PrintPreview</property> + <property name="action_name">.uno:Protect</property> </object> <packing> <property name="expand">False</property> @@ -6489,7 +6705,7 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> @@ -6501,19 +6717,19 @@ </packing> </child> <child> - <object class="GtkBox" id="box20"> + <object class="GtkBox" id="box19"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="viewb:MenuView"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewb">_View</property> + <object class="svtlo-ManagedMenuButton" id="reviewb:MenuReview"> + <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> @@ -6542,6 +6758,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-2"/> + </style> </object> <packing> <property name="expand">False</property> @@ -6550,15 +6769,15 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="SectionReview"> + <object class="sfxlo-OptionalBox" id="SectionView"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkBox" id="horizontal11"> + <object class="GtkBox" id="horizontal12"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator10"> + <object class="GtkSeparator" id="separator11"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -6571,27 +6790,27 @@ </packing> </child> <child> - <object class="GtkBox" id="vertical11"> + <object class="GtkBox" id="vertical12"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box16"> + <object class="GtkBox" id="box17"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first10"> + <object class="sfxlo-NotebookbarToolBox" id="first11"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="InsertAnnotation1"> + <object class="GtkToolButton" id="Zoom"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertAnnotation</property> + <property name="action_name">.uno:Zoom</property> </object> <packing> <property name="expand">False</property> @@ -6601,43 +6820,58 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first14"> + <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> + </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">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="box15"> + <object class="GtkBox" id="box18"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="second14"> + <object class="sfxlo-NotebookbarToolBox" id="second11"> <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="TraceChangeMode"> + <object class="GtkToolButton" id="FreezePanes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:TraceChangeMode</property> + <property name="action_name">.uno:FreezePanes</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="SpellingAndGrammarDialog"> + <object class="GtkToolButton" id="SplitWindow"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SpellingAndGrammarDialog</property> + <property name="action_name">.uno:SplitWindow</property> </object> <packing> <property name="expand">False</property> @@ -6645,10 +6879,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Protect2"> + <object class="GtkToolButton" id="PrintPreview"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Protect</property> + <property name="action_name">.uno:PrintPreview</property> </object> <packing> <property name="expand">False</property> @@ -6658,7 +6892,7 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -6670,19 +6904,19 @@ </packing> </child> <child> - <object class="GtkBox" id="box19"> + <object class="GtkBox" id="box20"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="reviewb:MenuReview"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_full|reviewb">_Review</property> + <object class="svtlo-ManagedMenuButton" id="viewb:MenuView"> + <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> @@ -6711,6 +6945,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-1"/> + </style> </object> <packing> <property name="expand">False</property> @@ -6720,7 +6957,7 @@ </child> <style> <class name="context-Cell"/> - <class name="context-Default"/> + <class name="context-default"/> <class name="context-Empty"/> <class name="context-EditCell"/> </style> @@ -6732,10 +6969,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> @@ -6900,11 +7137,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> @@ -6968,7 +7205,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="SectionArrange"> + <object class="sfxlo-OptionalBox" id="SectionArrange"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -7252,11 +7489,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrange">_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> @@ -7313,6 +7550,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> </object> <packing> <property name="expand">False</property> @@ -7321,7 +7561,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> @@ -7402,11 +7642,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|colorb">C_olor</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> @@ -7551,6 +7791,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-2"/> + </style> </object> <packing> <property name="expand">False</property> @@ -7559,7 +7802,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="SectionGraphic1"> + <object class="sfxlo-OptionalBox" id="SectionGraphic1"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -7654,11 +7897,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|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> @@ -7687,6 +7930,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-1"/> + </style> </object> <packing> <property name="expand">False</property> @@ -7708,10 +7954,10 @@ <placeholder/> </child> <child> - <object class="sfxlo-PriorityHBox" id="AnnotationBox"> + <object class="sfxlo-PriorityMergedHBox" id="AnnotationBox"> <property name="can_focus">False</property> <child> - <object class="sfxlo-DropdownBox" id="SectionLanguage"> + <object class="sfxlo-OptionalBox" id="SectionLanguage"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -7791,11 +8037,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|languageb">_Language</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> @@ -7817,6 +8063,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> </object> <packing> <property name="expand">False</property> @@ -7825,7 +8074,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="SectionReviews"> + <object class="sfxlo-OptionalBox" id="SectionReviews"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -8017,11 +8266,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|revieb">_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> @@ -8096,7 +8345,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="SectionComments"> + <object class="sfxlo-OptionalBox" id="SectionComments"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -8230,11 +8479,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|commentsb">_Comments</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> @@ -8298,7 +8547,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="SectionCompare"> + <object class="sfxlo-OptionalBox" id="SectionCompare"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -8433,11 +8682,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|compareb">Com_pare</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> @@ -8466,6 +8715,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-2"/> + </style> </object> <packing> <property name="expand">False</property> @@ -8474,7 +8726,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="SectionView3"> + <object class="sfxlo-OptionalBox" id="SectionView3"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -8632,11 +8884,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewa">_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> @@ -8691,6 +8943,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-1"/> + </style> </object> <packing> <property name="expand">False</property> @@ -8709,10 +8964,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="SectionDraw"> + <object class="sfxlo-OptionalBox" id="SectionDraw"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -9075,11 +9330,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> @@ -9143,7 +9398,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> @@ -9446,11 +9701,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> @@ -9528,6 +9783,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-4"/> + </style> </object> <packing> <property name="expand">False</property> @@ -9536,7 +9794,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="SectionArrang"> + <object class="sfxlo-OptionalBox" id="SectionArrang"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -9784,11 +10042,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> @@ -9846,6 +10104,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-4"/> + </style> </object> <packing> <property name="expand">False</property> @@ -9854,7 +10115,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> @@ -9949,11 +10210,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|GridDrawB">_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> @@ -9982,6 +10243,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> </object> <packing> <property name="expand">False</property> @@ -9990,7 +10254,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> @@ -10148,11 +10412,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> @@ -10181,6 +10445,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-2"/> + </style> </object> <packing> <property name="expand">False</property> @@ -10189,7 +10456,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> @@ -10298,11 +10565,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> @@ -10369,6 +10636,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-1"/> + </style> </object> <packing> <property name="expand">False</property> @@ -10387,10 +10657,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="SectionFormat1"> + <object class="sfxlo-OptionalBox" id="SectionFormat1"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -10606,11 +10876,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|formatd">F_ont</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> @@ -10721,7 +10991,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> @@ -10872,11 +11142,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphTextb">_Alignment</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> @@ -10905,6 +11175,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> </object> <packing> <property name="expand">False</property> @@ -11071,11 +11344,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewd">_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> @@ -11130,6 +11403,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-2"/> + </style> </object> <packing> <property name="expand">False</property> @@ -11222,11 +11498,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|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> @@ -11282,6 +11558,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-1"/> + </style> </object> <packing> <property name="expand">False</property> @@ -11300,10 +11579,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="SectionAlignment1"> + <object class="sfxlo-OptionalBox" id="SectionAlignment1"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -11364,11 +11643,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> @@ -11436,6 +11715,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-1"/> + </style> </object> <packing> <property name="expand">False</property> @@ -11454,10 +11736,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="SectionGraphic2"> + <object class="sfxlo-OptionalBox" id="SectionGraphic2"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -11602,11 +11884,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|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> @@ -11670,7 +11952,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="SectionArrange1"> + <object class="sfxlo-OptionalBox" id="SectionArrange1"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -12033,11 +12315,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrageOLE">_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> @@ -12094,6 +12376,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> </object> <packing> <property name="expand">False</property> @@ -12102,7 +12387,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="SectionGraphic3"> + <object class="sfxlo-OptionalBox" id="SectionGraphic3"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -12197,11 +12482,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|OleGridB">_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> @@ -12230,6 +12515,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-2"/> + </style> </object> <packing> <property name="expand">False</property> @@ -12238,7 +12526,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> @@ -12396,11 +12684,11 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewf">_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> @@ -12455,6 +12743,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-1"/> + </style> </object> <packing> <property name="expand">False</property> @@ -12475,219 +12766,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="FunctionDialog"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FunctionDialog</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> |