diff options
| author | andreas kainz <kainz.a@gmail.com> | 2018-11-19 01:29:01 +0100 |
|---|---|---|
| committer | andreas_kainz <kainz.a@gmail.com> | 2018-11-19 14:02:14 +0100 |
| commit | 45e9d8b093ee3815ed1d02b31d8b9421f977c0cb (patch) | |
| tree | f7c36242e0f16ae81b9d966b4154e844f7af9c25 | |
| parent | f1a02fdd43615a4016dc1f2cf44e32c001c36549 (diff) | |
NB calc groupedbar compact big update and sync
Change-Id: I2c9babfd06694c319b387c53613f178e2ea538f8
Reviewed-on: https://gerrit.libreoffice.org/63557
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
| -rw-r--r-- | sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui | 4523 |
1 files changed, 3151 insertions, 1372 deletions
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui index 10c7f4d580ce..3318e8cc30ef 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.22.1 --> <interface domain="sc"> <requires lib="gtk+" version="3.18"/> <requires lib="LibreOffice" version="1.0"/> @@ -2470,6 +2470,57 @@ </object> </child> </object> + <object class="GtkMenu" id="MenuPrint"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="MenuPrint-PreviousPage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PreviousPage</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuPrint-NextPage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NextPage</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuPrint-separator1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuPrint-PageFormatDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PageFormatDialog</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuPrint-separator2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuPrint-Print"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Print</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuPrint-ClosePreview"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ClosePreview</property> + </object> + </child> + </object> <object class="GtkMenu" id="MenuReference"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -3671,12 +3722,12 @@ <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> - <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -3727,10 +3778,10 @@ <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> - <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -3779,7 +3830,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Open"> + <object class="GtkMenuToolButton" id="File-Open"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Open</property> @@ -3790,7 +3841,7 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="Save"> + <object class="GtkMenuToolButton" id="File-Save"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Save</property> @@ -3800,6 +3851,17 @@ <property name="homogeneous">True</property> </packing> </child> + <child> + <object class="GtkToolButton" id="File-Print"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Print</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -3816,12 +3878,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> @@ -3838,17 +3900,6 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <property name="icon_size">1</property> - <child> - <object class="GtkToolButton" id="Print"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Print</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -3971,12 +4022,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> @@ -4052,7 +4103,7 @@ <object class="sfxlo-PriorityMergedHBox" id="DefaultContainer"> <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="StylesSection"> + <object class="sfxlo-OptionalBox" id="Default-Section-Styles"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> @@ -4081,21 +4132,21 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="FormatPaintbrush"> + <object class="GtkMenuToolButton" id="Default-ConditionalFormatMenu"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatPaintbrush</property> + <property name="action_name">.uno:ConditionalFormatMenu</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="ResetAttributes"> + <object class="GtkToolButton" id="Default-FormatPaintbrush"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ResetAttributes</property> + <property name="action_name">.uno:FormatPaintbrush</property> </object> <packing> <property name="expand">False</property> @@ -4103,14 +4154,14 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="ConditionalFormatMenu"> + <object class="GtkToolButton" id="Default-ResetAttributes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ConditionalFormatMenu</property> + <property name="action_name">.uno:ResetAttributes</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -4125,14 +4176,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="paragraphstyleb:MenuStyle"> + <object class="svtlo-ManagedMenuButton" id="Default-Style:MenuStyle"> <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> @@ -4140,23 +4191,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="opacity">0.92000000000000004</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> - </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> @@ -4182,7 +4216,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FontSection"> + <object class="sfxlo-OptionalBox" id="Default-Section-Font"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> @@ -4216,7 +4250,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="CharFontName"> + <object class="GtkToolButton" id="Default-CharFontName"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> @@ -4242,7 +4276,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="FontHeight"> + <object class="GtkToolButton" id="Default-FontHeight"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="action_name">.uno:FontHeight</property> @@ -4253,14 +4287,14 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="BackColor"> + <object class="GtkMenuToolButton" id="Default-Color"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BackgroundColor</property> + <property name="action_name">.uno:Color</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -4282,14 +4316,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="formatb:MenuFormat"> + <object class="svtlo-ManagedMenuButton" id="Default-Font:MenuFormat"> <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> @@ -4307,7 +4341,7 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="Bold"> + <object class="GtkToolButton" id="Default-Bold"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Bold</property> @@ -4318,7 +4352,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Italic"> + <object class="GtkToolButton" id="Default-Italic"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Italic</property> @@ -4329,7 +4363,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Underline"> + <object class="GtkToolButton" id="Default-Underline"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Underline</property> @@ -4340,7 +4374,7 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="bordertype"> + <object class="GtkMenuToolButton" id="Default-SetBoarderStyle"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -4354,14 +4388,14 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="fontcolor3"> + <object class="GtkMenuToolButton" id="Default-BackgroundColor"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Color</property> + <property name="action_name">.uno:BackgroundColor</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -4393,12 +4427,12 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="NumberSection"> + <object class="sfxlo-OptionalBox" id="Default-Section-Paragraph"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator151"> + <object class="GtkSeparator" id="separator6"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -4411,62 +4445,47 @@ </packing> </child> <child> - <object class="GtkBox" id="Section40"> + <object class="GtkBox" id="Section5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box53"> + <object class="GtkBox" id="box13"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom36"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="NumberFormatCurrency"> + <object class="GtkToolButton" id="Default-AlignLeft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:NumberFormatCurrency</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="NumberFormatPercent"> - <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="hexpand">True</property> - <property name="action_name">.uno:NumberFormatPercent</property> + <property name="action_name">.uno:AlignLeft</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="NumberFormatDecimal"> + <object class="GtkToolButton" id="Default-AlignHorizontalCenter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="hexpand">True</property> - <property name="action_name">.uno:NumberFormatDecimal</property> + <property name="action_name">.uno:AlignHorizontalCenter</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="NumberFormatIncDecimals1"> + <object class="GtkToolButton" id="Default-AlignRight"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:NumberFormatIncDecimals</property> + <property name="action_name">.uno:AlignRight</property> </object> <packing> <property name="expand">False</property> @@ -4474,10 +4493,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="NumberFormatDecDecimals1"> + <object class="GtkToolButton" id="Default-AlignBlock"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:NumberFormatDecDecimals</property> + <property name="action_name">.uno:AlignBlock</property> </object> <packing> <property name="expand">False</property> @@ -4486,100 +4505,39 @@ </child> </object> <packing> - <property name="expand">True</property> + <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">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box50"> - <property name="visible">True</property> - <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="numberb:MenuNumber"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|numberb">_Number</property> + <object class="GtkSeparator" id="separator102"> <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> + <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">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="padding">5</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">1</property> - </packing> - </child> - <style> - <class name="priority-7"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="AlignmentSection"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> - <child> - <object class="GtkSeparator" id="separator6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="Section5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkBox" id="box13"> - <property name="visible">True</property> - <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom2"> + <object class="sfxlo-NotebookbarToolBox" id="third5"> <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> <child> - <object class="GtkToolButton" id="AlignLeft1"> + <object class="GtkToolButton" id="Default-CommonAlignTop"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignLeft</property> + <property name="action_name">.uno:CommonAlignTop</property> </object> <packing> <property name="expand">False</property> @@ -4587,10 +4545,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="AlignHorizontalCenter1"> + <object class="GtkToolButton" id="Default-CommonAlignVerticalCenter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignHorizontalCenter</property> + <property name="action_name">.uno:CommonAlignVerticalCenter</property> </object> <packing> <property name="expand">False</property> @@ -4598,45 +4556,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="AlignRight1"> + <object class="GtkToolButton" id="Default-CommonAlignBottom"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignRight</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="AlignBlock"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AlignBlock</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="sfxlo-NotebookbarToolBox" id="SectionBottom35"> - <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="WrapText"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:WrapText</property> + <property name="action_name">.uno:CommonAlignBottom</property> </object> <packing> <property name="expand">False</property> @@ -4662,14 +4585,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="paragraphb:MenuParagraph"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphb">_Alignment</property> + <object class="svtlo-ManagedMenuButton" id="Default-Paragraph:MenuParagraph"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphb">_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> @@ -4687,7 +4610,7 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="IncrementIndent"> + <object class="GtkToolButton" id="Default-IncrementIndent"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:IncrementIndent</property> @@ -4697,6 +4620,30 @@ <property name="homogeneous">True</property> </packing> </child> + <child> + <object class="GtkToolButton" id="Default-WrapText"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:WrapText</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-ToggleMergeCells"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:ToggleMergeCells</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -4725,11 +4672,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="CellSection"> + <object class="sfxlo-OptionalBox" id="Default-Section-Cell"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> @@ -4747,7 +4694,7 @@ </packing> </child> <child> - <object class="GtkBox" id="Section7"> + <object class="GtkBox" id="box42"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -4758,13 +4705,10 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="InsertColumnsBefore1"> + <object class="GtkToolButton" id="Table-InsertColumnsBefore"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="has_tooltip">True</property> - <property name="is_important">True</property> <property name="action_name">.uno:InsertColumnsBefore</property> - <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -4772,13 +4716,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="InsertRowsBefore1"> + <object class="GtkToolButton" id="Table-InsertColumnsAfter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="has_tooltip">True</property> - <property name="is_important">True</property> - <property name="action_name">.uno:InsertRowsBefore</property> - <property name="use_underline">True</property> + <property name="action_name">.uno:InsertColumnsAfter</property> </object> <packing> <property name="expand">False</property> @@ -4786,13 +4727,35 @@ </packing> </child> <child> - <object class="GtkToolButton" id="DeleteColumns1"> + <object class="GtkToolButton" id="Table-DeleteColumns"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="has_tooltip">True</property> - <property name="is_important">True</property> <property name="action_name">.uno:DeleteColumns</property> - <property name="use_underline">True</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="sfxlo-NotebookbarToolBox" id="ExtTop14"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="opacity">0.92156862745098034</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Table-InsertRowsBefore"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertRowsBefore</property> </object> <packing> <property name="expand">False</property> @@ -4800,13 +4763,21 @@ </packing> </child> <child> - <object class="GtkToolButton" id="DeleteRows1"> + <object class="GtkToolButton" id="Table-InsertRowsAfter"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertRowsAfter</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-DeleteRows"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="has_tooltip">True</property> - <property name="is_important">True</property> <property name="action_name">.uno:DeleteRows</property> - <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -4817,46 +4788,100 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</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> + <style> + <class name="priority-5"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Default-Section-Number"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkSeparator" id="separator151"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="Section40"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box51"> + <object class="GtkBox" id="box53"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="cellb:MenuCell"> - <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="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">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop10"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom36"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="opacity">0.92156862745098034</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="ToggleMergeCells"> + <object class="GtkMenuToolButton" id="Default-NumberFormatCurrency"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NumberFormatCurrency</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-NumberFormatDecimal"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">center</property> <property name="hexpand">True</property> - <property name="action_name">.uno:ToggleMergeCells</property> + <property name="action_name">.uno:NumberFormatDecimal</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-NumberFormatIncDecimals"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NumberFormatIncDecimals</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-NumberFormatDecDecimals"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NumberFormatDecDecimals</property> </object> <packing> <property name="expand">False</property> @@ -4865,9 +4890,36 @@ </child> </object> <packing> + <property name="expand">True</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">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box50"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Default-Number:MenuNumber"> + <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> + </object> + <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> </object> @@ -4885,7 +4937,7 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-7"/> </style> </object> <packing> @@ -4895,12 +4947,12 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="InsertSection"> + <object class="sfxlo-OptionalBox" id="Default-Section-Data"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator18"> + <object class="GtkSeparator" id="separator141"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -4913,21 +4965,21 @@ </packing> </child> <child> - <object class="GtkBox" id="Section6"> + <object class="GtkBox" id="Section41"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom6"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom39"> <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="InsertObjectChart"> + <object class="GtkToolButton" id="Default-DataDataPilotRun"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertObjectChart</property> + <property name="action_name">.uno:DataDataPilotRun</property> </object> <packing> <property name="expand">False</property> @@ -4935,10 +4987,11 @@ </packing> </child> <child> - <object class="GtkToolButton" id="InsertGraphic"> + <object class="GtkToolButton" id="Default-DataFilterAutoFilter"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:InsertGraphic</property> + <property name="can_focus">False</property> + <property name="has_tooltip">True</property> + <property name="action_name">.uno:DataFilterAutoFilter</property> </object> <packing> <property name="expand">False</property> @@ -4946,10 +4999,11 @@ </packing> </child> <child> - <object class="GtkToolButton" id="CharmapControl"> + <object class="GtkToolButton" id="Default-SortAscending"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CharmapControl</property> + <property name="has_tooltip">True</property> + <property name="action_name">.uno:SortAscending</property> </object> <packing> <property name="expand">False</property> @@ -4964,20 +5018,18 @@ </packing> </child> <child> - <object class="GtkBox" id="box44"> + <object class="GtkBox" id="box52"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="insertb:MenuInsert"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|insertb">_Insert</property> + <object class="svtlo-ManagedMenuButton" id="Default-Data:MenuData"> + <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="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> @@ -4985,22 +5037,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop6"> - <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> - </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> @@ -5016,7 +5052,7 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-3"/> </style> </object> <packing> @@ -5026,12 +5062,12 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DataSection"> + <object class="sfxlo-OptionalBox" id="Default-Section-Insert"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator141"> + <object class="GtkSeparator" id="separator18"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -5044,21 +5080,21 @@ </packing> </child> <child> - <object class="GtkBox" id="Section41"> + <object class="GtkBox" id="Section6"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom39"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom6"> <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="DataDataPilotRun"> + <object class="GtkToolButton" id="Default-InsertObjectChart"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DataDataPilotRun</property> + <property name="action_name">.uno:InsertObjectChart</property> </object> <packing> <property name="expand">False</property> @@ -5066,11 +5102,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="DataFilterAutoFilter"> + <object class="GtkToolButton" id="Default-InsertGraphic"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="has_tooltip">True</property> - <property name="action_name">.uno:DataFilterAutoFilter</property> + <property name="can_focus">True</property> + <property name="action_name">.uno:InsertGraphic</property> </object> <packing> <property name="expand">False</property> @@ -5078,11 +5113,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="SortAscending"> + <object class="GtkToolButton" id="Default-CharmapControl"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="has_tooltip">True</property> - <property name="action_name">.uno:SortAscending</property> + <property name="action_name">.uno:CharmapControl</property> </object> <packing> <property name="expand">False</property> @@ -5097,19 +5131,20 @@ </packing> </child> <child> - <object class="GtkBox" id="box52"> + <object class="GtkBox" id="box44"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="datab:MenuData"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|datab">_Data</property> + <object class="svtlo-ManagedMenuButton" id="Default-Insert:MenuInsert"> + <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> - <property name="yalign">0.49000000953674316</property> </object> <packing> <property name="expand">False</property> @@ -5132,7 +5167,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-4"/> </style> </object> <packing> @@ -5142,7 +5177,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ReviewSection"> + <object class="sfxlo-OptionalBox" id="Default-Section-Review"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> @@ -5171,7 +5206,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="SpellingAndGrammarDialog"> + <object class="GtkToolButton" id="Default-SpellingAndGrammarDialog"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="action_name">.uno:SpellingAndGrammarDialog</property> @@ -5182,7 +5217,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="InsertAnnotation"> + <object class="GtkToolButton" id="Default-InsertAnnotation"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="action_name">.uno:InsertAnnotation</property> @@ -5193,7 +5228,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="TraceChangeMode"> + <object class="GtkToolButton" id="Default-TraceChangeMode"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:TraceChangeMode</property> @@ -5215,16 +5250,16 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="reviewb:MenuReview"> + <object class="svtlo-ManagedMenuButton" id="Default-Review: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> @@ -5257,7 +5292,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ViewSection"> + <object class="sfxlo-OptionalBox" id="Default-Section-View"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> @@ -5286,7 +5321,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="FreezePanes"> + <object class="GtkToolButton" id="Default-FreezePanes"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="action_name">.uno:FreezePanes</property> @@ -5297,7 +5332,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="PrintPreview"> + <object class="GtkToolButton" id="Default-PrintPreview"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:PrintPreview</property> @@ -5308,7 +5343,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Zoom2"> + <object class="GtkToolButton" id="Default-Zoom"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Zoom</property> @@ -5330,14 +5365,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="viewb:MenuView"> + <object class="svtlo-ManagedMenuButton" id="Default-View: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="relief">none</property> <property name="use_underline">True</property> - <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -5383,15 +5418,17 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="GraphicContainer"> + <placeholder/> + </child> + <child> + <object class="sfxlo-PriorityMergedHBox" id="DrawTextContainer"> <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="GraphicSection"> + <object class="sfxlo-OptionalBox" id="DrawText-Section-Styles"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator14"> + <object class="GtkSeparator" id="separator109"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -5404,35 +5441,21 @@ </packing> </child> <child> - <object class="GtkBox" id="Section18"> + <object class="GtkBox" id="Section7"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom20"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom14"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">end</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="InsertCaptionDialog4"> + <object class="GtkMenuToolButton" id="DrawText-ConditionalFormatMenu"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="action_name">.uno:ObjectTitleDescription</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Crop"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:Crop</property> + <property name="action_name">.uno:ConditionalFormatMenu</property> </object> <packing> <property name="expand">False</property> @@ -5440,25 +5463,25 @@ </packing> </child> <child> - <object class="GtkToolButton" id="CompressGraphic"> + <object class="GtkToolButton" id="DrawText-FormatPaintbrush"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:CompressGraphic</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatPaintbrush</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="FlipHorizontal"> + <object class="GtkToolButton" id="DrawText-ResetAttributes"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:FlipHorizontal</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ResetAttributes</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -5469,19 +5492,18 @@ </packing> </child> <child> - <object class="GtkBox" id="box5"> + <object class="GtkBox" id="box39"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="graphicB:MenuGraphic"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|graphicB">_Graphic</property> + <object class="svtlo-ManagedMenuButton" id="DrawText-Style:MenuStyle"> + <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="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> @@ -5489,35 +5511,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop5"> - <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="TransformDialog3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="action_name">.uno:TransformDialog</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -5532,6 +5525,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-8"/> + </style> </object> <packing> <property name="expand">False</property> @@ -5540,12 +5536,12 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ColorSection"> + <object class="sfxlo-OptionalBox" id="DrawText-Section-Font1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator15"> + <object class="GtkSeparator" id="separator110"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -5558,25 +5554,73 @@ </packing> </child> <child> - <object class="GtkBox" id="Section19"> + <object class="GtkBox" id="Section33"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom21"> + <object class="GtkBox" id="box51"> <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="FillStyle"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FillStyle</property> + <property name="hexpand">True</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="DrawText-CharFontName"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:CharFontName</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40"> + <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="DrawText-FontHeight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontHeight</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkMenuToolButton" id="DrawText-fontcolor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Color</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> @@ -5587,19 +5631,18 @@ </packing> </child> <child> - <object class="GtkBox" id="box24"> + <object class="GtkBox" id="box54"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="colorb:MenuColor"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|colorb">C_olor</property> + <object class="svtlo-ManagedMenuButton" id="DrawText-Font:MenuFormat1"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|FormatButton">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> @@ -5608,39 +5651,63 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom23"> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop8"> <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="FillShadow"> + <object class="GtkToolButton" id="DrawText-Bold1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FillShadow</property> + <property name="action_name">.uno:Bold</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="ColorSettings"> + <object class="GtkToolButton" id="DrawText-Italic1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ColorSettings</property> + <property name="action_name">.uno:Italic</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="XLineColor1"> + <object class="GtkToolButton" id="DrawText-Underline1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:XLineColor</property> + <property name="action_name">.uno:Underline</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="DrawText-Strikeout"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Strikeout</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkMenuToolButton" id="DrawText-CharBackColor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CharBackColor</property> </object> <packing> <property name="expand">False</property> @@ -5676,116 +5743,11 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ColorSectionExt"> + <object class="sfxlo-OptionalBox" id="DrawText-Section-Paragraph"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> - <child> - <object class="GtkBox" id="Ext12"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom18"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkMenuToolButton" id="GrafLuminance"> - <property name="width_request">130</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:GrafLuminance</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkMenuToolButton" id="GrafContrast"> - <property name="width_request">130</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:GrafContrast</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="sfxlo-NotebookbarToolBox" id="ExtTop12"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <property name="icon_size">1</property> - <child> - <object class="GtkMenuToolButton" id="GrafGamma"> - <property name="width_request">130</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:GrafGamma</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkMenuToolButton" id="GrafTransparence"> - <property name="width_request">130</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:GrafTransparence</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <style> - <class name="priority-3"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="ArrangeSection"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator17"> + <object class="GtkSeparator" id="separator139"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -5798,25 +5760,25 @@ </packing> </child> <child> - <object class="GtkBox" id="Section21"> + <object class="GtkBox" id="Section10"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box46"> + <object class="GtkBox" id="box4"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap5"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom1"> <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="BringToFront1"> + <object class="GtkToolButton" id="AlignLeft2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BringToFront</property> + <property name="action_name">.uno:AlignLeft</property> </object> <packing> <property name="expand">False</property> @@ -5824,10 +5786,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="ObjectForwardOne3"> + <object class="GtkToolButton" id="AlignHorizontalCenter2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> + <property name="action_name">.uno:AlignHorizontalCenter</property> </object> <packing> <property name="expand">False</property> @@ -5835,10 +5797,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="ObjectBackOne3"> + <object class="GtkToolButton" id="AlignRight2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> + <property name="action_name">.uno:AlignRight</property> </object> <packing> <property name="expand">False</property> @@ -5846,10 +5808,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="SendToBack"> + <object class="GtkToolButton" id="AlignBlock1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SendToBack</property> + <property name="action_name">.uno:AlignBlock</property> </object> <packing> <property name="expand">False</property> @@ -5864,7 +5826,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator144"> + <object class="GtkSeparator" id="separator150"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -5877,16 +5839,16 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align2"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom1"> <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="ObjectAlignLeft"> + <object class="GtkToolButton" id="CellVertTop"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectAlignLeft</property> + <property name="action_name">.uno:CellVertTop</property> </object> <packing> <property name="expand">False</property> @@ -5894,10 +5856,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="AlignCenter"> + <object class="GtkToolButton" id="CellVertCenter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignCenter</property> + <property name="action_name">.uno:CellVertCenter</property> </object> <packing> <property name="expand">False</property> @@ -5905,10 +5867,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="ObjectAlignRight"> + <object class="GtkToolButton" id="CellVertBottom"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectAlignRight</property> + <property name="action_name">.uno:CellVertBottom</property> </object> <packing> <property name="expand">False</property> @@ -5930,28 +5892,27 @@ </packing> </child> <child> - <object class="GtkBox" id="box25"> + <object class="GtkBox" id="box6"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="arrange:MenuArrange"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|arrange">_Arrange</property> + <object class="svtlo-ManagedMenuButton" id="paragraphS:MenuParagraph"> + <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="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> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align1"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -5960,10 +5921,10 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="AlignDown"> + <object class="GtkToolButton" id="ParaspaceDecrease"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignDown</property> + <property name="action_name">.uno:ParaspaceDecrease</property> </object> <packing> <property name="expand">False</property> @@ -5971,19 +5932,30 @@ </packing> </child> <child> - <object class="GtkToolButton" id="AlignMiddle"> + <object class="GtkToolButton" id="ParaspaceIncrease"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignMiddle</property> + <property name="action_name">.uno:ParaspaceIncrease</property> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> + <child> + <object class="GtkMenuToolButton" id="LineSpacing"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineSpacing</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -6009,16 +5981,15 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="GridSection"> + <object class="sfxlo-OptionalBox" id="DrawText-Section-View"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator16"> + <object class="GtkSeparator" id="separator145"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -6031,47 +6002,46 @@ </packing> </child> <child> - <object class="GtkBox" id="Section12"> + <object class="GtkBox" id="Section11"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom37"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom10"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">end</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="GridVisible"> + <object class="GtkToolButton" id="FreezePanes1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:GridVisible</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FreezePanes</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="GridUse"> + <object class="GtkToolButton" id="PrintPreview3"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:GridUse</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PrintPreview</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="HelplinesMove"> + <object class="GtkToolButton" id="Zoom4"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:HelplinesMove</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Zoom</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -6083,19 +6053,18 @@ </packing> </child> <child> - <object class="GtkBox" id="box26"> + <object class="GtkBox" id="box17"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="GridB:MenuGrid"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridB">_Grid</property> + <object class="svtlo-ManagedMenuButton" id="viewS:MenuView"> + <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="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> @@ -6124,32 +6093,28 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">3</property> </packing> </child> <style> - <class name="context-Graphic"/> + <class name="context-DrawText"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> - <placeholder/> - </child> - <child> - <object class="sfxlo-PriorityMergedHBox" id="ReviewContainer"> + <object class="sfxlo-PriorityMergedHBox" id="DrawContainer"> <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="LanguageSection"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Edit"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator19"> + <object class="GtkSeparator" id="separator34"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -6162,48 +6127,58 @@ </packing> </child> <child> - <object class="GtkBox" id="Section22"> + <object class="GtkBox" id="Section29"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom22"> + <object class="GtkBox" id="box31"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">end</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="SpellingAndGrammarDialog1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:SpellingAndGrammarDialog</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="ThesaurusDialog1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:ThesaurusDialog</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="SpellOnline1"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom30"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:SpellOnline</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-ToggleObjectRotateMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ToggleObjectRotateMode</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FlipHorizontal"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlipHorizontal</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-ToggleObjectBezierMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ToggleObjectBezierMode</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> </object> @@ -6214,19 +6189,29 @@ </packing> </child> <child> - <object class="svtlo-ManagedMenuButton" id="languageb:MenuLanguage"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|languageb">_Language</property> + <object class="GtkBox" id="box30"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="relief">none</property> - <property name="use_underline">True</property> - <property name="focus_on_click">False</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Draw-Edit:MenuDrawEdit"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|editdrawb">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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -6237,9 +6222,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-3"/> - </style> </object> <packing> <property name="expand">False</property> @@ -6248,14 +6230,15 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ReviewSectio"> + <object class="sfxlo-OptionalBox" id="Draw-Section-FormatLineArea"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator20"> + <object class="GtkSeparator" id="separator26"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> <property name="orientation">vertical</property> </object> <packing> @@ -6266,69 +6249,146 @@ </packing> </child> <child> - <object class="GtkBox" id="Section23"> + <object class="GtkBox" id="box7"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom24"> + <object class="sfxlo-NotebookbarToolBox" id="third1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">end</property> - <property name="toolbar_style">icons</property> + <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="TrackChanges1"> + <object class="GtkToolButton" id="Draw-FormatLine"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:TrackChanges</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatLine</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</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="sfxlo-NotebookbarToolBox" id="third9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="PreviousTrackedChange"> + <object class="GtkToolButton" id="Draw-FormatArea"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:PreviousTrackedChange</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatArea</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box56"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkToolButton" id="NextTrackedChange"> + <object class="sfxlo-NotebookbarToolBox" id="first2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:NextTrackedChange</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Draw-XLineStyle"> + <property name="width_request">100</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:XLineStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkToolButton" id="AcceptTrackedChange"> + <object class="sfxlo-NotebookbarToolBox" id="first3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AcceptTrackedChange</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-XLineColor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:XLineColor</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">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="sfxlo-NotebookbarToolBox" id="SectionBottom12"> + <property name="width_request">200</property> + <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="RejectTrackedChange"> + <object class="GtkToolButton" id="Draw-FillStyle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:RejectTrackedChange</property> + <property name="action_name">.uno:FillStyle</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -6336,55 +6396,60 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</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> + <child> + <object class="GtkBox" id="box58"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box27"> + <object class="sfxlo-NotebookbarToolBox" id="first4"> <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="svtlo-ManagedMenuButton" id="revieb:MenuReviews"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|revieb">_Review</property> + <object class="GtkToolButton" id="Draw-LineEndStyle"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="relief">none</property> - <property name="use_underline">True</property> - <property name="focus_on_click">False</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineEndStyle</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="expand">True</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="sfxlo-NotebookbarToolBox" id="SectionBottom13"> + <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="sfxlo-NotebookbarToolBox" id="ExtTop20"> + <object class="GtkToolButton" id="Draw-FillShadow"> <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="AcceptTrackedChanges1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:AcceptTrackedChanges</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="action_name">.uno:FillShadow</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -6398,9 +6463,12 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> + <style> + <class name="priority-6"/> + </style> </object> <packing> <property name="expand">False</property> @@ -6409,12 +6477,12 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="CommentsSection"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Arrange"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator22"> + <object class="GtkSeparator" id="separator25"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -6427,48 +6495,128 @@ </packing> </child> <child> - <object class="GtkBox" id="Section24"> + <object class="GtkBox" id="Section16"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom26"> + <object class="GtkBox" id="box28"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">end</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="InsertAnnotation1"> + <object class="sfxlo-NotebookbarToolBox" id="arrange1"> <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="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-BringToFront"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BringToFront</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-ObjectForwardOne"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectForwardOne</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-ObjectBackOne"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectBackOne</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-SendToBack"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SendToBack</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkToolButton" id="ReplyComment"> + <object class="GtkSeparator" id="separator29"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:ReplyComment</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkToolButton" id="DeleteComment"> + <object class="sfxlo-NotebookbarToolBox" id="Align2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:DeleteComment</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-ObjectAlignLeft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignLeft</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-AlignCenter"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignCenter</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-ObjectAlignRight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignRight</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> </object> @@ -6479,19 +6627,79 @@ </packing> </child> <child> - <object class="svtlo-ManagedMenuButton" id="commentsb:MenuComments"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|commentsb">_Comments</property> + <object class="GtkBox" id="box32"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="relief">none</property> - <property name="use_underline">True</property> - <property name="focus_on_click">False</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Draw-Arrange:MenuArrange"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ArrangeButton">_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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align3"> + <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="Draw-AlignUp"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignUp</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-AlignDown"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignDown</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-AlignMiddle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignMiddle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</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">1</property> </packing> </child> @@ -6502,20 +6710,23 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-5"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FilesSectionsRev"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Draw"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator23"> + <object class="GtkSeparator" id="separator31"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -6528,48 +6739,121 @@ </packing> </child> <child> - <object class="GtkBox" id="Section25"> + <object class="GtkBox" id="Section26"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom27"> + <object class="GtkBox" id="box33"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">end</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="ProtectTraceChangeMode"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom19"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ProtectTraceChangeMode</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-Line"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Line</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-LineToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineToolbox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-ArrowsToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ArrowsToolbox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkToolButton" id="CompareDocuments1"> + <object class="GtkSeparator" id="separator33"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CompareDocuments</property> + <property name="halign">end</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="hexpand">True</property> + <property name="orientation">vertical</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkToolButton" id="MergeDocuments1"> + <object class="sfxlo-NotebookbarToolBox" id="shapes1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:MergeDocuments</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-BasicShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BasicShapes</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-SymbolShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SymbolShapes</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-ArrowShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ArrowShapes</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> </object> @@ -6580,15 +6864,74 @@ </packing> </child> <child> - <object class="svtlo-ManagedMenuButton" id="compareb:MenuCompare"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|compareb">Com_pare</property> + <object class="GtkBox" id="box47"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="relief">none</property> - <property name="use_underline">True</property> - <property name="focus_on_click">False</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Draw-Draw:MenuDraw"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|draw">_Shape</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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="shapes2"> + <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="icon_size">1</property> + <child> + <object class="GtkToolButton" id="Draw-StarShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:StarShapes</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-CalloutShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CalloutShapes</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FlowChartShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlowChartShapes</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -6604,7 +6947,7 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-4"/> </style> </object> <packing> @@ -6614,12 +6957,11 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ViewSection2"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Group"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator124"> + <object class="GtkSeparator" id="separator92"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -6632,21 +6974,22 @@ </packing> </child> <child> - <object class="GtkBox" id="Section20"> + <object class="GtkBox" id="Section27"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom38"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom25"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">end</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="ControlCodes1"> + <object class="GtkToolButton" id="Draw-FormatGroup"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ControlCodes</property> + <property name="action_name">.uno:FormatGroup</property> </object> <packing> <property name="expand">False</property> @@ -6654,10 +6997,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="PrintPreview1"> + <object class="GtkToolButton" id="Draw-EnterGroup"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:PrintPreview</property> + <property name="action_name">.uno:EnterGroup</property> </object> <packing> <property name="expand">False</property> @@ -6665,11 +7008,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Zoom1"> + <object class="GtkToolButton" id="Draw-LeaveGroup"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Zoom</property> - <property name="use_underline">True</property> + <property name="action_name">.uno:LeaveGroup</property> </object> <packing> <property name="expand">False</property> @@ -6684,14 +7026,25 @@ </packing> </child> <child> - <object class="svtlo-ManagedMenuButton" id="viewA:MenuView"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewA">_View</property> + <object class="GtkBox" id="box65"> <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> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Draw-Group:MenuGroup"> + <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> + </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> @@ -6707,7 +7060,7 @@ </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-2"/> </style> </object> <packing> @@ -6716,25 +7069,12 @@ <property name="position">5</property> </packing> </child> - <style> - <class name="context-Annotation"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="sfxlo-PriorityMergedHBox" id="DrawContainer"> - <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="EditSection"> + <object class="sfxlo-OptionalBox" id="Draw-Section-3d"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator29"> + <object class="GtkSeparator" id="separator93"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -6747,25 +7087,37 @@ </packing> </child> <child> - <object class="GtkBox" id="Section29"> + <object class="GtkBox" id="Section30"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box31"> + <object class="GtkBox" id="box62"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom30"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom46"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">end</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="SelectObject1"> + <object class="GtkMenuToolButton" id="Draw-ExtrusionToggle"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:SelectObject</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ExtrusionToggle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkMenuToolButton" id="Draw-FillColor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillColor</property> </object> <packing> <property name="expand">False</property> @@ -6773,10 +7125,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="ToggleObjectRotateMode"> + <object class="GtkMenuToolButton" id="Draw-Extrusion3DColor"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:ToggleObjectRotateMode</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Extrusion3DColor</property> </object> <packing> <property name="expand">False</property> @@ -6784,10 +7136,21 @@ </packing> </child> <child> - <object class="GtkToolButton" id="ToggleObjectBezierMode"> + <object class="GtkMenuToolButton" id="Draw-ExtrusionSurfaceFloater"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:ToggleObjectBezierMode</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ExtrusionSurfaceFloater</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-ExtrusionLightingFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ExtrusionLightingFloater</property> </object> <packing> <property name="expand">False</property> @@ -6801,30 +7164,47 @@ <property name="position">0</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="box49"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator148"> + <object class="svtlo-ManagedMenuButton" id="Draw-3D:Menu3D"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|3Db">3_D</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</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="padding">5</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom12"> + <object class="sfxlo-NotebookbarToolBox" id="third4"> <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="FlipHorizontal2"> + <object class="GtkToolButton" id="Draw-ExtrusionDepthFloater"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> + <property name="action_name">.uno:ExtrusionDepthFloater</property> </object> <packing> <property name="expand">False</property> @@ -6832,10 +7212,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="LineEndStyle1"> + <object class="GtkToolButton" id="Draw-ExtrusionDirectionFloater"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LineEndStyle</property> + <property name="action_name">.uno:ExtrusionDirectionFloater</property> </object> <packing> <property name="expand">False</property> @@ -6846,7 +7226,109 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</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">1</property> + </packing> + </child> + <style> + <class name="priority-1"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> + </child> + <style> + <class name="context-Draw"/> + <class name="context-DrawLine"/> + <class name="context-3DObject"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-PriorityMergedHBox" id="ImageContainer"> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-OptionalBox" id="Image-Section-Image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkSeparator" id="separator14"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="Section18"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom20"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">end</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Image-Crop"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Crop</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Image-CompressGraphic"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CompressGraphic</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Image-FlipHorizontal"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlipHorizontal</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -6857,53 +7339,175 @@ </packing> </child> <child> - <object class="GtkBox" id="box30"> + <object class="GtkBox" id="box5"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="editdrawb:MenuDrawEdit"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|editdrawb">_Styles</property> + <object class="svtlo-ManagedMenuButton" id="Image-Image:MenuGraphic"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ImageButton">_Image</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> - <property name="fill">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">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> + <child> + <object class="sfxlo-OptionalBox" id="Image-Section-FormatLineArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator15"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box45"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="third1"> + <object class="GtkToolButton" id="Image-Section-FormatLine"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatLine</property> + </object> + <packing> + <property name="expand">True</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="sfxlo-NotebookbarToolBox" id="third8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Image-Section-FormatArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatArea</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box19"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box20"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first41"> <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="XLineColor"> + <object class="GtkMenuToolButton" id="Image-Section-XLineStyle"> + <property name="width_request">100</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:XLineColor</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:XLineStyle</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</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="sfxlo-NotebookbarToolBox" id="first1"> + <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="GtkMenuToolButton" id="FillColor1"> + <object class="GtkToolButton" id="Image-Section-XLineColor"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:FillColor</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:XLineColor</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -6918,6 +7522,31 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom18"> + <property name="width_request">200</property> + <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="Image-Section-FillStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillStyle</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -6925,22 +7554,86 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box21"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first5"> + <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="Image-Section-LineEndStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineEndStyle</property> + </object> + <packing> + <property name="expand">True</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="sfxlo-NotebookbarToolBox" id="SectionBottom15"> + <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="Image-Section-FillShadow"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillShadow</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> </packing> </child> + <style> + <class name="priority-6"/> + </style> </object> <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="sfxlo-OptionalBox" id="DrawSelect"> + <object class="sfxlo-OptionalBox" id="Image-Section-Arrange"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator25"> + <object class="GtkSeparator" id="separator17"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -6953,25 +7646,25 @@ </packing> </child> <child> - <object class="GtkBox" id="Section26"> + <object class="GtkBox" id="Section21"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box49"> + <object class="GtkBox" id="box46"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom25"> + <object class="sfxlo-NotebookbarToolBox" id="arrange"> <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="DrawText2"> + <object class="GtkToolButton" id="Image-BringToFront"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DrawText</property> + <property name="action_name">.uno:BringToFront</property> </object> <packing> <property name="expand">False</property> @@ -6979,10 +7672,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="ArrowsToolbox"> + <object class="GtkToolButton" id="Image-ObjectForwardOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ArrowsToolbox</property> + <property name="action_name">.uno:ObjectForwardOne</property> </object> <packing> <property name="expand">False</property> @@ -6990,10 +7683,21 @@ </packing> </child> <child> - <object class="GtkToolButton" id="LineToolbox"> + <object class="GtkToolButton" id="Image-ObjectBackOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LineToolbox</property> + <property name="action_name">.uno:ObjectBackOne</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Image-SendToBack"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SendToBack</property> </object> <packing> <property name="expand">False</property> @@ -7008,7 +7712,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator149"> + <object class="GtkSeparator" id="separator144"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -7021,16 +7725,16 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom13"> + <object class="sfxlo-NotebookbarToolBox" id="Align5"> <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="BasicShapes2"> + <object class="GtkToolButton" id="Image-Section-ObjectAlignLeft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BasicShapes</property> + <property name="action_name">.uno:ObjectAlignLeft</property> </object> <packing> <property name="expand">False</property> @@ -7038,10 +7742,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="ArrowShapes2"> + <object class="GtkToolButton" id="Image-Section-AlignCenter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ArrowShapes</property> + <property name="action_name">.uno:AlignCenter</property> </object> <packing> <property name="expand">False</property> @@ -7049,10 +7753,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="FlowChartShapes2"> + <object class="GtkToolButton" id="Image-Section-ObjectAlignRight"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlowChartShapes</property> + <property name="action_name">.uno:ObjectAlignRight</property> </object> <packing> <property name="expand">False</property> @@ -7074,27 +7778,28 @@ </packing> </child> <child> - <object class="GtkBox" id="box28"> + <object class="GtkBox" id="box25"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="drawb:MenuDraw"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|drawb">D_raw</property> + <object class="svtlo-ManagedMenuButton" id="Image-Arrange:MenuArrange"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ArrangeButton">_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> - <property name="fill">True</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="shapes8"> + <object class="sfxlo-NotebookbarToolBox" id="Align1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -7103,10 +7808,10 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="SymbolShapes1"> + <object class="GtkToolButton" id="Image-Section-AlignUp"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:SymbolShapes</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignUp</property> </object> <packing> <property name="expand">False</property> @@ -7114,10 +7819,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="StarShapes1"> + <object class="GtkToolButton" id="Image-Section-AlignDown"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:StarShapes</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignDown</property> </object> <packing> <property name="expand">False</property> @@ -7125,10 +7830,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="CalloutShapes1"> + <object class="GtkToolButton" id="Image-Section-AlignMiddle"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:CalloutShapes</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignMiddle</property> </object> <packing> <property name="expand">False</property> @@ -7137,7 +7842,7 @@ </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -7156,19 +7861,23 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-6"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ArrangeSection2"> + <object class="sfxlo-OptionalBox" id="Image-Section-Color"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator26"> + <object class="GtkSeparator" id="separator16"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -7181,80 +7890,25 @@ </packing> </child> <child> - <object class="GtkBox" id="Section27"> + <object class="GtkBox" id="Section19"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box47"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom21"> <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="sfxlo-NotebookbarToolBox" id="Wrap6"> + <object class="GtkToolButton" id="Image-GrafMode"> <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="BringToFront2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BringToFront</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="ObjectForwardOne2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="ObjectBackOne2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="BringToFront4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SendToBack</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="ObjectAlignDraw1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectAlign</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="action_name">.uno:GrafMode</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> + <property name="expand">True</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -7265,22 +7919,23 @@ </packing> </child> <child> - <object class="GtkBox" id="box7"> + <object class="GtkBox" id="box24"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="arrangeD:MenuArrange"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|arrangeD">_Arrange</property> + <object class="svtlo-ManagedMenuButton" id="Image-Color:MenuColor"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ColorButton">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> - <property name="fill">True</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> @@ -7305,69 +7960,117 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">4</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="GridSection2"> + <object class="sfxlo-OptionalBox" id="Image-Section-ColorSettings"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator31"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="Section30"> + <object class="GtkBox" id="GroupB87"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom28"> + <object class="sfxlo-SidebarToolBox" id="colorbox3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">end</property> - <property name="toolbar_style">icons</property> + <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="GridVisible1"> + <object class="GtkMenuToolButton" id="Image-GrafLuminance"> + <property name="width_request">130</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:GridVisible</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:GrafLuminance</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</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="sfxlo-SidebarToolBox" id="colorbox4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="GridUse1"> + <object class="GtkMenuToolButton" id="Image-GrafTransparence"> + <property name="width_request">130</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:GridUse</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:GrafTransparence</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-3"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Image-Section-ColorSettings2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="GroupB90"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-SidebarToolBox" id="colorbox5"> + <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="HelplinesMove1"> + <object class="GtkMenuToolButton" id="Image-GrafContrast"> + <property name="width_request">130</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:HelplinesMove</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:GrafContrast</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -7378,23 +8081,23 @@ </packing> </child> <child> - <object class="GtkBox" id="box32"> + <object class="sfxlo-SidebarToolBox" id="colorbox6"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <property name="icon_size">1</property> <child> - <object class="svtlo-ManagedMenuButton" id="Grid:MenuGrid"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|Grid">_Grid</property> + <object class="GtkMenuToolButton" id="Image-GrafGamma"> + <property name="width_request">130</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> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:GrafGamma</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -7408,25 +8111,26 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-2"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">6</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="GroupSection2"> + <object class="sfxlo-OptionalBox" id="Image-Section-Grid"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator33"> + <object class="GtkSeparator" id="separator81"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -7439,47 +8143,47 @@ </packing> </child> <child> - <object class="GtkBox" id="Section31"> + <object class="GtkBox" id="Section12"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom31"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom37"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">end</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="FormatGroup"> + <object class="GtkToolButton" id="Image-GridVisible"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:FormatGroup</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GridVisible</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="EnterGroup"> + <object class="GtkToolButton" id="Image-GridUse"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:EnterGroup</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GridUse</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="LeaveGroup"> + <object class="GtkToolButton" id="Image-HelplinesMove"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:LeaveGroup</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:HelplinesMove</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -7491,18 +8195,19 @@ </packing> </child> <child> - <object class="GtkBox" id="box33"> + <object class="GtkBox" id="box26"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="viewDrawb:MenuGroup"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewDrawb">Grou_p</property> + <object class="svtlo-ManagedMenuButton" id="Image-Grid:MenuGrid"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridButton">_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> @@ -7525,21 +8230,35 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-1"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">7</property> </packing> </child> + <style> + <class name="context-Graphic"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="sfxlo-PriorityMergedHBox" id="ObjectContainer"> + <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="3DSection"> + <object class="sfxlo-OptionalBox" id="Object-Section-Graphic"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator34"> + <object class="GtkSeparator" id="separator28"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -7552,46 +8271,47 @@ </packing> </child> <child> - <object class="GtkBox" id="Section33"> + <object class="GtkBox" id="Section14"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="second39"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom29"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">end</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="FillColor"> + <object class="GtkToolButton" id="OLE-ToggleObjectRotateMode"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:FillColor</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ToggleObjectRotateMode</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkMenuToolButton" id="Extrusion3DColor"> + <object class="GtkToolButton" id="OLE-FlipVertical"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:Extrusion3DColor</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlipVertical</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkMenuToolButton" id="ExtrusionSurfaceFloater"> + <object class="GtkToolButton" id="OLE-FlipHorizontal"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:ExtrusionSurfaceFloater</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlipHorizontal</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -7603,61 +8323,24 @@ </packing> </child> <child> - <object class="GtkBox" id="box9"> + <object class="GtkBox" id="box68"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="3Db:Menu3D"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|3Db">3_D</property> + <object class="svtlo-ManagedMenuButton" id="Object-Frame:MenuOLE"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|graphicB">_Object</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> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="thirdExt16"> - <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="ExtrusionDepthFloater"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:ExtrusionDepthFloater</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="ExtrusionDirectionFloater"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:ExtrusionDirectionFloater</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> </object> @@ -7674,37 +8357,23 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-1"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">0</property> </packing> </child> - <style> - <class name="context-Draw"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="sfxlo-PriorityMergedHBox" id="OLEContainer"> - <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="EditSection1"> + <object class="sfxlo-OptionalBox" id="Object-Section-FormatLineArea"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator28"> + <object class="GtkSeparator" id="separator32"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> <property name="orientation">vertical</property> </object> <packing> @@ -7715,61 +8384,114 @@ </packing> </child> <child> - <object class="GtkBox" id="Section28"> + <object class="GtkBox" id="box36"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box16"> + <object class="sfxlo-NotebookbarToolBox" id="third10"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom5"> + <object class="GtkToolButton" id="Object-FormatLine"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatLine</property> + </object> + <packing> + <property name="expand">True</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="sfxlo-NotebookbarToolBox" id="third11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-FormatArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatArea</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box37"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box38"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first6"> <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="InsertCaptionDialog1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:InsertCaptionDialog</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkMenuToolButton" id="SetBorderStyle3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SetBorderStyle</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkMenuToolButton" id="FrameLineColor1"> + <object class="GtkMenuToolButton" id="Object-XLineStyle"> + <property name="width_request">100</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FrameLineColor</property> + <property name="valign">center</property> + <property name="action_name">.uno:XLineStyle</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</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="sfxlo-NotebookbarToolBox" id="first7"> + <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="GtkMenuToolButton" id="FillColor2"> + <object class="GtkToolButton" id="Object-XLineColor"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FillColor</property> + <property name="action_name">.uno:XLineColor</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -7777,7 +8499,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> </object> @@ -7788,51 +8510,81 @@ </packing> </child> <child> - <object class="GtkBox" id="box35"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom5"> + <property name="width_request">200</property> <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="svtlo-ManagedMenuButton" id="oleB:MenuOLE"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|oleB">F_rame</property> + <object class="GtkToolButton" id="Object-FillStyle"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="relief">none</property> - <property name="use_underline">True</property> - <property name="focus_on_click">False</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillStyle</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="expand">True</property> + <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box48"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first8"> + <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="sfxlo-NotebookbarToolBox" id="third2"> + <object class="GtkToolButton" id="Object-LineEndStyle"> <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="GtkMenuToolButton" id="LineStyle1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:LineStyle</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="action_name">.uno:LineEndStyle</property> + </object> + <packing> + <property name="expand">True</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="sfxlo-NotebookbarToolBox" id="SectionBottom16"> + <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="Object-FillShadow"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillShadow</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -7846,22 +8598,26 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> </object> <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="sfxlo-OptionalBox" id="ArrangeSection1"> + <object class="sfxlo-OptionalBox" id="Object-Section-Arrange"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator125"> + <object class="GtkSeparator" id="separator82"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -7874,25 +8630,36 @@ </packing> </child> <child> - <object class="GtkBox" id="Section35"> + <object class="GtkBox" id="Section15"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box48"> + <object class="GtkBox" id="box16"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap4"> + <object class="sfxlo-NotebookbarToolBox" id="arrange2"> <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="WrapOff1"> + <object class="GtkToolButton" id="Object-BringToFront"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BringToFront</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-ObjectForwardOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WrapOff</property> + <property name="action_name">.uno:ObjectForwardOne</property> </object> <packing> <property name="expand">False</property> @@ -7900,10 +8667,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="WrapOn1"> + <object class="GtkToolButton" id="Object-ObjectBackOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WrapOn</property> + <property name="action_name">.uno:ObjectBackOne</property> </object> <packing> <property name="expand">False</property> @@ -7911,10 +8678,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="WrapIdeal2"> + <object class="GtkToolButton" id="Object-SendToBack"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WrapIdeal</property> + <property name="action_name">.uno:SendToBack</property> </object> <packing> <property name="expand">False</property> @@ -7929,7 +8696,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator147"> + <object class="GtkSeparator" id="separator83"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -7942,16 +8709,16 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap7"> + <object class="sfxlo-NotebookbarToolBox" id="Align4"> <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="BringToFront3"> + <object class="GtkToolButton" id="Object-ObjectAlignLeft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BringToFront</property> + <property name="action_name">.uno:ObjectAlignLeft</property> </object> <packing> <property name="expand">False</property> @@ -7959,10 +8726,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="ObjectForwardOne1"> + <object class="GtkToolButton" id="Object-AlignCenter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> + <property name="action_name">.uno:AlignCenter</property> </object> <packing> <property name="expand">False</property> @@ -7970,10 +8737,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="ObjectBackOne1"> + <object class="GtkToolButton" id="Object-ObjectAlignRight"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> + <property name="action_name">.uno:ObjectAlignRight</property> </object> <packing> <property name="expand">False</property> @@ -7995,25 +8762,75 @@ </packing> </child> <child> - <object class="GtkBox" id="box37"> + <object class="GtkBox" id="box64"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="arrangeO:MenuArrange"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|arrangeO">_Arrange</property> + <object class="svtlo-ManagedMenuButton" id="Object-Arrange:MenuArrange"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ArrangeButton">_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> - <property name="fill">True</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align6"> + <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="Object-AlignUp"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignUp</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-AlignDown"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignDown</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-AlignMiddle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignMiddle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -8029,7 +8846,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-2"/> </style> </object> <packing> @@ -8039,11 +8856,12 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="GridSection1"> + <object class="sfxlo-OptionalBox" id="Object-Section-Grid"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator126"> + <object class="GtkSeparator" id="separator84"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -8056,47 +8874,47 @@ </packing> </child> <child> - <object class="GtkBox" id="Section36"> + <object class="GtkBox" id="Section32"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom32"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom17"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">end</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="GridVisible2"> + <object class="GtkToolButton" id="Object-GridVisible"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:GridVisible</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="GridUse2"> + <object class="GtkToolButton" id="Object-GridUse"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:GridUse</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="HelplinesMove2"> + <object class="GtkToolButton" id="Object-HelplinesMove"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:HelplinesMove</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -8108,18 +8926,19 @@ </packing> </child> <child> - <object class="GtkBox" id="box38"> + <object class="GtkBox" id="box22"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="GridO:MenuGrid"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridO">_Grid</property> + <object class="svtlo-ManagedMenuButton" id="Object-Grid:MenuGrid"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridButton">_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> @@ -8142,22 +8961,36 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-1"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">3</property> </packing> </child> + <style> + <class name="context-OLE"/> + <class name="context-Frame"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="sfxlo-PriorityMergedHBox" id="MediaContainer"> + <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="ViewSection1"> + <object class="sfxlo-OptionalBox" id="Media-Section-Graphic"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator32"> + <object class="GtkSeparator" id="separator69"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -8170,32 +9003,33 @@ </packing> </child> <child> - <object class="GtkBox" id="Section32"> + <object class="GtkBox" id="Section13"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom29"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom11"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">end</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="ControlCodes2"> + <object class="GtkToolButton" id="Media-ToggleObjectRotateMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ControlCodes</property> + <property name="action_name">.uno:ToggleObjectRotateMode</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="PrintPreview2"> + <object class="GtkToolButton" id="Media-FlipHorizontal"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:PrintPreview</property> + <property name="action_name">.uno:FlipHorizontal</property> </object> <packing> <property name="expand">False</property> @@ -8203,11 +9037,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Zoom3"> + <object class="GtkToolButton" id="Media-AVMediaPlayer"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Zoom</property> - <property name="use_underline">True</property> + <property name="action_name">.uno:AVMediaPlayer</property> </object> <packing> <property name="expand">False</property> @@ -8222,18 +9055,19 @@ </packing> </child> <child> - <object class="GtkBox" id="box36"> + <object class="GtkBox" id="box18"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="viewO:MenuView"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewO">_View</property> + <object class="svtlo-ManagedMenuButton" id="Media-Media:MenuMedia"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|graphicB">_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> @@ -8255,39 +9089,23 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-1"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">1</property> </packing> </child> - <style> - <class name="context-OLE"/> - <class name="context-Frame"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> - <child> - <object class="sfxlo-PriorityMergedHBox" id="DrawTextContainer"> - <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="StylesSection2"> + <object class="sfxlo-OptionalBox" id="MediaSection-FormatLineArea"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator128"> + <object class="GtkSeparator" id="separator71"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> <property name="orientation">vertical</property> </object> <packing> @@ -8298,28 +9116,27 @@ </packing> </child> <child> - <object class="GtkBox" id="Section37"> + <object class="GtkBox" id="box35"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom14"> + <object class="sfxlo-NotebookbarToolBox" id="third12"> + <property name="width_request">800</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="hexpand">True</property> - <property name="toolbar_style">icons</property> + <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="StyleApply2"> + <object class="GtkToolButton" id="Media-AVMediaToolBox"> + <property name="width_request">800</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">center</property> <property name="hexpand">True</property> - <property name="action_name">.uno:StyleApply</property> + <property name="action_name">.uno:AVMediaToolBox</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -8331,18 +9148,59 @@ </packing> </child> <child> - <object class="GtkBox" id="box39"> + <object class="GtkBox" id="box59"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="paragraphstyles:MenuStyle"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphstyles">_Styles</property> + <object class="sfxlo-NotebookbarToolBox" id="arrange4"> <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> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Media-Section-BringToFront"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BringToFront</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Media-Section-ObjectForwardOne"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectForwardOne</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Media-Section-ObjectBackOne"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectBackOne</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Media-Section-SendToBack"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SendToBack</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -8351,20 +9209,40 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop7"> + <object class="GtkSeparator" id="separator70"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align9"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="opacity">0.92156862745098034</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="FormatPaintbrush2"> + <object class="GtkToolButton" id="Media-Section-ObjectAlignLeft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignLeft</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Media-Section-AlignCenter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatPaintbrush</property> + <property name="action_name">.uno:AlignCenter</property> </object> <packing> <property name="expand">False</property> @@ -8372,10 +9250,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="ResetAttributes2"> + <object class="GtkToolButton" id="Media-Section-ObjectAlignRight"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ResetAttributes</property> + <property name="action_name">.uno:ObjectAlignRight</property> </object> <packing> <property name="expand">False</property> @@ -8386,7 +9264,67 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator74"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <property name="icon_size">1</property> + <child> + <object class="GtkToolButton" id="Media-Section-AlignUp"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignUp</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Media-Section-AlignDown"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignDown</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Media-Section-AlignMiddle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignMiddle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">4</property> </packing> </child> </object> @@ -8403,20 +9341,23 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-2"/> + </style> </object> <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="sfxlo-OptionalBox" id="FormatSection2"> + <object class="sfxlo-OptionalBox" id="Media-Section-Grid"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator133"> + <object class="GtkSeparator" id="separator75"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -8429,73 +9370,48 @@ </packing> </child> <child> - <object class="GtkBox" id="Section38"> + <object class="GtkBox" id="Section17"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box40"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom23"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">end</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom6"> + <object class="GtkToolButton" id="Media-GridVisible"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="CharFontName2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="action_name">.uno:CharFontName</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="action_name">.uno:GridVisible</property> </object> <packing> <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom33"> + <object class="GtkToolButton" id="Media-GridUse"> <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="FontHeight2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FontHeight</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkMenuToolButton" id="BackgroundColor"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BackgroundColor</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> + <property name="action_name">.uno:GridUse</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Media-HelplinesMove"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:HelplinesMove</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -8506,39 +9422,100 @@ </packing> </child> <child> - <object class="GtkBox" id="box41"> + <object class="GtkBox" id="box23"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="formats:MenuFormat"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|formats">F_ormat</property> + <object class="svtlo-ManagedMenuButton" id="Media-Grid:MenuGrid"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridButton">_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> - <property name="fill">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">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-1"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <style> + <class name="context-Media"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> + </child> + <child> + <object class="sfxlo-PriorityMergedHBox" id="MultiContainer"> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-OptionalBox" id="Multi-Section-Edit"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator76"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="Section28"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box74"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop1"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom28"> <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="Bold1"> + <object class="GtkToolButton" id="Multi-ToggleObjectRotateMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Bold</property> + <property name="action_name">.uno:ToggleObjectRotateMode</property> </object> <packing> <property name="expand">False</property> @@ -8546,10 +9523,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Italic1"> + <object class="GtkToolButton" id="Multi-FlipHorizontal"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Italic</property> + <property name="action_name">.uno:FlipHorizontal</property> </object> <packing> <property name="expand">False</property> @@ -8557,47 +9534,200 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Underline1"> + <object class="GtkToolButton" id="Multi-ToggleObjectBezierMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Underline</property> + <property name="action_name">.uno:ToggleObjectBezierMode</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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box75"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Multi-Edit:MenuDrawEdit"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|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="relief">none</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Multi-Section-FormatLineArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator89"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box78"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third13"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Multi-FormatLine"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatLine</property> + </object> + <packing> + <property name="expand">True</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="sfxlo-NotebookbarToolBox" id="third14"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Multi-FormatArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatArea</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box79"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box80"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first9"> + <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="SubScript1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SubScript</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="SuperScript1"> + <object class="GtkMenuToolButton" id="Multi-XLineStyle"> + <property name="width_request">100</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SuperScript</property> + <property name="valign">center</property> + <property name="action_name">.uno:XLineStyle</property> </object> <packing> <property name="expand">False</property> <property name="homogeneous">False</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="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="GtkMenuToolButton" id="fontcolor1"> + <object class="GtkToolButton" id="Multi-XLineColor"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Color</property> + <property name="action_name">.uno:XLineColor</property> </object> <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="expand">True</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -8611,6 +9741,31 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom31"> + <property name="width_request">200</property> + <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="Multi-FillStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillStyle</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -8618,11 +9773,71 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box81"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first11"> + <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="Multi-LineEndStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineEndStyle</property> + </object> + <packing> + <property name="expand">True</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="sfxlo-NotebookbarToolBox" id="SectionBottom32"> + <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="Multi-FillShadow"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillShadow</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-4"/> </style> </object> <packing> @@ -8632,12 +9847,12 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ParagraphSection1"> + <object class="sfxlo-OptionalBox" id="Multi-Section-Arrange"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator139"> + <object class="GtkSeparator" id="separator94"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -8650,25 +9865,25 @@ </packing> </child> <child> - <object class="GtkBox" id="Section10"> + <object class="GtkBox" id="Section42"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box4"> + <object class="GtkBox" id="box82"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom1"> + <object class="sfxlo-NotebookbarToolBox" id="arrange3"> <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="AlignLeft2"> + <object class="GtkToolButton" id="Multi-BringToFront"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignLeft</property> + <property name="action_name">.uno:BringToFront</property> </object> <packing> <property name="expand">False</property> @@ -8676,10 +9891,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="AlignHorizontalCenter2"> + <object class="GtkToolButton" id="Multi-ObjectForwardOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignHorizontalCenter</property> + <property name="action_name">.uno:ObjectForwardOne</property> </object> <packing> <property name="expand">False</property> @@ -8687,10 +9902,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="AlignRight2"> + <object class="GtkToolButton" id="Multi-ObjectBackOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignRight</property> + <property name="action_name">.uno:ObjectBackOne</property> </object> <packing> <property name="expand">False</property> @@ -8698,10 +9913,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="AlignBlock1"> + <object class="GtkToolButton" id="Multi-SendToBack"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignBlock</property> + <property name="action_name">.uno:SendToBack</property> </object> <packing> <property name="expand">False</property> @@ -8716,7 +9931,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator150"> + <object class="GtkSeparator" id="separator95"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -8729,16 +9944,16 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom1"> + <object class="sfxlo-NotebookbarToolBox" id="Align7"> <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="CellVertTop"> + <object class="GtkToolButton" id="Multi-ObjectAlignLeft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CellVertTop</property> + <property name="action_name">.uno:ObjectAlignLeft</property> </object> <packing> <property name="expand">False</property> @@ -8746,10 +9961,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="CellVertCenter"> + <object class="GtkToolButton" id="Multi-AlignCenter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CellVertCenter</property> + <property name="action_name">.uno:AlignCenter</property> </object> <packing> <property name="expand">False</property> @@ -8757,10 +9972,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="CellVertBottom"> + <object class="GtkToolButton" id="Multi-ObjectAlignRight"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CellVertBottom</property> + <property name="action_name">.uno:ObjectAlignRight</property> </object> <packing> <property name="expand">False</property> @@ -8782,27 +9997,28 @@ </packing> </child> <child> - <object class="GtkBox" id="box6"> + <object class="GtkBox" id="box83"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="paragraphS:MenuParagraph"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphS">_Paragraph</property> + <object class="svtlo-ManagedMenuButton" id="Multi-Arrange:MenuArrange"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ArrangeButton">_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> - <property name="fill">True</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom4"> + <object class="sfxlo-NotebookbarToolBox" id="Align8"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -8811,10 +10027,10 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="ParaspaceDecrease"> + <object class="GtkToolButton" id="Multi-AlignUp"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ParaspaceDecrease</property> + <property name="action_name">.uno:AlignUp</property> </object> <packing> <property name="expand">False</property> @@ -8822,10 +10038,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="ParaspaceIncrease"> + <object class="GtkToolButton" id="Multi-AlignDown"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ParaspaceIncrease</property> + <property name="action_name">.uno:AlignDown</property> </object> <packing> <property name="expand">False</property> @@ -8833,19 +10049,19 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="LineSpacing"> + <object class="GtkToolButton" id="Multi-AlignMiddle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LineSpacing</property> + <property name="action_name">.uno:AlignMiddle</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -8865,7 +10081,7 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-3"/> </style> </object> <packing> @@ -8875,12 +10091,11 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ViewSection3"> + <object class="sfxlo-OptionalBox" id="Multi-Section-Group"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator145"> + <object class="GtkSeparator" id="separator100"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -8893,21 +10108,22 @@ </packing> </child> <child> - <object class="GtkBox" id="Section11"> + <object class="GtkBox" id="Section44"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom10"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom42"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">end</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="FreezePanes1"> + <object class="GtkToolButton" id="Multi-FormatGroup"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FreezePanes</property> + <property name="action_name">.uno:FormatGroup</property> </object> <packing> <property name="expand">False</property> @@ -8915,10 +10131,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="PrintPreview3"> + <object class="GtkToolButton" id="Multi-EnterGroup"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:PrintPreview</property> + <property name="action_name">.uno:EnterGroup</property> </object> <packing> <property name="expand">False</property> @@ -8926,10 +10142,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Zoom4"> + <object class="GtkToolButton" id="Multi-LeaveGroup"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Zoom</property> + <property name="action_name">.uno:LeaveGroup</property> </object> <packing> <property name="expand">False</property> @@ -8944,18 +10160,133 @@ </packing> </child> <child> - <object class="GtkBox" id="box17"> + <object class="GtkBox" id="box86"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="viewS:MenuView"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewS">_View</property> + <object class="svtlo-ManagedMenuButton" id="Multi-Group:MenuGroup"> + <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> + </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">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-2"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Multi-Section-Grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkSeparator" id="separator96"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="Section31"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom34"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">end</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Multi-GridVisible"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GridVisible</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Multi-GridUse"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GridUse</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Multi-HelplinesMove"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:HelplinesMove</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box29"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Multi-Grid:MenuGrid"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridButton">_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> </object> <packing> <property name="expand">False</property> @@ -8984,17 +10315,465 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <style> - <class name="context-DrawText"/> + <class name="context-MultiObject"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="sfxlo-PriorityMergedHBox" id="PrintContainer"> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-OptionalBox" id="Print-Section-SlideLayout"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkSeparator" id="separator111"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="Section45"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom33"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">end</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Print-Margins"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Margins</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="sfxlo-NotebookbarToolBox" id="SectionBottom22"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">end</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Print-PageFormatDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PageFormatDialog</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box43"> + <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="sfxlo-NotebookbarToolBox" id="first25"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="resize_mode">immediate</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Print-FullScreen"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FullScreen</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">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="second12"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="resize_mode">immediate</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Print-EditHeaderAndFooter"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:EditHeaderAndFooter</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">False</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> + <style> + <class name="priority-2"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Print-Section-Arrange"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator19"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box27"> + <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="sfxlo-NotebookbarToolBox" id="first29"> + <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> + <child> + <object class="GtkToolButton" id="Print-FirstPage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FirstPage</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Print-PreviousPage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PreviousPage</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Print-NextPage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NextPage</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Print-LastPage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LastPage</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">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box41"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="second13"> + <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> + <child> + <object class="GtkToolButton" id="Print-ZoomOut"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ZoomOut</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">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="second10"> + <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> + <child> + <object class="GtkToolButton" id="Print-ZoomIn"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ZoomIn</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">False</property> + <property name="pack_type">end</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> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first23"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="resize_mode">immediate</property> + <property name="toolbar_style">both</property> + <property name="show_arrow">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <style> + <class name="priority-1"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Print-Section-Print"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkSeparator" id="separator117"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="Section37"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom49"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">end</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Print-Print"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Print</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Print-ClosePreview"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ClosePreview</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box40"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Print-Print:MenuPrint"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|PrintMenuButton">_Print</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">False</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <style> + <class name="context-Printpreview"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">8</property> </packing> </child> <child> |