diff options
| author | andreas kainz <kainz.a@gmail.com> | 2018-11-19 00:04:35 +0100 |
|---|---|---|
| committer | andreas_kainz <kainz.a@gmail.com> | 2018-11-19 14:00:43 +0100 |
| commit | b1baf44324857ec57a584908114cd53688089236 (patch) | |
| tree | ae69580b9490c5a8879081a563925b6c4a9bbc99 | |
| parent | f35d0780918a22b2c8bc81d0b9d3d426fcf2659d (diff) | |
NB writer groupedbar compact big update and sync
between different context toolbars, ready for release
Change-Id: I6288a9e3c7289fdca8991d4dc207c79f9d488e02
Reviewed-on: https://gerrit.libreoffice.org/63538
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 4896 |
1 files changed, 2555 insertions, 2341 deletions
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui index d51108a84af7..c34191f1949f 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui +++ b/sw/uiconfig/swriter/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="sw"> <requires lib="gtk+" version="3.18"/> <requires lib="LibreOffice" version="1.0"/> @@ -1732,6 +1732,37 @@ </object> </child> </object> + <object class="GtkMenu" id="MenuMedia"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="MenuMedia-AVMediaPlayer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AVMediaPlayer</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuMedia-separator1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuMedia-NameGroup"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NameGroup</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuMedia-ObjectTitleDescription"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectTitleDescription</property> + </object> + </child> + </object> <object class="GtkMenu" id="MenuMerge"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -2641,6 +2672,38 @@ </object> </child> </object> + <object class="GtkMenu" id="MenuSlideLayout"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="ShowSinglePageD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ShowSinglePage</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="ShowTwoPagesD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ShowTwoPages</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="ShowBookviewD1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ShowBookview</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="ShowMultiplePagesD1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ShowMultiplePages</property> + </object> + </child> + </object> <object class="GtkMenu" id="MenuStyle"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -2855,6 +2918,13 @@ </object> </child> <child> + <object class="GtkMenuItem" id="TableSplitTable"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SplitTable</property> + </object> + </child> + <child> <object class="GtkSeparatorMenuItem" id="separator105"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -3353,7 +3423,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="SearchDialog"> + <object class="GtkToolButton" id="Tools-SearchDialog"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="action_name">.uno:SearchDialog</property> @@ -3371,16 +3441,16 @@ </packing> </child> <child> - <object class="svtlo-ManagedMenuButton" id="menub:MenuSettings"> + <object class="svtlo-ManagedMenuButton" id="Tools-Menu:MenuSettings"> <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|MenuButton">_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> @@ -3409,7 +3479,7 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="HelpIndex1"> + <object class="GtkToolButton" id="Tools-HelpIndex"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="action_name">.uno:HelpIndex</property> @@ -3427,14 +3497,14 @@ </packing> </child> <child> - <object class="svtlo-ManagedMenuButton" id="toolsb:MenuTools"> + <object class="svtlo-ManagedMenuButton" id="Tools-Tools:MenuTools"> <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ToolsButton">_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> @@ -3483,7 +3553,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> @@ -3494,7 +3564,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> @@ -3504,6 +3574,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> @@ -3516,16 +3597,16 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="fileb:MenuFile"> + <object class="svtlo-ManagedMenuButton" id="File-File:MenuFile"> <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|FileButton">_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> @@ -3533,33 +3614,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="hexpand">True</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <property name="icon_size">1</property> - <child> - <object class="GtkToolButton" id="Print"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Print</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -3626,7 +3680,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Paste1"> + <object class="GtkMenuToolButton" id="Edit-Paste"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="vexpand">False</property> @@ -3638,7 +3692,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Undo1"> + <object class="GtkToolButton" id="Edit-Undo"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Undo</property> @@ -3649,7 +3703,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Redo1"> + <object class="GtkToolButton" id="Edit-Redo"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Redo</property> @@ -3671,16 +3725,16 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="editb:MenuEdit"> + <object class="svtlo-ManagedMenuButton" id="Edit-Edit:MenuEdit"> <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|EditButton">_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> @@ -3698,7 +3752,7 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="Cut"> + <object class="GtkToolButton" id="Edit-Cut"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Cut</property> @@ -3709,7 +3763,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Copy"> + <object class="GtkToolButton" id="Edit-Copy"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Copy</property> @@ -3756,7 +3810,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> <child> @@ -3786,7 +3840,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="StyleApply"> + <object class="GtkToolButton" id="Default-StyleApply"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">center</property> @@ -3810,14 +3864,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-Styles:MenuStyle"> <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|StyleButton">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> @@ -3836,7 +3890,7 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="FormatPaintbrush"> + <object class="GtkToolButton" id="Default-FormatPaintbrush"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FormatPaintbrush</property> @@ -3847,7 +3901,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="ResetAttributes"> + <object class="GtkToolButton" id="Default-ResetAttributes"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ResetAttributes</property> @@ -3878,9 +3932,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-7"/> - </style> </object> <packing> <property name="expand">False</property> @@ -3889,7 +3940,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormatSection"> + <object class="sfxlo-OptionalBox" id="Default-Section-Font"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -3922,7 +3973,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> @@ -3948,7 +3999,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> @@ -3959,10 +4010,10 @@ </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:BackColor</property> + <property name="action_name">.uno:Color</property> </object> <packing> <property name="expand">False</property> @@ -3988,14 +4039,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="formatb:MenuFormat"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|FormatButton">F_ormat</property> + <object class="svtlo-ManagedMenuButton" id="Default-Font:MenuFormat"> + <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="relief">none</property> <property name="use_underline">True</property> - <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -4013,7 +4064,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> @@ -4024,7 +4075,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> @@ -4035,7 +4086,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> @@ -4046,7 +4097,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Strikeout"> + <object class="GtkToolButton" id="Default-Strikeout"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Strikeout</property> @@ -4057,10 +4108,10 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="fontcolor"> + <object class="GtkMenuToolButton" id="Default-BackColor"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Color</property> + <property name="action_name">.uno:BackColor</property> </object> <packing> <property name="expand">False</property> @@ -4088,6 +4139,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-6"/> + </style> </object> <packing> <property name="expand">False</property> @@ -4096,7 +4150,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ParagraphSection"> + <object class="sfxlo-OptionalBox" id="Default-Section-Paragraph"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -4128,7 +4182,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="LeftPara1"> + <object class="GtkToolButton" id="Default-LeftPara"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:LeftPara</property> @@ -4139,7 +4193,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="CenterPara1"> + <object class="GtkToolButton" id="Default-CenterPara"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:CenterPara</property> @@ -4150,7 +4204,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="RightPara1"> + <object class="GtkToolButton" id="Default-RightPara"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:RightPara</property> @@ -4161,7 +4215,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="JustifyPara1"> + <object class="GtkToolButton" id="Default-JustifyPara"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:JustifyPara</property> @@ -4198,7 +4252,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="DefaultBullet"> + <object class="GtkMenuToolButton" id="Default-DefaultBullet"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:DefaultBullet</property> @@ -4209,7 +4263,7 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="DefaultNumbering"> + <object class="GtkMenuToolButton" id="Default-DefaultNumbering"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:DefaultNumbering</property> @@ -4238,14 +4292,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="paragraphb:MenuParagraph"> + <object class="svtlo-ManagedMenuButton" id="Default-Paragraph:MenuParagraph"> <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ParagraphButton">_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> @@ -4263,7 +4317,7 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="ParaspaceDecrease"> + <object class="GtkToolButton" id="Default-ParaspaceDecrease"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ParaspaceDecrease</property> @@ -4274,7 +4328,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="ParaspaceIncrease"> + <object class="GtkToolButton" id="Default-ParaspaceIncrease"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ParaspaceIncrease</property> @@ -4285,7 +4339,7 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="LineSpacing"> + <object class="GtkMenuToolButton" id="Default-LineSpacing"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:LineSpacing</property> @@ -4327,7 +4381,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="InsertSection"> + <object class="sfxlo-OptionalBox" id="Default-Section-Insert"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -4355,7 +4409,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="InsertTable"> + <object class="GtkMenuToolButton" id="Default-InsertTable"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="action_name">.uno:InsertTable</property> @@ -4366,7 +4420,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="InsertGraphic"> + <object class="GtkToolButton" id="Default-InsertGraphic"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="action_name">.uno:InsertGraphic</property> @@ -4377,7 +4431,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="InsertSymbo"> + <object class="GtkToolButton" id="Default-CharmapControl"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:CharmapControl</property> @@ -4388,7 +4442,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="InsertPagebreak"> + <object class="GtkToolButton" id="Default-InsertPagebreak"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertPagebreak</property> @@ -4410,16 +4464,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="insertb:MenuInsert"> + <object class="svtlo-ManagedMenuButton" id="Default-Insert:MenuInsert"> <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|InsertButton">_Insert</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> <property name="relief">none</property> <property name="use_underline">True</property> - <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -4437,7 +4489,7 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="InsertDraw"> + <object class="GtkToolButton" id="Default-InsertDraw"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertDraw</property> @@ -4479,7 +4531,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ReferenceSection"> + <object class="sfxlo-OptionalBox" id="Default-Section-Reference"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -4507,7 +4559,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="HyperlinkDialog"> + <object class="GtkToolButton" id="Default-HyperlinkDialog"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="action_name">.uno:HyperlinkDialog</property> @@ -4518,7 +4570,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="InsertFootnote1"> + <object class="GtkToolButton" id="Default-InsertFootnote"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertFootnote</property> @@ -4529,7 +4581,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="InsertBookmark"> + <object class="GtkToolButton" id="Default-InsertBookmark"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="action_name">.uno:InsertBookmark</property> @@ -4540,7 +4592,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="InsertReferenceField"> + <object class="GtkToolButton" id="Default-InsertReferenceField"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="action_name">.uno:InsertReferenceField</property> @@ -4558,16 +4610,25 @@ </packing> </child> <child> - <object class="svtlo-ManagedMenuButton" id="referenceb:MenuReference"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ReferenceButton">Reference_s</property> + <object class="GtkBox" id="box21"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="relief">none</property> - <property name="use_underline">True</property> - <property name="focus_on_click">False</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Default-Reference:MenuReference"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ReferenceButton">Reference_s</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> @@ -4593,7 +4654,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> <child> @@ -4621,7 +4682,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> @@ -4632,7 +4693,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> @@ -4643,7 +4704,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="TrackChanges"> + <object class="GtkToolButton" id="Default-TrackChanges"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:TrackChanges</property> @@ -4665,16 +4726,14 @@ <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|ReviewButton">_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> @@ -4707,7 +4766,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> <child> @@ -4735,7 +4794,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="ControlCodes"> + <object class="GtkToolButton" id="Default-ControlCodes"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="action_name">.uno:ControlCodes</property> @@ -4746,7 +4805,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> @@ -4757,7 +4816,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> @@ -4779,14 +4838,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|ViewButton">_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> @@ -4819,7 +4878,9 @@ </packing> </child> <style> + <class name="context-default"/> <class name="context-Text"/> + <class name="context-DrawText"/> </style> </object> <packing> @@ -4829,15 +4890,15 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="PrintContainer"> + <object class="sfxlo-PriorityMergedHBox" id="TableContainer"> <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="PrintSection"> + <object class="sfxlo-OptionalBox" id="Table-Section-Styles"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator73"> + <object class="GtkSeparator" id="separator3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -4850,39 +4911,27 @@ </packing> </child> <child> - <object class="GtkBox" id="Section41"> + <object class="GtkBox" id="Section10"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom36"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom1"> <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="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Print-Print"> + <object class="GtkToolButton" id="Table-StyleApply"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Print</property> + <property name="action_name">.uno:StyleApply</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> @@ -4891,39 +4940,51 @@ </packing> </child> <child> - <object class="GtkBox" id="box50"> + <object class="GtkBox" id="box17"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="print:MenuPrint"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|PrintMenuButton">_Print</property> + <object class="svtlo-ManagedMenuButton" id="Table-Styles:MenuStyle"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|StyleButton">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> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop9"> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop1"> <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="Print-PageDialog"> + <object class="GtkToolButton" id="Table-FormatPaintbrush"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:PageDialog</property> + <property name="action_name">.uno:FormatPaintbrush</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-ResetAttributes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ResetAttributes</property> </object> <packing> <property name="expand">False</property> @@ -4932,7 +4993,7 @@ </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -4959,12 +5020,12 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SlideLayoutSection"> + <object class="sfxlo-OptionalBox" id="Table-Section-Font"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator110"> + <object class="GtkSeparator" id="separator123"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -4977,61 +5038,74 @@ </packing> </child> <child> - <object class="GtkBox" id="Section45"> + <object class="GtkBox" id="Section34"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom42"> + <object class="GtkBox" id="box18"> <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="Print-ShowSinglePage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ShowSinglePage</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Print-ShowTwoPages"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ShowTwoPages</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> <child> - <object class="GtkToolButton" id="Print-ShowBookview"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ShowBookview</property> + <property name="hexpand">True</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Table-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">False</property> - <property name="homogeneous">True</property> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkMenuToolButton" id="Print-ShowMultiplePages"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom10"> <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:ShowMultiplePages</property> + <property name="margin_left">5</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Table-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="Table-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="homogeneous">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> @@ -5042,18 +5116,18 @@ </packing> </child> <child> - <object class="GtkBox" id="box55"> + <object class="GtkBox" id="box19"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="prints:SlidelayoutMenu"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|PrintMenuButton">Slide Layout</property> + <object class="svtlo-ManagedMenuButton" id="Table-Font:MenuFormat"> + <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="relief">none</property> <property name="use_underline">True</property> - <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -5061,6 +5135,77 @@ <property name="position">0</property> </packing> </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop2"> + <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="Table-Bold"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Bold</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-Italic"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Italic</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-Underline"> + <property name="visible">True</property> + <property name="can_focus">False</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="Table-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="Table-BackColor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BackColor</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> @@ -5076,7 +5221,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-5"/> </style> </object> <packing> @@ -5086,12 +5231,11 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="NavigateSection"> + <object class="sfxlo-OptionalBox" id="Table-Section-Paragraph"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator74"> + <object class="GtkSeparator" id="separator4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -5104,70 +5248,117 @@ </packing> </child> <child> - <object class="GtkBox" id="Section42"> + <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="SectionBottom39"> + <object class="GtkBox" id="box4"> <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="GoToStartOfDoc"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:GoToStartOfDoc</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> <child> - <object class="GtkToolButton" id="PageUp"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:PageUp</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="JumpToSpecificPage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:JumpToSpecificPage</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Table-LeftPara"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LeftPara</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-CenterPara"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CenterPara</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-RightPara"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RightPara</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-JustifyPara"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:JustifyPara</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="PageDown"> + <object class="GtkSeparator" id="separator125"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:PageDown</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="GoToEndOfDoc"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom11"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:GoToEndOfDoc</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Table-DefaultBullet"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DefaultBullet</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkMenuToolButton" id="Table-DefaultNumbering"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DefaultNumbering</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> @@ -5178,25 +5369,74 @@ </packing> </child> <child> - <object class="GtkBox" id="box52"> + <object class="GtkBox" id="box20"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="printn:MenuNavigate"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|PrintMenuButton">Navigate</property> + <object class="svtlo-ManagedMenuButton" id="Table-Paragraph:MenuParagraph"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ParagraphButton">_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> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom4"> + <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="Table-ParaspaceDecrease"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ParaspaceDecrease</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-ParaspaceIncrease"> + <property name="visible">True</property> + <property name="can_focus">False</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="Table-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">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> @@ -5212,7 +5452,7 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-4"/> </style> </object> <packing> @@ -5222,12 +5462,12 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ZoomSection"> + <object class="sfxlo-OptionalBox" id="Table-Section-Table"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator100"> + <object class="GtkSeparator" id="separator126"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -5240,59 +5480,146 @@ </packing> </child> <child> - <object class="GtkBox" id="Section44"> + <object class="GtkBox" id="Section35"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40"> + <object class="GtkBox" id="box37"> <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="Print-ZoomMinus"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ZoomMinus</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> <child> - <object class="GtkToolButton" id="Print-PreviewZoom"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom29"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:PreviewZoom</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="Table-InsertCaptionDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertCaptionDialog</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-MergeCells"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:MergeCells</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-SplitCell"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SplitCell</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-TableDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:TableDialog</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="Print-ZoomPlus"> + <object class="GtkSeparator" id="separator147"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ZoomPlus</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="Print-FullScreen"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom32"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FullScreen</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Table-EntireColumn"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:EntireColumn</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-InsertColumnsBefore"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertColumnsBefore</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-InsertColumnsAfter"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertColumnsAfter</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-DeleteColumns"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DeleteColumns</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> @@ -5303,18 +5630,19 @@ </packing> </child> <child> - <object class="GtkBox" id="box53"> + <object class="GtkBox" id="box38"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="printz:MenuZoom"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|PrintMenuButton">Zoom</property> + <object class="svtlo-ManagedMenuButton" id="Table-Table:MenuTable"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|rowscolumnst">_Table</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> @@ -5322,6 +5650,68 @@ <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="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="Table-EntireRow"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:EntireRow</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <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> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <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="action_name">.uno:DeleteRows</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> @@ -5337,7 +5727,7 @@ </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-3"/> </style> </object> <packing> @@ -5346,28 +5736,16 @@ <property name="position">3</property> </packing> </child> - <style> - <class name="context-Printpreview"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="sfxlo-PriorityMergedHBox" id="GraphicContainer"> - <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="GraphicSection"> + <object class="sfxlo-OptionalBox" id="Table-Section-FormatLineArea"> <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="separator7"> <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> @@ -5378,59 +5756,131 @@ </packing> </child> <child> - <object class="GtkBox" id="Section18"> + <object class="GtkBox" id="box6"> <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="third3"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">end</property> - <property name="toolbar_style">icons</property> + <property name="can_focus">False</property> + <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="InsertCaptionDialog"> + <object class="GtkToolButton" id="Table-BorderDialog"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:InsertCaptionDialog</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Line</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="third6"> + <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="Crop"> + <object class="GtkToolButton" id="Table-FormatArea"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:Crop</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> + <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">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="box23"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box29"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkToolButton" id="CompressGraphic"> + <object class="sfxlo-NotebookbarToolBox" id="first21"> <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="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Table-SetBorderStyle"> + <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">False</property> + </packing> + </child> + <child> + <object class="GtkMenuToolButton" id="Table-LineStyle"> + <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">False</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="GtkToolButton" id="RotateRight"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom16"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:RotateRight</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="Table-FrameLineColor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FrameLineColor</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</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">1</property> </packing> </child> </object> @@ -5441,49 +5891,31 @@ </packing> </child> <child> - <object class="GtkBox" id="box5"> + <object class="GtkBox" id="box48"> <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|ImageButton">Image</property> - <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> - </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="ExtTop5"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom79"> <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="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> - <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="GraphicDialog"> + <object class="GtkMenuToolButton" id="Table-BackgroundColor"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:GraphicDialog</property> + <property name="action_name">.uno:BackgroundColor</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">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -5492,30 +5924,33 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</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> + <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> + <property name="position">4</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ColorSection"> + <object class="sfxlo-OptionalBox" id="Table-Section-Calc"> <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="separator13"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -5528,24 +5963,46 @@ </packing> </child> <child> - <object class="GtkBox" id="Section19"> + <object class="GtkBox" id="Section17"> <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="sfxlo-NotebookbarToolBox" id="SectionBottom19"> <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="GrafModeD1"> + <object class="GtkToolButton" id="Table-InsertFormula"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="action_name">.uno:InsertFormula</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-AutoSum"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="action_name">.uno:AutoSum</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-TableNumberFormatDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:GrafMode</property> + <property name="action_name">.uno:TableNumberFormatDialog</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -5557,38 +6014,103 @@ </packing> </child> <child> - <object class="GtkBox" id="box24"> + <object class="GtkBox" id="box22"> <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|ColorButton">C_olor</property> + <object class="svtlo-ManagedMenuButton" id="Table-Calc:MenuCalculate"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|CalculateButton">_Calc</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">False</property> <property name="halign">start</property> <property name="relief">none</property> <property name="use_underline">True</property> - <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> - <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">5</property> + </packing> + </child> + <style> + <class name="context-Table"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <object class="sfxlo-PriorityMergedHBox" id="DrawContainer"> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Edit"> + <property name="visible">True</property> + <property name="can_focus">False</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="Section46"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box58"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom23"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom44"> <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="GtkMenuToolButton" id="SetBorderStyle2"> + <object class="GtkToolButton" id="Draw-InsertCaptionDialog"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:SetBorderStyle</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertCaptionDialog</property> </object> <packing> <property name="expand">False</property> @@ -5596,10 +6118,32 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="BackgroundColor4"> + <object class="GtkToolButton" id="Draw-ToggleObjectRotateMode"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:BackgroundColor</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-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> + <child> + <object class="GtkToolButton" id="Draw-AddTextBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AddTextBox</property> </object> <packing> <property name="expand">False</property> @@ -5610,7 +6154,34 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</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="box59"> + <property name="visible">True</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> @@ -5627,54 +6198,75 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-4"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ColorSectionExt"> + <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="GtkBox" id="Ext12"> + <object class="GtkSeparator" id="separator29"> + <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="box7"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom18"> + <object class="sfxlo-NotebookbarToolBox" id="third1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="toolbar_style">icons</property> + <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="GrafLuminance"> - <property name="width_request">130</property> + <object class="GtkToolButton" id="Draw-FormatLine"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:GrafLuminance</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="GtkMenuToolButton" id="GrafContrast"> - <property name="width_request">130</property> + <object class="GtkToolButton" id="Draw-FormatArea"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:GrafContrast</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> @@ -5682,38 +6274,97 @@ <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> + <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="sfxlo-NotebookbarToolBox" id="ExtTop12"> + <object class="GtkBox" id="box28"> <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> + <object class="sfxlo-NotebookbarToolBox" id="first2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:GrafGamma</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="GtkMenuToolButton" id="GrafTransparence"> - <property name="width_request">130</property> + <object class="sfxlo-NotebookbarToolBox" id="first3"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:GrafTransparence</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="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="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="Draw-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> @@ -5721,33 +6372,33 @@ <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">0</property> + <property name="position">2</property> </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-7"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ArrangeSection"> + <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="separator17"> + <object class="GtkSeparator" id="separator33"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -5760,22 +6411,22 @@ </packing> </child> <child> - <object class="GtkBox" id="Section21"> + <object class="GtkBox" id="Section27"> <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="box31"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="arrange"> + <object class="sfxlo-NotebookbarToolBox" id="arrange1"> <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="Draw-BringToFront"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BringToFront</property> @@ -5786,7 +6437,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="ObjectForwardOne3"> + <object class="GtkToolButton" id="Draw-ObjectForwardOne"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectForwardOne</property> @@ -5797,7 +6448,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="ObjectBackOne3"> + <object class="GtkToolButton" id="Draw-ObjectBackOne"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectBackOne</property> @@ -5808,7 +6459,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="SendToBack5"> + <object class="GtkToolButton" id="Draw-SendToBack"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SendToBack</property> @@ -5826,7 +6477,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator144"> + <object class="GtkSeparator" id="separator34"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -5839,16 +6490,16 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="align"> + <object class="sfxlo-NotebookbarToolBox" id="Align2"> <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="AlignLeft"> + <object class="GtkToolButton" id="Draw-ObjectAlignLeft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignLeft</property> + <property name="action_name">.uno:ObjectAlignLeft</property> </object> <packing> <property name="expand">False</property> @@ -5856,10 +6507,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="AlignHorizontalCenter"> + <object class="GtkToolButton" id="Draw-AlignCenter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignHorizontalCenter</property> + <property name="action_name">.uno:AlignCenter</property> </object> <packing> <property name="expand">False</property> @@ -5867,10 +6518,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="AlignRight"> + <object class="GtkToolButton" id="Draw-ObjectAlignRight"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignRight</property> + <property name="action_name">.uno:ObjectAlignRight</property> </object> <packing> <property name="expand">False</property> @@ -5892,19 +6543,19 @@ </packing> </child> <child> - <object class="GtkBox" id="box25"> + <object class="GtkBox" id="box49"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="arrangeG:MenuArrange"> + <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> - <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -5913,7 +6564,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align1"> + <object class="sfxlo-NotebookbarToolBox" id="Align3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -5922,10 +6573,10 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="AlignTop1"> + <object class="GtkToolButton" id="Draw-AlignUp"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignTop</property> + <property name="action_name">.uno:AlignUp</property> </object> <packing> <property name="expand">False</property> @@ -5933,10 +6584,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="AlignVerticalCenter1"> + <object class="GtkToolButton" id="Draw-AlignDown"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignVerticalCenter</property> + <property name="action_name">.uno:AlignDown</property> </object> <packing> <property name="expand">False</property> @@ -5944,10 +6595,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="AlignBottom4"> + <object class="GtkToolButton" id="Draw-AlignMiddle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignBottom</property> + <property name="action_name">.uno:AlignMiddle</property> </object> <packing> <property name="expand">False</property> @@ -5976,22 +6627,22 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-6"/> </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="GridSection3"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Wrap"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator5"> + <object class="GtkSeparator" id="separator118"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -6004,18 +6655,18 @@ </packing> </child> <child> - <object class="GtkBox" id="WrapGroup"> + <object class="GtkBox" id="WrapGroup1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap1"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap2"> <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="WrapOff"> + <object class="GtkToolButton" id="Draw-WrapOff"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapOff</property> @@ -6026,7 +6677,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="WrapOn"> + <object class="GtkToolButton" id="Draw-WrapOn"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapOn</property> @@ -6037,7 +6688,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="WrapIdeal"> + <object class="GtkToolButton" id="Draw-WrapIdeal"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapIdeal</property> @@ -6055,14 +6706,14 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap5"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap3"> <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="WrapLeft"> + <object class="GtkToolButton" id="Draw-WrapLeft"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapLeft</property> @@ -6073,7 +6724,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="WrapThrough"> + <object class="GtkToolButton" id="Draw-WrapThrough"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapThrough</property> @@ -6084,7 +6735,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="WrapRight"> + <object class="GtkToolButton" id="Draw-WrapRight"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapRight</property> @@ -6109,22 +6760,22 @@ </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-5"/> </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> <child> - <object class="sfxlo-OptionalBox" id="GridSection"> + <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="separator16"> + <object class="GtkSeparator" id="separator25"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -6137,48 +6788,121 @@ </packing> </child> <child> - <object class="GtkBox" id="Section12"> + <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="SectionBottom37"> + <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="GridVisible"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom13"> <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="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">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="GridUse"> + <object class="GtkSeparator" id="separator26"> <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="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">True</property> - <property name="homogeneous">True</property> + <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="GtkToolButton" id="HelplinesMove"> + <object class="sfxlo-NotebookbarToolBox" id="shapes1"> <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="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">True</property> - <property name="homogeneous">True</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> </object> @@ -6189,19 +6913,19 @@ </packing> </child> <child> - <object class="GtkBox" id="box26"> + <object class="GtkBox" id="box47"> <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|GridButton">_Grid</property> + <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> - <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -6209,6 +6933,54 @@ <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> @@ -6224,35 +6996,21 @@ </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-4"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">4</property> </packing> </child> - <style> - <class name="context-Graphic"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="sfxlo-PriorityMergedHBox" id="ReviewContainer"> - <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="LanguageSection"> + <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="separator19"> + <object class="GtkSeparator" id="separator116"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -6265,47 +7023,47 @@ </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="sfxlo-NotebookbarToolBox" id="SectionBottom30"> <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"> + <object class="GtkToolButton" id="Draw-FormatGroup"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:SpellingAndGrammarDialog</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatGroup</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="ThesaurusDialog1"> + <object class="GtkToolButton" id="Draw-EnterGroup"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:ThesaurusDialog</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:EnterGroup</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="SpellOnline1"> + <object class="GtkToolButton" id="Draw-LeaveGroup"> <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="action_name">.uno:LeaveGroup</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -6317,19 +7075,29 @@ </packing> </child> <child> - <object class="svtlo-ManagedMenuButton" id="languageb:MenuLanguage"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|LanguageButton">_Language</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="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-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">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -6341,22 +7109,21 @@ </packing> </child> <style> - <class name="priority-5"/> + <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">5</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ReviewSectio"> + <object class="sfxlo-OptionalBox" id="Draw-Section-3d"> <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="separator117"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -6369,70 +7136,81 @@ </packing> </child> <child> - <object class="GtkBox" id="Section23"> + <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="SectionBottom24"> + <object class="GtkBox" id="box62"> <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="TrackChanges1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:TrackChanges</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="PreviousTrackedChange"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:PreviousTrackedChange</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="NextTrackedChange"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:NextTrackedChange</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="AcceptTrackedChange"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom46"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AcceptTrackedChange</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="RejectTrackedChange"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:RejectTrackedChange</property> + <property name="valign">end</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Draw-ExtrusionToggle"> + <property name="visible">True</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> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkMenuToolButton" id="Draw-Extrusion3DColor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Extrusion3DColor</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkMenuToolButton" id="Draw-ExtrusionSurfaceFloater"> + <property name="visible">True</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> + <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> </object> @@ -6443,28 +7221,27 @@ </packing> </child> <child> - <object class="GtkBox" id="box27"> + <object class="GtkBox" id="box60"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="revieb:MenuReviews"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|reviewButton">_Review</property> + <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">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="ExtTop20"> + <object class="sfxlo-NotebookbarToolBox" id="third5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -6473,13 +7250,24 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="AcceptTrackedChanges1"> + <object class="GtkToolButton" id="Draw-ExtrusionDepthFloater"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:AcceptTrackedChanges</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ExtrusionDepthFloater</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="Draw-ExtrusionDirectionFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ExtrusionDirectionFloater</property> + </object> + <packing> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -6505,22 +7293,21 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-2"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">6</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="CommentsSection"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Grid"> <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="separator31"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -6533,33 +7320,33 @@ </packing> </child> <child> - <object class="GtkBox" id="Section24"> + <object class="GtkBox" id="Section30"> <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="sfxlo-NotebookbarToolBox" id="SectionBottom28"> <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="GtkToolButton" id="Draw-GridVisible"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="action_name">.uno:InsertAnnotation</property> + <property name="action_name">.uno:GridVisible</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="ReplyComment"> + <object class="GtkToolButton" id="Draw-GridUse"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="action_name">.uno:ReplyComment</property> + <property name="action_name">.uno:GridUse</property> </object> <packing> <property name="expand">False</property> @@ -6567,10 +7354,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="DeleteComment"> + <object class="GtkToolButton" id="Draw-HelplinesMove"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="action_name">.uno:DeleteComment</property> + <property name="action_name">.uno:HelplinesMove</property> </object> <packing> <property name="expand">False</property> @@ -6585,19 +7372,29 @@ </packing> </child> <child> - <object class="svtlo-ManagedMenuButton" id="commentsb:MenuComments"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|CommentsButton">_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-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="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">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -6608,20 +7405,36 @@ <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">3</property> + <property name="position">7</property> </packing> </child> + <style> + <class name="context-Draw"/> + </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="FilesSectionsRev"> + <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="separator23"> + <object class="GtkSeparator" id="separator14"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -6634,22 +7447,22 @@ </packing> </child> <child> - <object class="GtkBox" id="Section25"> + <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="SectionBottom27"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom20"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</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="GtkToolButton" id="Image-InsertCaptionDialog"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ProtectTraceChangeMode</property> + <property name="can_focus">True</property> + <property name="action_name">.uno:InsertCaptionDialog</property> </object> <packing> <property name="expand">False</property> @@ -6657,24 +7470,36 @@ </packing> </child> <child> - <object class="GtkToolButton" id="CompareDocuments1"> + <object class="GtkToolButton" id="Image-Crop"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:CompareDocuments</property> + <property name="can_focus">True</property> + <property name="action_name">.uno:Crop</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="Image-CompressGraphic"> + <property name="visible">True</property> + <property name="can_focus">True</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="MergeDocuments1"> + <object class="GtkToolButton" id="Image-GraphicDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:MergeDocuments</property> + <property name="valign">center</property> + <property name="action_name">.uno:GraphicDialog</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -6686,15 +7511,26 @@ </packing> </child> <child> - <object class="svtlo-ManagedMenuButton" id="compareb:MenuCompare"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|CompareButton">Com_pare</property> + <object class="GtkBox" id="box5"> <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="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> + </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> @@ -6709,25 +7545,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">4</property> + <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ViewSection2"> + <object class="sfxlo-OptionalBox" id="Image-Section-FormatLineArea"> <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="separator109"> <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> @@ -6738,48 +7572,25 @@ </packing> </child> <child> - <object class="GtkBox" id="Section20"> + <object class="GtkBox" id="box54"> <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="third7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">icons</property> + <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="ControlCodes1"> + <object class="GtkToolButton" id="Image-BorderDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ControlCodes</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="PrintPreview1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:PrintPreview</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Zoom1"> - <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:BorderDialog</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -6790,14 +7601,22 @@ </packing> </child> <child> - <object class="svtlo-ManagedMenuButton" id="viewA:MenuView"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ViewButton">_View</property> + <object class="sfxlo-NotebookbarToolBox" id="third8"> <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">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> @@ -6812,150 +7631,65 @@ <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">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"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkSeparator" id="separator29"> - <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="Section29"> + <object class="GtkBox" id="box56"> <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="box57"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom30"> + <object class="sfxlo-NotebookbarToolBox" id="first10"> <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="InsertCaptionDialogGraphic"> + <object class="GtkMenuToolButton" id="Image-SetBorderStyle"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:InsertCaptionDialog</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="SelectObject1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:SelectObject</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="ToggleObjectRotateMode"> - <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="valign">center</property> + <property name="action_name">.uno:SetBorderStyle</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="ToggleObjectBezierMode"> + <object class="GtkToolButton" id="Image-LineStyle"> <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:LineStyle</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="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator148"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom55"> <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="SectionBottom12"> - <property name="visible">True</property> - <property name="can_focus">False</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="FlipHorizontal2"> - <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="LineEndStyle1"> + <object class="GtkToolButton" id="Image-FrameLineColor"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LineEndStyle</property> + <property name="action_name">.uno:FrameLineColor</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -6963,7 +7697,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> </object> @@ -6974,61 +7708,21 @@ </packing> </child> <child> - <object class="GtkBox" id="box30"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom23"> + <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="editdrawb:MenuDrawEdit"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|DrawEditButton">St_yles</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">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="third1"> + <object class="GtkToolButton" id="Image-FillStyle"> <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"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:XLineColor</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkMenuToolButton" id="FillColor1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:FillColor</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="action_name">.uno:FillStyle</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> </object> @@ -7042,22 +7736,26 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> + <style> + <class name="priority-7"/> + </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> @@ -7070,25 +7768,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="can_focus">True</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> @@ -7096,10 +7794,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> @@ -7107,10 +7805,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> @@ -7125,7 +7834,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> @@ -7138,16 +7847,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> @@ -7155,10 +7864,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> @@ -7166,10 +7875,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> @@ -7191,27 +7900,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|DrawButton">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> @@ -7220,10 +7930,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> @@ -7231,10 +7941,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> @@ -7242,10 +7952,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> @@ -7254,7 +7964,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> @@ -7274,21 +7984,22 @@ </packing> </child> <style> - <class name="priority-5"/> + <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-Wrap"> <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="separator5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -7301,117 +8012,47 @@ </packing> </child> <child> - <object class="GtkBox" id="Section27"> + <object class="GtkBox" id="WrapGroup"> <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="Wrap1"> <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="Wrap2"> + <object class="GtkToolButton" id="Image-WrapOff"> <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="WrapOff2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:WrapOff</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="WrapOn2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:WrapOn</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="WrapIdeal1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:WrapIdeal</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="action_name">.uno:WrapOff</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator146"> + <object class="GtkToolButton" id="Image-WrapOn"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <property name="action_name">.uno:WrapOn</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="homogeneous">True</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap6"> + <object class="GtkToolButton" id="Image-WrapIdeal"> <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> + <property name="action_name">.uno:WrapIdeal</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -7422,50 +8063,43 @@ </packing> </child> <child> - <object class="GtkBox" id="box7"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap5"> <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="svtlo-ManagedMenuButton" id="arrangeD:MenuArrange"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ArrangeButton">_Arrange</property> + <object class="GtkToolButton" id="Image-WrapLeft"> <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="action_name">.uno:WrapLeft</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap3"> + <object class="GtkToolButton" id="Image-WrapThrough"> <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="ObjectAlignDraw1"> - <property name="visible">True</property> - <property name="can_focus">True</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:WrapThrough</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> + <child> + <object class="GtkToolButton" id="Image-WrapRight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:WrapRight</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -7483,21 +8117,22 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-5"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="GridSection2"> + <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="separator31"> + <object class="GtkSeparator" id="separator15"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -7510,48 +8145,106 @@ </packing> </child> <child> - <object class="GtkBox" id="Section30"> + <object class="GtkBox" id="Section19"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom28"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom21"> <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="GridVisible1"> + <object class="GtkToolButton" id="Image-GrafMode"> <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:GrafMode</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="GtkBox" id="box24"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkToolButton" id="GridUse1"> + <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="action_name">.uno:GridUse</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="homogeneous">True</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> + <style> + <class name="priority-4"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Image-Section-ColorSettings"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <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-SidebarToolBox" id="colorbox3"> + <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-GrafLuminance"> + <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:GrafLuminance</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -7562,23 +8255,23 @@ </packing> </child> <child> - <object class="GtkBox" id="box32"> + <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="svtlo-ManagedMenuButton" id="Grid:MenuGrid"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridButton">_Grid</property> + <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="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:GrafTransparence</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> @@ -7602,15 +8295,98 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="padding">5</property> + <property name="position">5</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="GroupSection2"> + <object class="sfxlo-OptionalBox" id="Image-Section-ColorSettings2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_left">5</property> <child> - <object class="GtkSeparator" id="separator33"> + <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="GtkMenuToolButton" id="Image-GrafContrast"> + <property name="width_request">130</property> + <property name="visible">True</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">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="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="GtkMenuToolButton" id="Image-GrafGamma"> + <property name="width_request">130</property> + <property name="visible">True</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="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">0</property> + </packing> + </child> + <style> + <class name="priority-2"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> + </child> + <child> + <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="separator16"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -7623,47 +8399,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="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="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="action_name">.uno:HelplinesMove</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -7675,18 +8451,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|GroupButton">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> @@ -7709,21 +8486,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="separator41"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -7736,32 +8527,35 @@ </packing> </child> <child> - <object class="GtkBox" id="Section33"> + <object class="GtkBox" id="Section40"> <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="SectionBottom31"> <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="Object-InsertCaptionDialog"> <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="valign">center</property> + <property name="vexpand">True</property> + <property name="action_name">.uno:InsertCaptionDialog</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="Object-ToggleObjectRotateMode"> <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:ToggleObjectRotateMode</property> </object> <packing> <property name="expand">False</property> @@ -7769,16 +8563,28 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="ExtrusionSurfaceFloater"> + <object class="GtkToolButton" id="Object-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="homogeneous">True</property> </packing> </child> + <child> + <object class="GtkToolButton" id="Object-FrameDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:FrameDialog</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -7787,61 +8593,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|3DButton">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> @@ -7858,37 +8627,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="separator69"> <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> @@ -7899,61 +8654,124 @@ </packing> </child> <child> - <object class="GtkBox" id="Section28"> + <object class="GtkBox" id="box51"> <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="GtkToolButton" id="Object-BorderDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BorderDialog</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="sfxlo-NotebookbarToolBox" id="SectionBottom5"> + <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="box64"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box66"> + <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"> + <object class="GtkMenuToolButton" id="Object-SetBorderStyle"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> <property name="action_name">.uno:SetBorderStyle</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> - <object class="GtkMenuToolButton" id="FrameLineColor1"> + <object class="GtkToolButton" id="Object-LineStyle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FrameLineColor</property> + <property name="action_name">.uno:LineStyle</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="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-FrameLineColor"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FillColor</property> + <property name="action_name">.uno:FrameLineColor</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -7961,7 +8779,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> @@ -7972,51 +8790,21 @@ </packing> </child> <child> - <object class="GtkBox" id="box35"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom45"> + <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|FrameButton">F_rame</property> - <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> - </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="third2"> + <object class="GtkToolButton" id="Object-FillStyle"> <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:FillStyle</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> </object> @@ -8030,22 +8818,26 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> + <style> + <class name="priority-4"/> + </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="separator28"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -8058,25 +8850,25 @@ </packing> </child> <child> - <object class="GtkBox" id="Section35"> + <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="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:WrapOff</property> + <property name="action_name">.uno:BringToFront</property> </object> <packing> <property name="expand">False</property> @@ -8084,10 +8876,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="WrapOn1"> + <object class="GtkToolButton" id="Object-ObjectForwardOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WrapOn</property> + <property name="action_name">.uno:ObjectForwardOne</property> </object> <packing> <property name="expand">False</property> @@ -8095,10 +8887,21 @@ </packing> </child> <child> - <object class="GtkToolButton" id="WrapIdeal2"> + <object class="GtkToolButton" id="Object-ObjectBackOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WrapIdeal</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="Object-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> @@ -8113,7 +8916,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator147"> + <object class="GtkSeparator" id="separator32"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -8126,16 +8929,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> @@ -8143,10 +8946,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> @@ -8154,10 +8957,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> @@ -8179,25 +8982,75 @@ </packing> </child> <child> - <object class="GtkBox" id="box37"> + <object class="GtkBox" id="box35"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="arrangeO:MenuArrange"> + <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> @@ -8223,11 +9076,12 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="GridSection1"> + <object class="sfxlo-OptionalBox" id="Object-Section-Wrap"> <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="separator71"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -8240,22 +9094,21 @@ </packing> </child> <child> - <object class="GtkBox" id="Section36"> + <object class="GtkBox" id="WrapGroup2"> <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="Wrap4"> <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-WrapOff"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:GridVisible</property> + <property name="action_name">.uno:WrapOff</property> </object> <packing> <property name="expand">False</property> @@ -8263,10 +9116,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="GridUse2"> + <object class="GtkToolButton" id="Object-WrapOn"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:GridUse</property> + <property name="action_name">.uno:WrapOn</property> </object> <packing> <property name="expand">False</property> @@ -8274,10 +9127,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="HelplinesMove2"> + <object class="GtkToolButton" id="Object-WrapIdeal"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:HelplinesMove</property> + <property name="action_name">.uno:WrapIdeal</property> </object> <packing> <property name="expand">False</property> @@ -8292,23 +9145,43 @@ </packing> </child> <child> - <object class="GtkBox" id="box38"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap7"> <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="svtlo-ManagedMenuButton" id="GridO:MenuGrid"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridButton">_Grid</property> + <object class="GtkToolButton" id="Object-WrapLeft"> <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="action_name">.uno:WrapLeft</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-WrapThrough"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:WrapThrough</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-WrapRight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:WrapRight</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -8332,16 +9205,16 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">3</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ViewSection1"> + <object class="sfxlo-OptionalBox" id="OLE-Section-Grid"> <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="separator70"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -8359,42 +9232,42 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom29"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom5"> <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="Object-GridVisible"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ControlCodes</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="PrintPreview2"> + <object class="GtkToolButton" id="Object-GridUse"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:PrintPreview</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="Zoom3"> + <object class="GtkToolButton" id="Object-HelplinesMove"> <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:HelplinesMove</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -8410,14 +9283,15 @@ <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|ViewButton">_View</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> @@ -8461,15 +9335,15 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="DrawTextContainer"> + <object class="sfxlo-PriorityMergedHBox" id="MediaContainer"> <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="StylesSection2"> + <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="separator128"> + <object class="GtkSeparator" id="separator121"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -8482,25 +9356,55 @@ </packing> </child> <child> - <object class="GtkBox" id="Section37"> + <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="SectionBottom14"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom25"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="hexpand">True</property> + <property name="valign">end</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="StyleApply2"> + <object class="GtkToolButton" id="Media-InsertCaptionDialog"> <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:InsertCaptionDialog</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Media-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="Media-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="Media-AVMediaPlayer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AVMediaPlayer</property> </object> <packing> <property name="expand">False</property> @@ -8515,18 +9419,19 @@ </packing> </child> <child> - <object class="GtkBox" id="box39"> + <object class="GtkBox" id="box30"> <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|StylesButton">St_yles</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> @@ -8534,45 +9439,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop7"> - <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"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FormatPaintbrush</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="ResetAttributes2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ResetAttributes</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> @@ -8587,9 +9453,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-4"/> - </style> </object> <packing> <property name="expand">False</property> @@ -8598,14 +9461,15 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormatSection2"> + <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="separator133"> + <object class="GtkSeparator" id="separator130"> <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> @@ -8616,51 +9480,52 @@ </packing> </child> <child> - <object class="GtkBox" id="Section38"> + <object class="GtkBox" id="box61"> <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="third12"> + <property name="width_request">800</property> <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="ExtBottom6"> + <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="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:AVMediaToolBox</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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box63"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom33"> + <object class="sfxlo-NotebookbarToolBox" id="arrange4"> <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"> + <object class="GtkToolButton" id="Media-BringToFront"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FontHeight</property> + <property name="action_name">.uno:BringToFront</property> </object> <packing> <property name="expand">False</property> @@ -8668,64 +9533,21 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="BackgroundColor"> + <object class="GtkToolButton" id="Media-ObjectForwardOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BackgroundColor</property> + <property name="action_name">.uno:ObjectForwardOne</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="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box41"> - <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|FormatButton">F_ormat</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">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <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="Bold2"> + <object class="GtkToolButton" id="Media-ObjectBackOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Bold</property> + <property name="action_name">.uno:ObjectBackOne</property> </object> <packing> <property name="expand">False</property> @@ -8733,21 +9555,47 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Italic2"> + <object class="GtkToolButton" id="Media-SendToBack"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Italic</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> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator141"> + <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="Wrap6"> + <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="Underline2"> + <object class="GtkToolButton" id="Media-WrapOff"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Underline</property> + <property name="action_name">.uno:WrapOff</property> </object> <packing> <property name="expand">False</property> @@ -8755,10 +9603,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Strikeout2"> + <object class="GtkToolButton" id="Media-WrapOn"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Strikeout</property> + <property name="action_name">.uno:WrapOn</property> </object> <packing> <property name="expand">False</property> @@ -8766,10 +9614,10 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="fontcolor2"> + <object class="GtkToolButton" id="Media-WrapIdeal"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Color</property> + <property name="action_name">.uno:WrapIdeal</property> </object> <packing> <property name="expand">False</property> @@ -8780,79 +9628,34 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">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="sfxlo-OptionalBox" id="ParagraphSection1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> - <child> - <object class="GtkSeparator" id="separator139"> - <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="Section39"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkBox" id="box42"> - <property name="visible">True</property> - <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom7"> + <object class="GtkSeparator" id="separator148"> + <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="Wrap8"> <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="LeftPara3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:LeftPara</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="CenterPara2"> + <object class="GtkToolButton" id="Media-WrapLeft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CenterPara</property> + <property name="action_name">.uno:WrapLeft</property> </object> <packing> <property name="expand">False</property> @@ -8860,10 +9663,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="RightPara2"> + <object class="GtkToolButton" id="Media-WrapThrough"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:RightPara</property> + <property name="action_name">.uno:WrapThrough</property> </object> <packing> <property name="expand">False</property> @@ -8871,10 +9674,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="JustifyPara3"> + <object class="GtkToolButton" id="Media-WrapRight"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:JustifyPara</property> + <property name="action_name">.uno:WrapRight</property> </object> <packing> <property name="expand">False</property> @@ -8885,33 +9688,35 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">4</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator150"> + <object class="GtkSeparator" id="separator149"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</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="padding">5</property> - <property name="position">1</property> + <property name="position">5</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom34"> + <object class="sfxlo-NotebookbarToolBox" id="Align9"> <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="CommonAlignTop"> + <object class="GtkToolButton" id="Media-ObjectAlignLeft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CommonAlignTop</property> + <property name="action_name">.uno:ObjectAlignLeft</property> </object> <packing> <property name="expand">False</property> @@ -8919,10 +9724,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="CommonAlignVerticalCenter"> + <object class="GtkToolButton" id="Media-AlignCenter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CommonAlignVerticalCenter</property> + <property name="action_name">.uno:AlignCenter</property> </object> <packing> <property name="expand">False</property> @@ -8930,10 +9735,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="CommonAlignBottom"> + <object class="GtkToolButton" id="Media-ObjectAlignRight"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CommonAlignBottom</property> + <property name="action_name">.uno:ObjectAlignRight</property> </object> <packing> <property name="expand">False</property> @@ -8944,50 +9749,34 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">6</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="box43"> - <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|ParagraphButton">_Paragraph</property> + <object class="GtkSeparator" id="separator146"> <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="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">7</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom12"> + <object class="sfxlo-NotebookbarToolBox" id="Align10"> <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="ParaspaceDecrease1"> + <object class="GtkToolButton" id="Media-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> @@ -8995,10 +9784,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="ParaspaceIncrease1"> + <object class="GtkToolButton" id="Media-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> @@ -9006,10 +9795,10 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="LineSpacing1"> + <object class="GtkToolButton" id="Media-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> @@ -9020,7 +9809,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">8</property> </packing> </child> </object> @@ -9038,22 +9827,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">2</property> + <property name="position">1</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="PrintContainer"> + <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="ViewSection3"> + <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="separator145"> + <object class="GtkSeparator" id="separator110"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -9066,21 +9868,22 @@ </packing> </child> <child> - <object class="GtkBox" id="Section43"> + <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="SectionBottom43"> + <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="ControlCodes3"> + <object class="GtkToolButton" id="Print-ShowSinglePage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ControlCodes</property> + <property name="action_name">.uno:ShowSinglePage</property> </object> <packing> <property name="expand">False</property> @@ -9088,10 +9891,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="PrintPreview3"> + <object class="GtkToolButton" id="Print-ShowTwoPages"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:PrintPreview</property> + <property name="action_name">.uno:ShowTwoPages</property> </object> <packing> <property name="expand">False</property> @@ -9099,17 +9902,29 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Zoom4"> + <object class="GtkToolButton" id="Print-ShowBookview"> <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:ShowBookview</property> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> + <child> + <object class="GtkMenuToolButton" id="Print-ShowMultiplePages"> + <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:ShowMultiplePages</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -9118,22 +9933,22 @@ </packing> </child> <child> - <object class="GtkBox" id="box45"> + <object class="GtkBox" id="box55"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="viewc:MenuView"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ViewButton">_View</property> + <object class="svtlo-ManagedMenuButton" id="Print-SlideLayout:MenuSlideLayout"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|PrintMenuButton">_Layout</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> - <property name="fill">True</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> @@ -9152,35 +9967,22 @@ </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-2"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">0</property> </packing> </child> - <style> - <class name="context-DrawText"/> - </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="TableContainer"> - <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="StylesSection1"> + <object class="sfxlo-OptionalBox" id="Print-Section-Navigate"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator3"> + <object class="GtkSeparator" id="separator74"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -9193,21 +9995,21 @@ </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="sfxlo-NotebookbarToolBox" id="SectionBottom1"> + <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="StyleApply1"> + <object class="GtkToolButton" id="Print-ZoomMinus"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:StyleApply</property> + <property name="action_name">.uno:ZoomMinus</property> </object> <packing> <property name="expand">False</property> @@ -9222,62 +10024,20 @@ </packing> </child> <child> - <object class="GtkBox" id="box17"> + <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="svtlo-ManagedMenuButton" id="paragraphstylet:MenuStyle"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|StyleButton">St_yles</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="ExtTop1"> + <object class="GtkToolButton" id="Print-GoToStartOfDoc"> <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="FormatPaintbrush1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FormatPaintbrush</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="ResetAttributes1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ResetAttributes</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="action_name">.uno:GoToStartOfDoc</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> @@ -9294,103 +10054,28 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-8"/> - </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="FormatSection1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> - <child> - <object class="GtkSeparator" id="separator123"> - <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="Section34"> + <object class="GtkBox" id="Section13"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box18"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom17"> <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="show_arrow">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom1"> - <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="CharFontName1"> - <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="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom10"> + <object class="GtkToolButton" id="Print-PreviewZoom"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">5</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="FontHeight1"> - <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="BackColor1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BackColor</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="action_name">.uno:PreviewZoom</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> @@ -9401,94 +10086,42 @@ </packing> </child> <child> - <object class="GtkBox" id="box19"> + <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="svtlo-ManagedMenuButton" id="formatt:MenuFormat"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|FormatButton">F_ormat</property> + <object class="GtkToolButton" id="Print-PageUp"> <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="action_name">.uno:PageUp</property> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop2"> + <object class="GtkToolButton" id="Print-JumpToSpecificPage"> <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"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Bold</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Italic1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Italic</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Underline1"> - <property name="visible">True</property> - <property name="can_focus">False</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="Strikeout1"> - <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="fontcolor1"> - <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> + <property name="action_name">.uno:JumpToSpecificPage</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> + <child> + <object class="GtkToolButton" id="Print-PageDown"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PageDown</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -9502,111 +10135,29 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</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-OptionalBox" id="ParagraphSection2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator4"> - <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="Section11"> + <object class="GtkBox" id="Section14"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box4"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom47"> <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="ExtBottom4"> - <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="LeftPara2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:LeftPara</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="JustifyPara2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:JustifyPara</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="SectionBottom11"> + <object class="GtkToolButton" id="Print-ZoomPlus"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkMenuToolButton" id="DefaultBullet1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:DefaultBullet</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkMenuToolButton" id="DefaultNumbering1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:DefaultNumbering</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="action_name">.uno:ZoomPlus</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -9617,39 +10168,20 @@ </packing> </child> <child> - <object class="GtkBox" id="box20"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom18"> <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="paragrapht:MenuParagraph"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ParagraphButton">_Paragraph</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="ExtBottom9"> + <object class="GtkToolButton" id="Print-GoToEndOfDoc"> <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> + <property name="action_name">.uno:GoToEndOfDoc</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> @@ -9663,26 +10195,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-6"/> + <class name="priority-1"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="TableSection"> + <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="separator7"> + <object class="GtkSeparator" id="separator73"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -9695,32 +10227,22 @@ </packing> </child> <child> - <object class="GtkBox" id="Section13"> + <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="SectionBottom15"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom36"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">icons</property> + <property name="valign">end</property> + <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="InsertCaptionDialog2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:InsertCaptionDialog</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkMenuToolButton" id="SetBorderStyle1"> + <object class="GtkToolButton" id="Print-Print"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SetBorderStyle</property> + <property name="action_name">.uno:Print</property> </object> <packing> <property name="expand">False</property> @@ -9728,13 +10250,13 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="BackgroundColor1"> + <object class="GtkToolButton" id="Print-ClosePreview"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BackgroundColor</property> + <property name="action_name">.uno:ClosePreview</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -9746,18 +10268,18 @@ </packing> </child> <child> - <object class="GtkBox" id="box6"> + <object class="GtkBox" id="box50"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="tableT:MenuTable"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|TableButton">T_able</property> + <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> - <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -9766,7 +10288,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom11"> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop9"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -9775,10 +10297,10 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="AutoFormat"> + <object class="GtkToolButton" id="Print-PageDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AutoFormat</property> + <property name="action_name">.uno:PageDialog</property> </object> <packing> <property name="expand">False</property> @@ -9787,7 +10309,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> @@ -9806,23 +10328,33 @@ <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> + <style> + <class name="context-Printpreview"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="sfxlo-PriorityMergedHBox" id="ReviewContainer"> + <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="MergeSection"> + <object class="sfxlo-OptionalBox" id="Review-Section-Language"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator9"> + <object class="GtkSeparator" id="separator19"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -9835,46 +10367,47 @@ </packing> </child> <child> - <object class="GtkBox" id="Section15"> + <object class="GtkBox" id="Section22"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom17"> + <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">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="MergeCells"> + <object class="GtkToolButton" id="Review-SpellingAndGrammarDialog"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:MergeCells</property> + <property name="can_focus">True</property> + <property name="action_name">.uno:SpellingAndGrammarDialog</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="SplitCell"> + <object class="GtkToolButton" id="Review-ThesaurusDialog"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SplitCell</property> + <property name="can_focus">True</property> + <property name="action_name">.uno:ThesaurusDialog</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="SplitTable"> + <object class="GtkToolButton" id="Review-SpellOnline"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SplitTable</property> + <property name="can_focus">True</property> + <property name="action_name">.uno:SpellOnline</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -9886,30 +10419,19 @@ </packing> </child> <child> - <object class="GtkBox" id="box29"> + <object class="svtlo-ManagedMenuButton" id="Review-Language:MenuLanguage"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|LanguageButton">_Language</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="svtlo-ManagedMenuButton" id="merged:MenuMerge"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|MergeButton">_Merge</property> - <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> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> + <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="fill">False</property> <property name="position">1</property> </packing> </child> @@ -9920,23 +10442,20 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-4"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="RowsColumnSection"> + <object class="sfxlo-OptionalBox" id="Review-Section-Review"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator8"> + <object class="GtkSeparator" id="separator20"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -9949,22 +10468,33 @@ </packing> </child> <child> - <object class="GtkBox" id="Section14"> + <object class="GtkBox" id="Section23"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom16"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom24"> <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="InsertColumnsBefore"> + <object class="GtkToolButton" id="Review-TrackChanges"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="action_name">.uno:TrackChanges</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Review-PreviousTrackedChange"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="action_name">.uno:InsertColumnsBefore</property> + <property name="action_name">.uno:PreviousTrackedChange</property> </object> <packing> <property name="expand">False</property> @@ -9972,10 +10502,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="InsertRowsBefore"> + <object class="GtkToolButton" id="Review-NextTrackedChange"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="action_name">.uno:InsertRowsBefore</property> + <property name="action_name">.uno:NextTrackedChange</property> </object> <packing> <property name="expand">False</property> @@ -9983,10 +10513,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="DeleteColumns"> + <object class="GtkToolButton" id="Review-AcceptTrackedChange"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DeleteColumns</property> + <property name="action_name">.uno:AcceptTrackedChange</property> </object> <packing> <property name="expand">False</property> @@ -9994,10 +10524,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="DeleteRows"> + <object class="GtkToolButton" id="Review-RejectTrackedChange"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DeleteRows</property> + <property name="action_name">.uno:RejectTrackedChange</property> </object> <packing> <property name="expand">False</property> @@ -10012,26 +10542,53 @@ </packing> </child> <child> - <object class="GtkBox" id="box23"> + <object class="GtkBox" id="box27"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="rowscolumnst:MenuRowsColumns"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|RowsColumnsButton">R_ows</property> + <object class="svtlo-ManagedMenuButton" id="Review-Review:MenuReview"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|reviewButton">_Review</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">False</property> <property name="halign">start</property> <property name="relief">none</property> <property name="use_underline">True</property> - <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop20"> + <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="Review-AcceptTrackedChanges"> + <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> + </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> @@ -10047,22 +10604,22 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-4"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">1</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SelectSection"> + <object class="sfxlo-OptionalBox" id="Review-Section-Comments"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator12"> + <object class="GtkSeparator" id="separator22"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -10075,35 +10632,22 @@ </packing> </child> <child> - <object class="GtkBox" id="Section16"> + <object class="GtkBox" id="Section24"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom18"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom26"> <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="EntireCell"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:EntireCell</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="EntireColumn"> + <object class="GtkToolButton" id="Review-InsertAnnotation"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:EntireColumn</property> - <property name="use_underline">True</property> + <property name="can_focus">True</property> + <property name="action_name">.uno:InsertAnnotation</property> </object> <packing> <property name="expand">True</property> @@ -10111,25 +10655,24 @@ </packing> </child> <child> - <object class="GtkToolButton" id="EntireRow"> + <object class="GtkToolButton" id="Review-ReplyComment"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:EntireRow</property> - <property name="use_underline">True</property> + <property name="can_focus">True</property> + <property name="action_name">.uno:ReplyComment</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="SelectTable1"> + <object class="GtkToolButton" id="Review-DeleteComment"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SelectTable</property> + <property name="can_focus">True</property> + <property name="action_name">.uno:DeleteComment</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -10141,30 +10684,19 @@ </packing> </child> <child> - <object class="GtkBox" id="box21"> + <object class="svtlo-ManagedMenuButton" id="Review-Comments:MenuComments"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|CommentsButton">_Comments</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="svtlo-ManagedMenuButton" id="selectt:MenuSelect"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|SelectButton">Selec_t</property> - <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> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <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="fill">False</property> <property name="position">1</property> </packing> </child> @@ -10176,22 +10708,22 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-3"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">12</property> + <property name="position">3</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="CalculateSection"> + <object class="sfxlo-OptionalBox" id="Review-Section-Compare"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator13"> + <object class="GtkSeparator" id="separator23"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -10204,22 +10736,22 @@ </packing> </child> <child> - <object class="GtkBox" id="Section17"> + <object class="GtkBox" id="Section25"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom19"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom27"> <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="InsertFormula"> + <object class="GtkToolButton" id="Review-ProtectTraceChangeMode"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:InsertFormula</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ProtectTraceChangeMode</property> </object> <packing> <property name="expand">False</property> @@ -10227,10 +10759,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="AutoSum"> + <object class="GtkToolButton" id="Review-CompareDocuments"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:AutoSum</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CompareDocuments</property> </object> <packing> <property name="expand">False</property> @@ -10238,10 +10770,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="TableNumberFormatDialog"> + <object class="GtkToolButton" id="Review-MergeDocuments"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:TableNumberFormatDialog</property> + <property name="action_name">.uno:MergeDocuments</property> </object> <packing> <property name="expand">False</property> @@ -10256,26 +10788,15 @@ </packing> </child> <child> - <object class="GtkBox" id="box22"> + <object class="svtlo-ManagedMenuButton" id="Review-Compare:MenuCompare"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|CompareButton">Com_pare</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="svtlo-ManagedMenuButton" id="calculatet:MenuCalculate"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|CalculateButton">_Calc</property> - <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> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> + <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> @@ -10291,34 +10812,22 @@ </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-2"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">14</property> + <property name="position">4</property> </packing> </child> - <style> - <class name="context-Table"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">7</property> - </packing> - </child> - <child> - <object class="sfxlo-PriorityMergedHBox" id="MediaContainer"> - <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="MediaSection"> + <object class="sfxlo-OptionalBox" id="Review-Section-View"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator41"> + <object class="GtkSeparator" id="separator124"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -10331,23 +10840,21 @@ </packing> </child> <child> - <object class="GtkBox" id="Section40"> + <object class="GtkBox" id="Section20"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first22"> - <property name="width_request">1000</property> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom38"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="toolbar_style">both-horiz</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-AVMediaPlayer"> + <object class="GtkToolButton" id="Review-ControlCodes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AVMediaPlayer</property> + <property name="action_name">.uno:ControlCodes</property> </object> <packing> <property name="expand">False</property> @@ -10355,15 +10862,25 @@ </packing> </child> <child> - <object class="GtkToolButton" id="AVMediaToolBox"> - <property name="width_request">600</property> + <object class="GtkToolButton" id="Review-PrintPreview"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="action_name">.uno:AVMediaToolBox</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="Review-Zoom"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Zoom</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -10375,288 +10892,14 @@ </packing> </child> <child> - <object class="GtkBox" id="box51"> + <object class="svtlo-ManagedMenuButton" id="Review-View:MenuView"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ViewButton">_View</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="svtlo-ManagedMenuButton" id="media:MenuArrange"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|MediaButton">_Media</property> - <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> - </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="third3"> - <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="WrapOff3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:WrapOff</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="WrapOn3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:WrapOn</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="WrapIdeal3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:WrapIdeal</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> - <child> - <object class="GtkSeparator" id="separator69"> - <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">False</property> - <property name="padding">5</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="third4"> - <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="WrapLeft1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:WrapLeft</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="WrapThrough1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:WrapThrough</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="WrapRight1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:WrapRight</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="WrapContour"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:WrapContour</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">3</property> - </packing> - </child> - <child> - <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">False</property> - <property name="padding">5</property> - <property name="position">4</property> - </packing> - </child> - <child> - <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> - <property name="icon_size">1</property> - <child> - <object class="GtkToolButton" id="AlignLeft1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AlignLeft</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="AlignHorizontalCenter1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AlignHorizontalCenter</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="AlignRight1"> - <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="AlignTop2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AlignTop</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="AlignVerticalCenter2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AlignVerticalCenter</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="AlignBottom2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AlignBottom</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">5</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator71"> - <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">False</property> - <property name="padding">5</property> - <property name="position">6</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="thirdExt23"> - <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="TransformDialog1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:TransformDialog</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkMenuToolButton" id="AnchorMenu2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AnchorMenu</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">7</property> - </packing> - </child> + <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> @@ -10671,15 +10914,18 @@ <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">0</property> + <property name="position">5</property> </packing> </child> <style> - <class name="context-Media"/> + <class name="context-Annotation"/> </style> </object> <packing> @@ -10710,36 +10956,4 @@ </packing> </child> </object> - <object class="GtkMenu" id="SlidelayoutMenu"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkMenuItem" id="ShowSinglePageD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ShowSinglePage</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ShowTwoPagesD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ShowTwoPages</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ShowBookviewD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ShowBookview</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ShowMultiplePagesD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ShowMultiplePages</property> - </object> - </child> - </object> </interface> |