diff options
author | andreas kainz <kainz.a@gmail.com> | 2019-06-18 05:12:43 +0200 |
---|---|---|
committer | andreas_kainz <kainz.a@gmail.com> | 2019-06-18 14:02:24 +0200 |
commit | 1f2bc634cd48e6f093fa6821253bd18621eaa1e3 (patch) | |
tree | d13eeae21ea0a250679c6536e2eac1f9be41135a | |
parent | 906eaf8a44f1ba8d08d5f8f74019c22fef4e5a05 (diff) |
NB tabbed compact big update and syncronisation between apps
Change-Id: Ie1178e1e36334b35c7a00b2ec918c79041150c80
Reviewed-on: https://gerrit.libreoffice.org/74268
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
-rw-r--r-- | sc/uiconfig/scalc/ui/notebookbar.ui | 77 | ||||
-rw-r--r-- | sc/uiconfig/scalc/ui/notebookbar_compact.ui | 5609 | ||||
-rw-r--r-- | sd/uiconfig/sdraw/ui/notebookbar_compact.ui | 1762 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_compact.ui | 3029 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_single.ui | 2 |
5 files changed, 7773 insertions, 2706 deletions
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui index 5743fac0b855..4fe81d23d027 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -1769,6 +1769,26 @@ </object> </child> <child> + <object class="GtkSeparatorMenuItem" id="MenuTools-separator"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuTools-GoalSeekDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GoalSeekDialog</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuTools-SolverDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SolverDialog</property> + </object> + </child> + <child> <object class="GtkSeparatorMenuItem" id="MenuTools-separator1"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1789,6 +1809,12 @@ </object> </child> <child> + <object class="GtkSeparatorMenuItem" id="MenuTools-separator4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuTools-ClearArrows"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1796,23 +1822,37 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuTools-ClearArrowPrecedents"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ClearArrowPrecedents</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuTools-ClearArrowDependents"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ClearArrowDependents</property> + </object> + </child> + <child> <object class="GtkSeparatorMenuItem" id="MenuTools-separator2"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuTools-GoalSeekDialog"> + <object class="GtkMenuItem" id="MenuTools-ShowErrors"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:GoalSeekDialog</property> + <property name="action_name">.uno:ShowErrors</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuTools-SolverDialog"> + <object class="GtkMenuItem" id="MenuTools-RefreshArrows"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SolverDialog</property> + <property name="action_name">.uno:RefreshArrows</property> </object> </child> <child> @@ -1822,6 +1862,33 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuTools-AuditingFillMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AuditingFillMode</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuTools-AutoRefreshArrows"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AutoRefreshArrows</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuTools-ShowInvalid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ShowInvalid</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuTools-separator5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuTools-ViewDataSourceBrowser"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1829,7 +1896,7 @@ </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuTools-separator4"> + <object class="GtkSeparatorMenuItem" id="MenuTools-separator6"> <property name="visible">True</property> <property name="can_focus">False</property> </object> diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_compact.ui index 9c307b5df5eb..0e634a827f17 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui @@ -1837,126 +1837,185 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="MacroOrganizerD"> + <object class="GtkMenuItem" id="MenuTools-MacroRecorder"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:MacroOrganizer?TabId:short=1</property> + <property name="action_name">.uno:MacroRecorder</property> </object> </child> <child> - <object class="GtkMenuItem" id="MacroSignatureD"> + <object class="GtkMenuItem" id="MenuTools-RunMacro"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:MacroSignature</property> + <property name="action_name">.uno:RunMacro</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuTools-BasicIDEAppear"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BasicIDEAppear</property> </object> </child> <child> - <object class="GtkMenuItem" id="ScriptOrganizerD"> + <object class="GtkMenuItem" id="MenuTools-MacroOrganizer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:MacroOrganizer?TabId:short=1</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuTools-ScriptOrganizer"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ScriptOrganizer</property> </object> </child> <child> - <object class="GtkMenuItem" id="ViewDataSourceBrowserD"> + <object class="GtkMenuItem" id="MenuTools-MacroSignature"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ViewDataSourceBrowser</property> + <property name="action_name">.uno:MacroSignature</property> </object> </child> <child> - <object class="GtkMenuItem" id="BasicIDEAppearD"> + <object class="GtkSeparatorMenuItem" id="MenuTools-separator"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BasicIDEAppear</property> </object> </child> <child> - <object class="GtkMenuItem" id="RunMacroD"> + <object class="GtkMenuItem" id="MenuTools-GoalSeekDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:RunMacro</property> + <property name="action_name">.uno:GoalSeekDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="MacroRecorderD"> + <object class="GtkMenuItem" id="MenuTools-SolverDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:MacroRecorder</property> + <property name="action_name">.uno:SolverDialog</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator49"> + <object class="GtkSeparatorMenuItem" id="MenuTools-separator1"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="ShowPrecedentsD"> + <object class="GtkMenuItem" id="MenuTools-ShowPrecedents"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ShowPrecedents</property> </object> </child> <child> - <object class="GtkMenuItem" id="ShowDependentsD"> + <object class="GtkMenuItem" id="MenuTools-ShowDependents"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ShowDependents</property> </object> </child> <child> - <object class="GtkMenuItem" id="ClearArrowsD"> + <object class="GtkSeparatorMenuItem" id="MenuTools-separator4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuTools-ClearArrows"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ClearArrows</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator46"> + <object class="GtkMenuItem" id="MenuTools-ClearArrowPrecedents"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:ClearArrowPrecedents</property> </object> </child> <child> - <object class="GtkMenuItem" id="GoalSeekDialogD"> + <object class="GtkMenuItem" id="MenuTools-ClearArrowDependents"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:GoalSeekDialog</property> + <property name="action_name">.uno:ClearArrowDependents</property> </object> </child> <child> - <object class="GtkMenuItem" id="SolverDialogD"> + <object class="GtkSeparatorMenuItem" id="MenuTools-separator2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SolverDialog</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator54"> + <object class="GtkMenuItem" id="MenuTools-ShowErrors"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:ShowErrors</property> </object> </child> <child> - <object class="GtkMenuItem" id="OpenXMLFilterSettingsD"> + <object class="GtkMenuItem" id="MenuTools-RefreshArrows"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:OpenXMLFilterSettings</property> + <property name="action_name">.uno:RefreshArrows</property> </object> </child> <child> - <object class="GtkMenuItem" id="PackageManagerDialogD"> + <object class="GtkSeparatorMenuItem" id="MenuTools-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="OptionsTreeDialogD"> + <object class="GtkMenuItem" id="MenuTools-AuditingFillMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:OptionsTreeDialog</property> + <property name="action_name">.uno:AuditingFillMode</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuTools-AutoRefreshArrows"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AutoRefreshArrows</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuTools-ShowInvalid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ShowInvalid</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuTools-separator5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuTools-ViewDataSourceBrowser"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ViewDataSourceBrowser</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuTools-separator6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuTools-OpenXMLFilterSettings"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:OpenXMLFilterSettings</property> </object> </child> </object> @@ -2861,7 +2920,6 @@ <property name="can_focus">False</property> <property name="halign">end</property> <property name="valign">center</property> - <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom10"> <property name="visible">True</property> @@ -2944,7 +3002,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom3"> <property name="visible">True</property> @@ -3005,9 +3062,8 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="StyleSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-Style"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3075,7 +3131,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="TextSection1"> + <object class="sfxlo-OptionalBox" id="Home-Section-FontName"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3123,7 +3179,7 @@ </packing> </child> <style> - <class name="priority-16"/> + <class name="priority-21"/> </style> </object> <packing> @@ -3133,7 +3189,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="TextSection2"> + <object class="sfxlo-OptionalBox" id="Home-Section-FontHeight"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3164,7 +3220,7 @@ </packing> </child> <style> - <class name="priority-15"/> + <class name="priority-20"/> </style> </object> <packing> @@ -3174,7 +3230,60 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormatSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-GrawShrink"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop12"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="hexpand">True</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Home-Grow"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Grow</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Home-Shrink"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Shrink</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> + <style> + <class name="priority-19"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Home-Section-BoldItalic"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3228,7 +3337,7 @@ <object class="GtkToolButton" id="Home-Underline"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:UnderlineSimple</property> + <property name="action_name">.uno:Underline</property> </object> <packing> <property name="expand">False</property> @@ -3253,18 +3362,15 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-14"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormatSectionExt"> + <object class="sfxlo-OptionalBox" id="Home-Section-SubSuperScript"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3322,17 +3428,17 @@ </packing> </child> <style> - <class name="priority-13"/> + <class name="priority-18"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ColorSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-Border"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3374,6 +3480,34 @@ <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">6</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Home-Section-Color"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="hexpand">True</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> <object class="GtkMenuToolButton" id="Home-FontColor"> <property name="visible">True</property> @@ -3404,18 +3538,15 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-12"/> - </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> <child> - <object class="sfxlo-OptionalBox" id="FontDialog"> + <object class="sfxlo-OptionalBox" id="Home-Section-FontDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3445,18 +3576,15 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-15"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">8</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="JustifySection"> + <object class="sfxlo-OptionalBox" id="Home-Section-Justify"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3504,6 +3632,35 @@ <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> + <style> + <class name="priority-15"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">9</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Home-Section-Justify1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom69"> + <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="Home-AlignRight"> <property name="visible">True</property> @@ -3534,22 +3691,24 @@ </packing> </child> <style> - <class name="priority-11"/> + <class name="priority-14"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">10</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="JustifyVSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-JustifyV"> + <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> <object class="GtkSeparator" id="separator82"> + <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> <property name="margin_bottom">5</property> @@ -3564,6 +3723,7 @@ </child> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom91"> + <property name="visible">True</property> <property name="can_focus">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> @@ -3608,17 +3768,17 @@ </packing> </child> <style> - <class name="priority-10"/> + <class name="priority-13"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">11</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="IndentSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-Indent"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3689,17 +3849,17 @@ </packing> </child> <style> - <class name="priority-9"/> + <class name="priority-11"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">12</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="CellDialog"> + <object class="sfxlo-OptionalBox" id="Home-Section-CellDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3730,17 +3890,17 @@ </packing> </child> <style> - <class name="priority-15"/> + <class name="priority-12"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">10</property> + <property name="position">13</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="CellSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-Row"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3761,16 +3921,38 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom65"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom89"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Home-MergeCells"> + <object class="GtkToolButton" id="Home-InsertRowsBefore"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:MergeCells</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="Home-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> + <child> + <object class="GtkMenuToolButton" id="Home-RowOperations"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RowOperations</property> </object> <packing> <property name="expand">False</property> @@ -3781,36 +3963,55 @@ <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-8"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">11</property> + <property name="position">14</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="RowSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-Column"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom89"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom5"> <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="Home-RowOperations"> + <object class="GtkToolButton" id="Home-InsertColumnsBefore"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:RowOperations</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="Home-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> + <child> + <object class="GtkMenuToolButton" id="Home-ColumnOperations"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ColumnOperations</property> </object> <packing> <property name="expand">False</property> @@ -3825,32 +4026,32 @@ </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-10"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">12</property> + <property name="position">15</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ColumnSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-MergeCells"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom5"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom65"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="toolbar_style">icons</property> + <property name="can_focus">True</property> + <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Home-ColumnOperations"> + <object class="GtkToolButton" id="Home-MergeCells"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ColumnOperations</property> + <property name="action_name">.uno:MergeCells</property> </object> <packing> <property name="expand">False</property> @@ -3861,21 +4062,21 @@ <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="priority-6"/> + <class name="priority-9"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">13</property> + <property name="position">16</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="InsertCellDialog"> + <object class="sfxlo-OptionalBox" id="Home-Section-InsertCellDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3905,18 +4106,15 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-15"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">14</property> + <property name="position">17</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="NumberFormatSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-NumberFormat"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3971,11 +4169,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">15</property> + <property name="position">18</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="NumberFormatSection1"> + <object class="sfxlo-OptionalBox" id="Home-Section-NumberFormat1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4022,11 +4220,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">16</property> + <property name="position">19</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="StyleDropdownSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-Conditional"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4077,11 +4275,65 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">17</property> + <property name="position">20</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Home-Section-StyleDropdown"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="GtkSeparator" id="separator104"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom156"> + <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="Home-StyleApply"> + <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> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">21</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="StyleParagraphSection1"> + <object class="sfxlo-OptionalBox" id="Home-Section-StyleParagraph"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4147,11 +4399,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">18</property> + <property name="position">22</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="StyleSectionExt1"> + <object class="sfxlo-OptionalBox" id="Home-Section-StyleParagraph1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4227,7 +4479,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">19</property> + <property name="position">23</property> </packing> </child> </object> @@ -4298,11 +4550,10 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Insert-InsertDraw"> + <object class="GtkToolButton" id="Insert-Insert"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:InsertDraw</property> + <property name="action_name">.uno:Insert</property> </object> <packing> <property name="expand">False</property> @@ -4386,17 +4637,6 @@ <property name="homogeneous">True</property> </packing> </child> - <child> - <object class="GtkToolButton" id="Insert-FunctionBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FunctionBox</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -4405,19 +4645,28 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator198"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom38"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> <property name="vexpand">True</property> - <property name="orientation">vertical</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Insert-FunctionBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FunctionBox</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="padding">5</property> <property name="position">1</property> </packing> </child> @@ -4435,28 +4684,69 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="ImageChartSection"> + <object class="sfxlo-OptionalBox" id="InsertCellSection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom14"> + <object class="GtkSeparator" id="separator16"> <property name="visible">True</property> - <property name="can_focus">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="sfxlo-NotebookbarToolBox" id="SectionBottom72"> + <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="Insert-InsertGraphic"> + <object class="GtkToolButton" id="Insert-InsertCell"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertGraphic</property> + <property name="action_name">.uno:InsertCell</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> + <child> + <object class="sfxlo-OptionalBox" id="ChartSection"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom14"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Insert-InsertObjectChart"> <property name="visible">True</property> @@ -4468,26 +4758,71 @@ <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> + <style> + <class name="priority-14"/> + </style> + </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="OLESection"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom148"> + <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="Insert-InsertObjectStarMath"> + <object class="GtkToolButton" id="Insert-InsertObject"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertObjectStarMath</property> + <property name="action_name">.uno:InsertObject</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">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-13"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="InsertGraphicSection"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator16"> + <object class="GtkSeparator" id="separator106"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -4498,6 +4833,30 @@ <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="sfxlo-NotebookbarToolBox" id="SectionBottom149"> + <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="Insert-InsertGraphic"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertGraphic</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> @@ -4505,41 +4864,70 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">3</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="BookmarkSection"> + <object class="sfxlo-OptionalBox" id="GallerySection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom11"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom150"> <property name="visible">True</property> - <property name="can_focus">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="Insert-HyperlinkDialog"> + <object class="GtkToolButton" id="Insert-Gallery"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:HyperlinkDialog</property> + <property name="action_name">.uno:Gallery</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> + <style> + <class name="priority-12"/> + </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="MediaSection1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom151"> + <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="Insert-DefineName"> + <object class="GtkToolButton" id="Insert-InsertAVMedia"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DefineName</property> + <property name="action_name">.uno:InsertAVMedia</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -4549,6 +4937,22 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-11"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="HyperlinkSection"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="GtkSeparator" id="separator17"> <property name="visible">True</property> @@ -4561,44 +4965,126 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">2</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom11"> + <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="Insert-HyperlinkDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:HyperlinkDialog</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">6</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="NameSection"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom133"> + <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="Insert-AddName"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AddName</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> <style> - <class name="priority-6"/> + <class name="priority-9"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">7</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FieldSection1"> + <object class="sfxlo-OptionalBox" id="NameSection1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="svtlo-ManagedMenuButton" id="Insert-FieldButton:MenuField"> - <property name="label" translatable="yes" context="notebookbar_compact|FieldMenuButton">Fiel_d</property> - <property name="width_request">80</property> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom152"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:FieldMenu</property> - <property name="image">paragraphstylei</property> - <property name="relief">none</property> - <property name="use_underline">True</property> - <property name="always_show_image">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="Insert-DefineName"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DefineName</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> + <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">8</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="FieldSection1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="GtkSeparator" id="separator28"> <property name="visible">True</property> @@ -4611,33 +5097,66 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">2</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="svtlo-ManagedMenuButton" id="Insert-FieldButton:MenuField"> + <property name="label" translatable="yes" context="notebookbar_compact|FieldMenuButton">Fiel_d</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:FieldMenu</property> + <property name="image">paragraphstylei</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + <property name="always_show_image">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-5"/> + <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">9</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="AutotextSection"> + <object class="sfxlo-OptionalBox" id="DrawTexSection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom67"> + <object class="GtkSeparator" id="separator110"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">icons</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="sfxlo-NotebookbarToolBox" id="SectionBottom153"> + <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="Insert-DrawText"> + <object class="GtkToolButton" id="Insert-DrawText1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:DrawText</property> @@ -4648,16 +5167,29 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Insert-DrawCaption"> + <object class="GtkToolButton" id="Insert-VerticalText1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DrawCaption</property> + <property name="action_name">.uno:VerticalText</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="sfxlo-NotebookbarToolBox" id="SectionBottom67"> + <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="Insert-FontworkGalleryFloater"> <property name="visible">True</property> @@ -4673,11 +5205,24 @@ <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">10</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="DrawSection1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator18"> + <object class="GtkSeparator" id="separator156"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -4688,36 +5233,97 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">2</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom15"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Insert-Line"> + <property name="visible">True</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> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Insert-BasicShapes.rectangle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BasicShapes.rectangle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Insert-BasicShapes.ellipse"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BasicShapes.ellipse</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> <style> - <class name="priority-4"/> + <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">11</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DrawSection"> + <object class="sfxlo-OptionalBox" id="DrawSection2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom15"> + <object class="GtkSeparator" id="separator155"> <property name="visible">True</property> - <property name="can_focus">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="sfxlo-NotebookbarToolBox" id="SectionBottom154"> + <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="Insert-Line"> + <object class="GtkToolButton" id="Insert-LineToolbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Line</property> + <property name="action_name">.uno:LineToolbox</property> </object> <packing> <property name="expand">False</property> @@ -4736,10 +5342,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Insert-LineToolbox"> + <object class="GtkToolButton" id="Insert-DrawCaption1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LineToolbox</property> + <property name="action_name">.uno:DrawCaption</property> </object> <packing> <property name="expand">False</property> @@ -4750,33 +5356,48 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-2"/> + <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">12</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DrawSection1"> + <object class="sfxlo-OptionalBox" id="DrawSection3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom72"> + <object class="GtkSeparator" id="separator18"> <property name="visible">True</property> - <property name="can_focus">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="sfxlo-NotebookbarToolBox" id="SectionBottom155"> + <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="Insert-BasicShapes"> + <object class="GtkToolButton" id="Insert-BasicShapes1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BasicShapes</property> @@ -4787,24 +5408,24 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Insert-CalloutShapes"> + <object class="GtkToolButton" id="Insert-ArrowShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CalloutShapes</property> + <property name="action_name">.uno:ArrowShapes</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="Insert-FlowChartShapes"> + <object class="GtkToolButton" id="Insert-FlowChartShapes1"> <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="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -4812,32 +5433,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator199"> - <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">1</property> </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">13</property> </packing> </child> <child> @@ -4847,6 +5453,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator19"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom115"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -4863,11 +5484,37 @@ <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">15</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="FormulaSection"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40"> + <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="Insert-EmojiControl"> + <object class="GtkToolButton" id="Insert-InsertObjectStarMath"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:EmojiControl</property> + <property name="action_name">.uno:InsertObjectStarMath</property> </object> <packing> <property name="expand">False</property> @@ -4881,29 +5528,54 @@ <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">16</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="EmojiSection"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator19"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom131"> <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> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Insert-EmojiControl"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:EmojiControl</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="padding">5</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-3"/> + <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">17</property> </packing> </child> </object> @@ -4943,7 +5615,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="PageLayoutSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-PageLayout"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4991,7 +5663,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="PrintSectio"> + <object class="sfxlo-OptionalBox" id="Layout-Section-Print"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5037,10 +5709,23 @@ <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="Layout-Section-Print1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom97"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom136"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> @@ -5056,6 +5741,35 @@ <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <style> + <class name="priority-10"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Layout-Section-Print2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom97"> + <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="Layout-AddPrintArea"> <property name="visible">True</property> @@ -5069,6 +5783,35 @@ <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <style> + <class name="priority-9"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Layout-Section-Print3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom137"> + <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="Layout-DeletePrintArea"> <property name="visible">True</property> @@ -5090,17 +5833,17 @@ </packing> </child> <style> - <class name="priority-10"/> + <class name="priority-8"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">4</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Layout-AutoFormat-Section"> + <object class="sfxlo-OptionalBox" id="Layout-Section-AutoFormat"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5147,17 +5890,17 @@ </packing> </child> <style> - <class name="priority-9"/> + <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">5</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SelectGroupSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-SelectGroup"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5194,6 +5937,35 @@ <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> + <style> + <class name="priority-6"/> + </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="SectionSelectGroup1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom135"> + <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="Layout-FormatGroup"> <property name="visible">True</property> @@ -5213,17 +5985,17 @@ </packing> </child> <style> - <class name="priority-3"/> + <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">7</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Layout-Align-Section"> + <object class="sfxlo-OptionalBox" id="Layout-Section-Align"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5260,6 +6032,35 @@ <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> + <style> + <class name="priority-4"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">8</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Layout-Section-Align1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Layout-Align-Group1"> + <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="Layout-ObjectAlign"> <property name="visible">True</property> @@ -5282,17 +6083,17 @@ </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">4</property> + <property name="position">9</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="BackFrontSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-Back"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5329,6 +6130,35 @@ <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> + <style> + <class name="priority-2"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">10</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Layout-Section-Front"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom134"> + <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="Layout-ObjectBackOne"> <property name="visible">True</property> @@ -5354,7 +6184,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">11</property> </packing> </child> </object> @@ -5638,6 +6468,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-11"/> + </style> </object> <packing> <property name="expand">False</property> @@ -6344,7 +7177,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="LanguageSection"> + <object class="sfxlo-OptionalBox" id="Review-Section-Language"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6377,11 +7210,40 @@ <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Review-Section-ThesaurusDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom142"> + <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="Review-ThesaurusDialog"> + <object class="GtkToolButton" id="Review-ThesaurusDialog1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ThesaurusDialog</property> + <style> + <class name="priority-8"/> + </style> </object> <packing> <property name="expand">False</property> @@ -6395,15 +7257,57 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-10"/> + </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="AnnotationSection"> + <object class="sfxlo-OptionalBox" id="Review-Section-Hyphenation"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom124"> + <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="Review-Hyphenate"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Hyphenate</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> + <style> + <class name="priority-9"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Review-Section-Annotation"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6440,17 +7344,6 @@ <property name="homogeneous">True</property> </packing> </child> - <child> - <object class="GtkToolButton" id="Review-EditAnnotation"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:EditAnnotation</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -6458,18 +7351,15 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-3"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="AnnotationSection2"> + <object class="sfxlo-OptionalBox" id="Review-Section-Annotation2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6499,17 +7389,17 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-8"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">4</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="AnnotationSection3"> + <object class="sfxlo-OptionalBox" id="Review-Section-Annotation3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6538,17 +7428,17 @@ </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">3</property> + <property name="position">5</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="AnnotationSection4"> + <object class="sfxlo-OptionalBox" id="Review-Section-ShowHide"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6569,7 +7459,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom126"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom143"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> @@ -6592,6 +7482,22 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-6"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Review-Section-ShowHide1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom29"> <property name="visible">True</property> @@ -6616,17 +7522,17 @@ </packing> </child> <style> - <class name="priority-3"/> + <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">7</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="TrackChangesSection"> + <object class="sfxlo-OptionalBox" id="Review-Section-TrackChanges"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6663,8 +7569,34 @@ <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">8</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Review-Section-TrackChanges1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom141"> + <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="Review-AcceptChanges1"> + <object class="GtkToolButton" id="Review-AcceptChanges2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AcceptChanges</property> @@ -6682,17 +7614,17 @@ </packing> </child> <style> - <class name="priority-2"/> + <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">9</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="CompareSection"> + <object class="sfxlo-OptionalBox" id="Review-Section-Compare"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6737,17 +7669,17 @@ </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-3"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">10</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="CompareSection1"> + <object class="sfxlo-OptionalBox" id="Review-Section-Compare1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6769,6 +7701,35 @@ <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> + <style> + <class name="priority-2"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">11</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Review-Section-Compare2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom140"> + <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="Review-MergeDocuments"> <property name="visible">True</property> @@ -6794,7 +7755,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">12</property> </packing> </child> </object> @@ -6911,7 +7872,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="ViewsSection"> + <object class="sfxlo-OptionalBox" id="View-Section-Views"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6944,26 +7905,28 @@ <property name="homogeneous">True</property> </packing> </child> - <child> - <object class="GtkToolButton" id="View-PrintPreview"> - <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> </object> <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">0</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="View-Section-Freeze"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator30"> + <object class="GtkSeparator" id="separator26"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -6975,9 +7938,32 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="padding">5</property> - <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom23"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="View-FreezePanes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FreezePanes</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> @@ -6985,40 +7971,29 @@ <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="VisibleSection"> + <object class="sfxlo-OptionalBox" id="View-Section-Freeze1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom108"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom145"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">icons</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="View-ViewValueHighlighting"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ViewValueHighlighting</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="View-ToggleFormula"> + <object class="GtkToolButton" id="View-SplitWindow"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleFormula</property> + <property name="action_name">.uno:SplitWindow</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -7029,8 +8004,24 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-10"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="View-Section-Visible"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator31"> + <object class="GtkSeparator" id="separator112"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -7044,62 +8035,103 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="padding">5</property> - <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom158"> + <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="View-Navigator"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Navigator</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> <style> - <class name="priority-5"/> + <class name="priority-9"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ZoomSection"> + <object class="sfxlo-OptionalBox" id="View-Section-Visible1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom110"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom159"> <property name="visible">True</property> - <property name="can_focus">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="View-ZoomOptimal"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ZoomOptimal</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="View-Zoom100Percent"> + <object class="GtkToolButton" id="View-ToggleFormula"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Zoom100Percent</property> + <property name="action_name">.uno:ToggleFormula</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-8"/> + </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="View-Section-Visible2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom160"> + <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="View-FullScreen"> + <object class="GtkToolButton" id="View-ToggleSheetGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FullScreen</property> + <property name="action_name">.uno:ToggleSheetGrid</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -7107,11 +8139,27 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-7"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="View-Section-Bars"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator37"> + <object class="GtkSeparator" id="separator141"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -7122,76 +8170,70 @@ <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="sfxlo-NotebookbarToolBox" id="SectionBottom112"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="View-Menubar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Menubar</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> <style> - <class name="priority-3"/> + <class name="priority-6"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">6</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FreezeSection"> + <object class="sfxlo-OptionalBox" id="View-Section-Bars1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom23"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom144"> <property name="visible">True</property> - <property name="can_focus">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="View-FreezePanes"> + <object class="GtkToolButton" id="View-Sidebar"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FreezePanes</property> + <property name="action_name">.uno:Sidebar</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="View-SplitWindow"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SplitWindow</property> - </object> - <packing> - <property name="expand">True</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="GtkSeparator" id="separator26"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="valign">center</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">5</property> - <property name="pack_type">end</property> <property name="position">1</property> </packing> </child> @@ -7202,82 +8244,163 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">7</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="BarsSection"> + <object class="sfxlo-OptionalBox" id="View-Section-Zoom"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom112"> + <object class="GtkSeparator" id="separator37"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom110"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="View-Menubar"> + <object class="GtkToolButton" id="View-ZoomOptimal"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Menubar</property> + <property name="action_name">.uno:ZoomOptimal</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">8</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="View-Section-Zoom1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom146"> + <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="View-Sidebar"> + <object class="GtkToolButton" id="View-Zoom100Percent"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Sidebar</property> + <property name="action_name">.uno:Zoom100Percent</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">0</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">9</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="View-Section-Zoom2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator141"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom147"> <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> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="View-FullScreen"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FullScreen</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="padding">5</property> <property name="position">1</property> </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-3"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">10</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="NewWindowSction"> + <object class="sfxlo-OptionalBox" id="View-Section-NewWindow"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator38"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom111"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -7298,32 +8421,75 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-2"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">11</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="View-Section-EditDoc"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator38"> + <object class="GtkSeparator" id="separator111"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">center</property> <property name="margin_top">5</property> <property name="margin_bottom">5</property> + <property name="vexpand">True</property> <property name="orientation">vertical</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom157"> + <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="View-EditDoc"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:EditDoc</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> <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">12</property> </packing> </child> </object> @@ -7453,33 +8619,30 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="ImageContainer"> + <object class="sfxlo-PriorityMergedHBox" id="GraphicContainer"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="CaptureSection"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Label"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom50"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom78"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-ObjectTitleDescription"> + <object class="GtkToolButton" id="Graphic-AssignMacro"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="action_name">.uno:ObjectTitleDescription</property> + <property name="action_name">.uno:AssignMacro</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -7491,18 +8654,28 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator200"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom27"> <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> + <property name="valign">center</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Graphic-NameGroup"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NameGroup</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="padding">5</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> </object> @@ -7513,37 +8686,51 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="CropSection"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Styles"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom73"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom47"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-Crop"> - <property name="visible">True</property> + <object class="GtkToolButton" id="Graphic-StyleApply2"> <property name="can_focus">False</property> - <property name="action_name">.uno:Crop</property> + <property name="action_name">.uno:StyleApply</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">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-11"/> + </style> + </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="Graphic-Section-Anchor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator201"> + <object class="GtkSeparator" id="separator65"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -7554,48 +8741,143 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">2</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Anchor1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Graphic-AnchorMenu1"> + <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">True</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-10"/> + </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="ImageEditSelection"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Wrap1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom47"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap10"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-CompressGraphic"> + <object class="GtkToolButton" id="Graphic-OriginalSize"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CompressGraphic</property> + <property name="action_name">.uno:OriginalSize</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> + <style> + <class name="priority-9"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Wrap2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Wrap11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-ChangePicture"> + <object class="GtkToolButton" id="Graphic-FitCellSize"> + <property name="can_focus">False</property> + <property name="action_name">.uno:FitCellSize</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> + <style> + <class name="priority-8"/> + </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="Graphic-Section-TransformDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Wrap12"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Graphic-TransformDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ChangePicture</property> + <property name="visible_horizontal">False</property> + <property name="action_name">.uno:TransformDialog</property> + <property name="icon_name">sfx2/res/symphony/open_more.png</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -7605,8 +8887,24 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-7"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Align"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator65"> + <object class="GtkSeparator" id="separator53"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -7617,33 +8915,55 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">2</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="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Graphic-ObjectAlign"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlign</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </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> + <property name="position">6</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ConfigSelection"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Align1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom49"> + <object class="sfxlo-NotebookbarToolBox" id="Align7"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">icons</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-FlipHorizontal"> + <object class="GtkToolButton" id="Graphic-AlignCenter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> + <property name="action_name">.uno:AlignCenter</property> </object> <packing> <property name="expand">False</property> @@ -7651,10 +8971,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-FlipVertical"> + <object class="GtkToolButton" id="Graphic-ObjectAlignRight"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipVertical</property> + <property name="action_name">.uno:ObjectAlignRight</property> </object> <packing> <property name="expand">False</property> @@ -7665,22 +8985,68 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-6"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Align2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator66"> + <object class="sfxlo-NotebookbarToolBox" id="Align8"> <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> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Graphic-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="Graphic-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> + <child> + <object class="GtkToolButton" id="Graphic-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> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <style> @@ -7690,26 +9056,39 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">8</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ColorSelection"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Arrange1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom46"> + <object class="GtkSeparator" id="separator46"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</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="sfxlo-NotebookbarToolBox" id="SectionBottom48"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Image-GraphicFilterToolbox"> - <property name="visible">True</property> + <object class="GtkToolButton" id="Graphic-BringToFront"> <property name="can_focus">False</property> - <property name="action_name">.uno:GraphicFilterToolbox</property> + <property name="action_name">.uno:BringToFront</property> </object> <packing> <property name="expand">False</property> @@ -7717,10 +9096,10 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="Image-GrafMode"> + <object class="GtkToolButton" id="Graphic-ObjectForwardOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:GrafMode</property> + <property name="action_name">.uno:ObjectForwardOne</property> </object> <packing> <property name="expand">False</property> @@ -7731,20 +9110,35 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</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">9</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Arrange2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom79"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom49"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">icons</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-FormatLine"> + <object class="GtkToolButton" id="Graphic-ObjectBackOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatLine</property> + <property name="action_name">.uno:ObjectBackOne</property> </object> <packing> <property name="expand">False</property> @@ -7752,10 +9146,9 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-FormatArea"> - <property name="visible">True</property> + <object class="GtkToolButton" id="Graphic-SendToBack1"> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatArea</property> + <property name="action_name">.uno:SendToBack</property> </object> <packing> <property name="expand">False</property> @@ -7769,8 +9162,24 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">10</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Crop"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator182"> + <object class="GtkSeparator" id="separator49"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -7781,37 +9190,56 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">2</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Graphic-Crop"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Crop</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> - <style> - <class name="priority-4"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">11</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="GraphSelection"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-SaveReplace"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom48"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">icons</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Image-GrafLuminance"> + <object class="GtkToolButton" id="Graphic-ChangePicture"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:GrafLuminance</property> + <property name="action_name">.uno:ChangePicture</property> </object> <packing> <property name="expand">False</property> @@ -7819,11 +9247,10 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="Image-GrafContrast"> + <object class="GtkToolButton" id="Graphic-CompressGraphic"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:GrafContrast</property> + <property name="action_name">.uno:CompressGraphic</property> </object> <packing> <property name="expand">False</property> @@ -7831,11 +9258,48 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="Image-GrafTransparence"> + <object class="GtkToolButton" id="Graphic-SaveGraphic"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:GrafTransparence</property> + <property name="action_name">.uno:SaveGraphic</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">12</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Graphic-Section-GraphicDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Graphic"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Graphic-GraphicDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="visible_horizontal">False</property> + <property name="action_name">.uno:GraphicDialog</property> + <property name="icon_name">sfx2/res/symphony/open_more.png</property> </object> <packing> <property name="expand">False</property> @@ -7849,8 +9313,21 @@ <property name="position">0</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">13</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Graphic-Section-GraphicFilterToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator183"> + <object class="GtkSeparator" id="separator69"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -7861,44 +9338,64 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">2</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom50"> + <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="Graphic-GraphicFilterToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GraphicFilterToolbox</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> <style> - <class name="priority-3"/> + <class name="priority-16"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">14</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="AnchorSelection"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-ColorSettings"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom78"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom73"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="toolbar_style">icons</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-AnchorMenu"> + <object class="GtkToolButton" id="Graphic-ColorSettings"> <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:AnchorMenu</property> + <property name="action_name">.uno:ColorSettings</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -7908,30 +9405,71 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-15"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">15</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Graphic-Section-GrafMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom34"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom4"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="toolbar_style">both-horiz</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-OriginalSize"> + <object class="GtkToolButton" id="Graphic-GrafMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:OriginalSize</property> + <property name="action_name">.uno:GrafMode</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> + <style> + <class name="priority-14"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">16</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Graphic-Section-GrafTransparence"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom74"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-FitCellSize"> + <object class="GtkMenuToolButton" id="Graphic-GrafTransparence"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FitCellSize</property> + <property name="action_name">.uno:GrafTransparence</property> </object> <packing> <property name="expand">False</property> @@ -7942,11 +9480,27 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> + <style> + <class name="priority-13"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">17</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Rotate"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator181"> + <object class="GtkSeparator" id="separator54"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -7957,36 +9511,55 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">2</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom12"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Graphic-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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> - <style> - <class name="priority-2"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">18</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ArrangeSelection"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Flip"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom74"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom5"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">icons</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-BringToFront"> + <object class="GtkToolButton" id="Graphic-FlipVertical"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BringToFront</property> + <property name="action_name">.uno:FlipVertical</property> </object> <packing> <property name="expand">False</property> @@ -7994,10 +9567,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-AlignCenter"> + <object class="GtkToolButton" id="Graphic-FlipHorizontal"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> + <property name="action_name">.uno:FlipHorizontal</property> </object> <packing> <property name="expand">False</property> @@ -8008,37 +9581,16 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <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> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</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">7</property> + <property name="position">19</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -8138,66 +9690,177 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="DrawElementSection"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Label"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom58"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom30"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">icons</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-ArrowsToolbox"> + <object class="GtkToolButton" id="Draw-AssignMacro"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ArrowsToolbox</property> + <property name="action_name">.uno:AssignMacro</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="SectionBottom34"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-LineToolbox"> + <object class="GtkToolButton" id="Draw-NameGroup"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LineToolbox</property> + <property name="action_name">.uno:NameGroup</property> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Styles"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom53"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-BasicShapes"> - <property name="visible">True</property> + <object class="GtkToolButton" id="Draw-StyleApply3"> <property name="can_focus">False</property> - <property name="action_name">.uno:BasicShapes</property> + <property name="action_name">.uno:StyleApply</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> + <style> + <class name="priority-13"/> + </style> + </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="Draw-Section-Anchor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="GtkSeparator" id="separator70"> + <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="sfxlo-NotebookbarToolBox" id="Anchor2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-FlowChartShapes"> + <object class="GtkMenuToolButton" id="Object-AnchorMenu2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlowChartShapes</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">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-12"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Wrap1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Wrap1"> + <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-DrawText"> + <object class="GtkToolButton" id="Draw-OriginalSize"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DrawText</property> + <property name="action_name">.uno:OriginalSize</property> </object> <packing> <property name="expand">False</property> @@ -8208,54 +9871,80 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-11"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Wrap2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator132"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap4"> <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> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FitCellSize"> + <property name="can_focus">False</property> + <property name="action_name">.uno:FitCellSize</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="padding">5</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> + <style> + <class name="priority-10"/> + </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="PointsSection"> + <object class="sfxlo-OptionalBox" id="Draw-Section-WrapDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom92"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap13"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="toolbar_style">icons</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-ToggleObjectBezierMode"> + <object class="GtkToolButton" id="Draw-TextWrapTransformDialog2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectBezierMode</property> + <property name="visible_horizontal">False</property> + <property name="action_name">.uno:TransformDialog</property> + <property name="icon_name">sfx2/res/symphony/open_more.png</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -8265,8 +9954,24 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-9"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Align"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator202"> + <object class="GtkSeparator" id="separator56"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -8277,36 +9982,69 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">2</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align13"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Draw-ObjectAlign"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlign</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </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> + <property name="position">6</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="LineSection"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Align1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom52"> + <object class="sfxlo-NotebookbarToolBox" id="Align1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">text</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-FormatLine"> + <object class="GtkToolButton" id="Draw-AlignCenter2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatLine</property> + <property name="action_name">.uno:AlignCenter</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-ObjectAlignRight2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignRight</property> + </object> + <packing> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -8314,57 +10052,57 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <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">7</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Align2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom53"> + <object class="sfxlo-NotebookbarToolBox" id="Align4"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">icons</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-XLineColor"> + <object class="GtkToolButton" id="Draw-AlignUp2"> <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> - <child> - <object class="GtkToolButton" id="Draw-LineEndStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:LineEndStyle</property> + <property name="action_name">.uno:AlignUp</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkMenuToolButton" id="Draw-XLineStyle"> - <property name="width_request">100</property> + <object class="GtkToolButton" id="Draw-AlignMiddle2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:XLineStyle</property> + <property name="action_name">.uno:AlignMiddle</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkMenuToolButton" id="Draw-LineWidth"> - <property name="width_request">100</property> + <object class="GtkToolButton" id="Draw-AlignDown2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:LineWidth</property> + <property name="action_name">.uno:AlignDown</property> </object> <packing> <property name="expand">False</property> @@ -8378,8 +10116,24 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-7"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">8</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Arrange1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator184"> + <object class="GtkSeparator" id="separator118"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -8390,65 +10144,137 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">2</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom54"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-BringToFront2"> + <property name="can_focus">False</property> + <property name="action_name">.uno:BringToFront</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-6"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">9</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FillSection"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Arrange2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom54"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom55"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">text</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-FormatArea"> + <object class="GtkToolButton" id="Draw-ObjectBackOne2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatArea</property> + <property name="action_name">.uno:ObjectBackOne</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-SendToBack2"> + <property name="can_focus">False</property> + <property name="action_name">.uno:SendToBack</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-5"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">10</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Area1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="GtkSeparator" id="separator119"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom55"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom56"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</property> + <property name="can_focus">False</property> + <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-FillStyle"> - <property name="width_request">200</property> + <object class="GtkToolButton" id="Draw-FormatArea"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FillStyle</property> + <property name="action_name">.uno:FormatArea</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -8458,54 +10284,75 @@ <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">11</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Area2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator185"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom58"> <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> + <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">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-21"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">12</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="WrapSection"> + <object class="sfxlo-OptionalBox" id="Draw-Section-AreaDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom88"> + <object class="sfxlo-NotebookbarToolBox" id="Draw2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="toolbar_style">icons</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Draw-AnchorMenu"> + <object class="GtkToolButton" id="Draw-FormatArea2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AnchorMenu</property> + <property name="visible_horizontal">False</property> + <property name="action_name">.uno:FormatArea</property> + <property name="icon_name">sfx2/res/symphony/open_more.png</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -8515,16 +10362,36 @@ <property name="position">0</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">13</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Line1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="svtlo-ManagedMenuButton" id="Draw-WrapButton:MenuWrap"> - <property name="label" translatable="yes" context="notebookbar_compact|WrapMenuButton">Wrap</property> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom18"> <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="can_focus">False</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FormatLine"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatLine</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -8532,122 +10399,215 @@ <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">14</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Line2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator188"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom19"> <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> + <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">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-18"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">15</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ArrangeSection"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Line3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom60"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">icons</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-ObjectForwardOne"> + <object class="GtkMenuToolButton" id="Draw-XLineStyle1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> + <property name="action_name">.uno:XLineStyle</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> + <style> + <class name="priority-17"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">16</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Line4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-ObjectBackOne"> + <object class="GtkToolButton" id="Draw-LineWidth1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> + <property name="action_name">.uno:LineWidth</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">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-16"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">17</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Line5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator186"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom7"> <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> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-LineEndStyle2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineEndStyle</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="padding">5</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-15"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">18</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="AlignSection"> + <object class="sfxlo-OptionalBox" id="Draw-Section-LineDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="svtlo-ManagedMenuButton" id="Draw-AlignButton:MenuAlign"> - <property name="label" translatable="yes" context="notebookbar_compact|AlignMenuButton">A_lign</property> + <object class="sfxlo-NotebookbarToolBox" id="Draw1"> <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="relief">none</property> - <property name="use_underline">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FormatLine1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="visible_horizontal">False</property> + <property name="action_name">.uno:FormatLine</property> + <property name="icon_name">sfx2/res/symphony/open_more.png</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> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">19</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Rotate"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator189"> + <object class="GtkSeparator" id="separator122"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -8658,75 +10618,119 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">2</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-ToggleObjectRotateMode1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ToggleObjectRotateMode</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-ToggleObjectBezierMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ToggleObjectBezierMode</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> - <style> - <class name="priority-3"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">20</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DrawingSection"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Flip"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom71"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom21"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="toolbar_style">icons</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-SelectObject"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SelectObject</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Draw-ToggleObjectRotateMode"> + <object class="GtkToolButton" id="Draw-FlipVertical1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectRotateMode</property> + <property name="action_name">.uno:FlipVertical</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Draw-FlipVertical"> + <object class="GtkToolButton" id="Draw-FlipHorizontal1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipVertical</property> + <property name="action_name">.uno:FlipHorizontal</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">21</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-TransformDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Draw3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-FlipHorizontal"> + <object class="GtkToolButton" id="Draw-TransformDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> + <property name="visible_horizontal">False</property> + <property name="action_name">.uno:TransformDialog</property> + <property name="icon_name">sfx2/res/symphony/open_more.png</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -8736,6 +10740,19 @@ <property name="position">0</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">22</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-3d"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="GtkSeparator" id="separator130"> <property name="visible">True</property> @@ -8748,36 +10765,91 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">2</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" 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">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-ExtrusionDepthFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ExtrusionDepthFloater</property> + </object> + <packing> + <property name="expand">True</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">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> <style> - <class name="priority-2"/> + <class name="priority-4"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">23</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DrawTextSection"> + <object class="sfxlo-OptionalBox" id="Draw-Section-3d1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom56"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom11"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-InsertCaptionDialog"> + <object class="GtkMenuToolButton" id="Draw-Extrusion3DColor"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertCaptionDialog</property> + <property name="action_name">.uno:Extrusion3DColor</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</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> @@ -8788,11 +10860,27 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">24</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Fontwork"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator70"> + <object class="GtkSeparator" id="separator132"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -8803,7 +10891,102 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">2</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FontworkGalleryFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkGalleryFloater</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FontworkShapeType"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkShapeType</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> + <style> + <class name="priority-2"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">25</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Fontwork1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom14"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FontworkSameLetterHeights"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkSameLetterHeights</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FontworkAlignmentFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkAlignmentFloater</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FontworkCharacterSpacingFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkCharacterSpacingFloater</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> <style> @@ -8813,9 +10996,18 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">26</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">True</property> @@ -8902,9 +11094,6 @@ <property name="position">11</property> </packing> </child> - <style> - <class name="Context-Draw"/> - </style> </object> <packing> <property name="position">9</property> @@ -8918,6 +11107,9 @@ <property name="use_underline">True</property> <style> <class name="context-Draw"/> + <class name="context-DrawLine"/> + <class name="context-3DObject"/> + <class name="context-MultiObject"/> </style> </object> <packing> @@ -8936,59 +11128,114 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="BorderSection"> + <object class="sfxlo-OptionalBox" id="Object-Section-Label"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom94"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom46"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">icons</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-SetBorderStyle"> + <object class="GtkToolButton" id="Object-AssignMacro"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SetBorderStyle</property> + <property name="action_name">.uno:AssignMacro</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">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom52"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-LineStyle"> + <object class="GtkToolButton" id="Object-NameGroup"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LineStyle</property> + <property name="action_name">.uno:NameGroup</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="sfxlo-OptionalBox" id="Object-Section-Styles"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom95"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-FrameLineColor"> - <property name="visible">True</property> + <object class="GtkToolButton" id="Object-StyleApply4"> <property name="can_focus">False</property> - <property name="action_name">.uno:FrameLineColor</property> + <property name="action_name">.uno:StyleApply</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">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-11"/> + </style> + </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="Object-Section-Anchor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator204"> + <object class="GtkSeparator" id="separator74"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -8999,73 +11246,170 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">2</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Anchor3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Object-AnchorMenu3"> + <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">True</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-10"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">2</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="AreaSection1"> + <object class="sfxlo-OptionalBox" id="Object-Section-Wrap3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom98"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">text</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="Object-FormatArea"> + <object class="GtkToolButton" id="Object-OriginalSize"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatArea</property> + <property name="action_name">.uno:OriginalSize</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">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-9"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-Wrap4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom99"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap3"> <property name="visible">True</property> - <property name="can_focus">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="Object-FillStyle"> - <property name="width_request">200</property> + <object class="GtkToolButton" id="Object-FitCellSize"> + <property name="can_focus">False</property> + <property name="action_name">.uno:FitCellSize</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> + <style> + <class name="priority-8"/> + </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="Object-Section-TransformDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Wrap14"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-TransformDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FillStyle</property> + <property name="visible_horizontal">False</property> + <property name="action_name">.uno:TransformDialog</property> + <property name="icon_name">sfx2/res/symphony/open_more.png</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> + <property name="position">0</property> </packing> </child> + <style> + <class name="priority-7"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-Align"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator75"> + <object class="GtkSeparator" id="separator57"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -9076,70 +11420,138 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">2</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align14"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Object-ObjectAlign"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlign</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </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> + <property name="position">6</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="LinkSection"> + <object class="sfxlo-OptionalBox" id="Object-Section-Align3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom95"> + <object class="sfxlo-NotebookbarToolBox" id="Align3"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">icons</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-ChainFrames"> + <object class="GtkToolButton" id="Object-AlignCenter3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ChainFrames</property> + <property name="action_name">.uno:AlignCenter</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Object-UnhainFrames"> + <object class="GtkToolButton" id="Object-ObjectAlignRight3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:UnhainFrames</property> + <property name="action_name">.uno:ObjectAlignRight</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">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-6"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-Align4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator74"> + <object class="sfxlo-NotebookbarToolBox" id="Align5"> <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> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-AlignUp3"> + <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-AlignMiddle3"> + <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> + <child> + <object class="GtkToolButton" id="Object-AlignDown3"> + <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> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <style> @@ -9149,53 +11561,105 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">8</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="WrapSection1"> + <object class="sfxlo-OptionalBox" id="Object-Section-Arrange3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator113"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom96"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="toolbar_style">icons</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Object-AnchorMenu"> + <object class="GtkToolButton" id="Object-BringToFront3"> + <property name="can_focus">False</property> + <property name="action_name">.uno:BringToFront</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-ObjectForwardOne1"> <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:AnchorMenu</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">0</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">9</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-Arrange4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="svtlo-ManagedMenuButton" id="Object-WrapButton:MenuWrap"> - <property name="label" translatable="yes" context="notebookbar_compact|ObjectWrapMenuButton">Wrap</property> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom98"> <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="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-ObjectBackOne1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectBackOne</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-SendToBack1"> + <property name="can_focus">False</property> + <property name="action_name">.uno:SendToBack</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -9203,6 +11667,22 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">10</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-Area1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="GtkSeparator" id="separator126"> <property name="visible">True</property> @@ -9215,21 +11695,42 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">2</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom99"> + <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="Dra-FormatArea1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatArea</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> - <style> - <class name="priority-4"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">11</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ArrangeSection1"> + <object class="sfxlo-OptionalBox" id="Object-Section-Area2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -9237,29 +11738,59 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom100"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">icons</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="Object-ObjectForwardOne"> + <object class="GtkToolButton" id="Draw-FillStyle1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> + <property name="action_name">.uno:FillStyle</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">0</property> + </packing> + </child> + <style> + <class name="priority-18"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">12</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-AreaDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Object4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-ObjectBackOne"> + <object class="GtkToolButton" id="Draw-FormatArea1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> + <property name="visible_horizontal">False</property> + <property name="action_name">.uno:FormatArea</property> + <property name="icon_name">sfx2/res/symphony/open_more.png</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -9269,139 +11800,249 @@ <property name="position">0</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">13</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-Line1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator113"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom25"> <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> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FormatLine2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatLine</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="padding">5</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> - <style> - <class name="priority-3"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">14</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="AlignSection1"> + <object class="sfxlo-OptionalBox" id="Object-Section-Line2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="svtlo-ManagedMenuButton" id="Object-AlignButton:MenuAlign"> - <property name="label" translatable="yes" context="notebookbar_compact|ObjectAlignMenuButton">A_lign</property> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom26"> <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="relief">none</property> - <property name="use_underline">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-XLineColor1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:XLineColor</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> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-18"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">15</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-Line3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator128"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom27"> <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> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Draw-XLineStyle2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:XLineStyle</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="padding">5</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-17"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">16</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DrawTextSection2"> + <object class="sfxlo-OptionalBox" id="Object-Section-Line4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom113"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom23"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-InsertCaptionDialog"> + <object class="GtkToolButton" id="Draw-LineWidth2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertCaptionDialog</property> + <property name="action_name">.uno:LineWidth</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">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-16"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">17</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-Line5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator206"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom24"> <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> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-LineEndStyle1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineEndStyle</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="padding">5</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-15"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">18</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-LineDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Draw4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FormatLine3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="visible_horizontal">False</property> + <property name="action_name">.uno:FormatLine</property> + <property name="icon_name">sfx2/res/symphony/open_more.png</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">19</property> </packing> </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> @@ -9483,10 +12124,6 @@ <property name="position">8</property> </packing> </child> - <style> - <class name="Context-Frame"/> - <class name="Context-OLE"/> - </style> </object> <packing> <property name="position">10</property> @@ -9523,23 +12160,20 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom27"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom60"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">4</property> - <property name="margin_bottom">4</property> + <property name="valign">center</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Media-AssignMacro"> <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:AssignMacro</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -9551,14 +12185,14 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom139"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom71"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-NameGroup1"> + <object class="GtkToolButton" id="Media-NameGroup"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:NameGroup</property> @@ -9583,6 +12217,44 @@ </packing> </child> <child> + <object class="sfxlo-OptionalBox" id="Media-Section-Styles"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom88"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Media-StyleApply"> + <property name="can_focus">False</property> + <property name="action_name">.uno:StyleApply</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> + <style> + <class name="priority-11"/> + </style> + </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="Media-Section-Anchor"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -9609,7 +12281,7 @@ <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Object-AnchorMenu1"> + <object class="GtkMenuToolButton" id="Object-AnchorMenu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AnchorMenu</property> @@ -9633,17 +12305,137 @@ <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="Media-Section-Align1"> + <object class="sfxlo-OptionalBox" id="Media-Section-Wrap1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Wrap9"> + <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="Media-OriginalSize"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:OriginalSize</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> + <style> + <class name="priority-9"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Media-Section-Wrap2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Wrap8"> + <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="Media-FitCellSize"> + <property name="can_focus">False</property> + <property name="action_name">.uno:FitCellSize</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> + <style> + <class name="priority-8"/> + </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="Media-Section-TransformDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Wrap6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Media-TextWrap"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="visible_horizontal">False</property> + <property name="action_name">.uno:TransformDialog</property> + <property name="icon_name">sfx2/res/symphony/open_more.png</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> + <style> + <class name="priority-7"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Media-Section-Align"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator25"> + <object class="GtkSeparator" id="separator59"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -9658,21 +12450,46 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align9"> + <object class="sfxlo-NotebookbarToolBox" id="Align15"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-ObjectAlignLeft"> + <object class="GtkMenuToolButton" id="Media-ObjectAlign"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectAlignLeft</property> + <property name="action_name">.uno:ObjectAlign</property> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Media-Section-Align1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Media-AlignCenter"> <property name="visible">True</property> @@ -9709,7 +12526,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <child> @@ -9770,7 +12587,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">8</property> </packing> </child> <child> @@ -9795,7 +12612,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom30"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom92"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -9834,7 +12651,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">9</property> </packing> </child> <child> @@ -9883,7 +12700,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">10</property> </packing> </child> <child> @@ -9935,7 +12752,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">10</property> + <property name="position">11</property> </packing> </child> <child> @@ -9984,13 +12801,13 @@ </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-12"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">11</property> + <property name="position">12</property> </packing> </child> </object> @@ -10080,9 +12897,6 @@ <property name="position">8</property> </packing> </child> - <style> - <class name="context-Media"/> - </style> </object> <packing> <property name="position">10</property> @@ -10709,9 +13523,6 @@ <property name="position">8</property> </packing> </child> - <style> - <class name="context-Printpreview"/> - </style> </object> <packing> <property name="position">10</property> @@ -10740,6 +13551,7 @@ <object class="sfxlo-PriorityMergedHBox" id="FormContainer"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> <child> <object class="sfxlo-OptionalBox" id="Form-Section-Label1"> <property name="visible">True</property> @@ -10747,11 +13559,10 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom31"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom79"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">4</property> - <property name="margin_bottom">4</property> + <property name="valign">center</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> @@ -10773,10 +13584,11 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom39"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom94"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Form-UseWizards"> @@ -10804,51 +13616,13 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Styles1"> + <object class="sfxlo-OptionalBox" id="Form-Section-Anchor"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom37"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Form-StyleApply5"> - <property name="can_focus">False</property> - <property name="action_name">.uno:StyleApply</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> - <style> - <class name="priority-11"/> - </style> - </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="Form-Section-Anchor1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <child> - <object class="GtkSeparator" id="separator57"> + <object class="GtkSeparator" id="separator128"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10868,7 +13642,8 @@ <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Form-AnchorMenu"> + <object class="GtkMenuToolButton" id="Graphic-AnchorMenu2"> + <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AnchorMenu</property> </object> @@ -10891,72 +13666,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Wrap3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Media-WrapOff5"> - <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="Media-WrapOn5"> - <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="Media-WrapIdeal5"> - <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> - <style> - <class name="priority-9"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Wrap4"> + <object class="sfxlo-OptionalBox" id="Form-Section-Wrap"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -10965,34 +13679,12 @@ <object class="sfxlo-NotebookbarToolBox" id="Wrap7"> <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="Media-WrapLeft4"> - <property name="visible">True</property> + <object class="GtkToolButton" id="Graphic-FitCellSize1"> <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="Media-WrapThrough4"> - <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="Media-WrapRight4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:WrapRight</property> + <property name="action_name">.uno:FitCellSize</property> </object> <packing> <property name="expand">False</property> @@ -11013,11 +13705,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">2</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-WrapDialog1"> + <object class="sfxlo-OptionalBox" id="Form-Section-TransformDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -11028,11 +13720,11 @@ <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-TextWrap4"> + <object class="GtkToolButton" id="Graphic-TransformDialog1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="visible_horizontal">False</property> - <property name="action_name">.uno:TextWrap</property> + <property name="action_name">.uno:TransformDialog</property> <property name="icon_name">sfx2/res/symphony/open_more.png</property> </object> <packing> @@ -11054,17 +13746,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">3</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Align3"> + <object class="sfxlo-OptionalBox" id="Form-Section-Align1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator53"> + <object class="GtkSeparator" id="separator133"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -11079,23 +13771,48 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align5"> + <object class="sfxlo-NotebookbarToolBox" id="Align11"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-ObjectAlignLeft4"> + <object class="GtkMenuToolButton" id="Form-ObjectAlign1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectAlignLeft</property> + <property name="action_name">.uno:ObjectAlign</property> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Form-Section-Align2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align12"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-AlignCenter4"> + <object class="GtkToolButton" id="Graphic-AlignCenter1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignCenter</property> @@ -11106,7 +13823,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-ObjectAlignRight4"> + <object class="GtkToolButton" id="Graphic-ObjectAlignRight1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignRight</property> @@ -11130,22 +13847,22 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">5</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Align4"> + <object class="sfxlo-OptionalBox" id="Form-Section-Align3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align6"> + <object class="sfxlo-NotebookbarToolBox" id="Align2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-AlignUp4"> + <object class="GtkToolButton" id="Graphic-AlignUp2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignUp</property> @@ -11156,7 +13873,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-AlignMiddle4"> + <object class="GtkToolButton" id="Graphic-AlignMiddle2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignMiddle</property> @@ -11167,7 +13884,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-AlignDown4"> + <object class="GtkToolButton" id="Graphic-AlignDown2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignDown</property> @@ -11191,17 +13908,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">6</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Arrange3"> + <object class="sfxlo-OptionalBox" id="Form-Section-Arrange1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator106"> + <object class="GtkSeparator" id="separator137"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -11216,12 +13933,12 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom90"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom113"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-BringToFront4"> + <object class="GtkToolButton" id="Graphic-BringToFront1"> <property name="can_focus">False</property> <property name="action_name">.uno:BringToFront</property> </object> @@ -11231,7 +13948,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-ObjectForwardOne4"> + <object class="GtkToolButton" id="Graphic-ObjectForwardOne1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectForwardOne</property> @@ -11255,22 +13972,22 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">7</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Arrange4"> + <object class="sfxlo-OptionalBox" id="Form-Section-Arrange2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom38"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom126"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-ObjectBackOne4"> + <object class="GtkToolButton" id="Graphic-ObjectBackOne1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectBackOne</property> @@ -11281,7 +13998,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-SendToBack4"> + <object class="GtkToolButton" id="Graphic-SendToBack2"> <property name="can_focus">False</property> <property name="action_name">.uno:SendToBack</property> </object> @@ -11304,17 +14021,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">8</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Label"> + <object class="sfxlo-OptionalBox" id="Form-Section-Label2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator56"> + <object class="GtkSeparator" id="separator139"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -11373,14 +14090,11 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-18"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">10</property> + <property name="position">9</property> </packing> </child> <child> @@ -11390,7 +14104,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom29"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom32"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -11406,7 +14120,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Form-ListBox"> + <object class="GtkToolButton" id="Form-ListBox1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ListBox</property> @@ -11417,7 +14131,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Form-ComboBox"> + <object class="GtkToolButton" id="Form-ComboBox1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ComboBox</property> @@ -11434,14 +14148,11 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-17"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">11</property> + <property name="position">10</property> </packing> </child> <child> @@ -11451,7 +14162,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator59"> + <object class="GtkSeparator" id="separator140"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -11466,13 +14177,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom30"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom34"> <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="Form-ControlProperties"> + <object class="GtkToolButton" id="Form-ControlProperties1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ControlProperties</property> @@ -11489,14 +14200,11 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-16"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">12</property> + <property name="position">11</property> </packing> </child> <child> @@ -11506,13 +14214,13 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom31"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom38"> <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="Form-FormProperties1"> + <object class="GtkToolButton" id="Form-FormProperties2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FormProperties</property> @@ -11529,14 +14237,11 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-15"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">13</property> + <property name="position">12</property> </packing> </child> <child> @@ -11546,13 +14251,13 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom33"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom39"> <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="Form-ShowFmExplorer"> + <object class="GtkToolButton" id="Form-ShowFmExplorer1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ShowFmExplorer</property> @@ -11576,7 +14281,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">14</property> + <property name="position">13</property> </packing> </child> <child> @@ -11586,13 +14291,13 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom37"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom40"> <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="Form-TabDialog"> + <object class="GtkToolButton" id="Form-TabDialog1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:TabDialog</property> @@ -11616,7 +14321,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">15</property> + <property name="position">14</property> </packing> </child> <child> @@ -11626,7 +14331,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator67"> + <object class="GtkSeparator" id="separator142"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -11641,12 +14346,12 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom139"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Form-OpenReadOnly"> + <object class="GtkToolButton" id="Form-OpenReadOnly1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:OpenReadOnly</property> @@ -11657,7 +14362,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Form-AutoControlFocus"> + <object class="GtkToolButton" id="Form-AutoControlFocus1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AutoControlFocus</property> @@ -11681,9 +14386,148 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="position">15</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Form-Section-Form-Farmatted1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="GtkSeparator" id="separator30"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom31"> + <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="Form-FormattedField"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormattedField</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-DateField"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DateField</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-TimeField"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:TimeField</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> + <style> + <class name="priority-2"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">16</property> </packing> </child> + <child> + <object class="sfxlo-OptionalBox" id="Form-Section-Form-Farmatted2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom37"> + <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="Form-NumericField"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NumericField</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-CurrencyField"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CurrencyField</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-PatternField"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PatternField</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> + <style> + <class name="priority-1"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">17</property> + </packing> + </child> </object> <packing> <property name="expand">True</property> @@ -11770,9 +14614,6 @@ <property name="position">8</property> </packing> </child> - <style> - <class name="context-Form"/> - </style> </object> <packing> <property name="position">10</property> @@ -11882,7 +14723,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="MacroSection"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Macro"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -11922,39 +14763,71 @@ <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="sfxlo-OptionalBox" id="Tools-Section-Macro1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator116"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom108"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="valign">center</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Tools-MacroDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:MacroDialog</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="padding">5</property> - <property name="pack_type">end</property> - <property name="position">1</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormularSection"> + <object class="sfxlo-OptionalBox" id="Tools-Section-PrecendentsDependents"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator84"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom43"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -11971,6 +14844,32 @@ <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Tools-Section-PrecendentsDependents1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom161"> + <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="Tools-ShowDependents"> <property name="visible">True</property> @@ -11986,66 +14885,66 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator84"> - <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">1</property> </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-13"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Errors"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom44"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom162"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Tools-SwitchControlDesignMode"> + <object class="GtkToolButton" id="Tools-ShowErrors"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SwitchControlDesignMode</property> + <property name="action_name">.uno:ShowErrors</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">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-12"/> + </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="Tools-Section-Form-DesignMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator119"> + <object class="GtkSeparator" id="separator31"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -12059,14 +14958,50 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="padding">5</property> - <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom125"> + <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="Tools-SwitchControlDesignMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SwitchControlDesignMode</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">5</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-Wizzard"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom57"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom44"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -12088,25 +15023,40 @@ </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-11"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">6</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection2"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-LabelCheckbox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom76"> + <object class="GtkSeparator" id="separator138"> <property name="visible">True</property> - <property name="can_focus">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="sfxlo-NotebookbarToolBox" id="SectionBottom57"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -12142,6 +15092,35 @@ <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> + <style> + <class name="priority-10"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-LabelCheckbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom163"> + <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="Tools-RadioButton"> <property name="visible">True</property> @@ -12179,44 +15158,44 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator138"> - <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">1</property> </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-9"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">8</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection3"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-Buttons"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom85"> + <object class="GtkSeparator" id="separator144"> <property name="visible">True</property> - <property name="can_focus">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="sfxlo-NotebookbarToolBox" id="SectionBottom76"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -12245,44 +15224,44 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator144"> - <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">1</property> </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-8"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">9</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection4"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-Farmatted"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom109"> + <object class="GtkSeparator" id="separator145"> <property name="visible">True</property> - <property name="can_focus">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="sfxlo-NotebookbarToolBox" id="SectionBottom85"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -12318,6 +15297,35 @@ <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> + <style> + <class name="priority-7"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">10</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-Farmatted1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom164"> + <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="Tools-NumericField"> <property name="visible">True</property> @@ -12355,44 +15363,44 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator145"> - <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">1</property> </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-6"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">11</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection5"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-GroupBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom120"> + <object class="GtkSeparator" id="separator146"> <property name="visible">True</property> - <property name="can_focus">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="sfxlo-NotebookbarToolBox" id="SectionBottom109"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -12410,11 +15418,27 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-5"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">12</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-Controls"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator146"> + <object class="GtkSeparator" id="separator97"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12425,13 +15449,13 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom122"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom120"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -12460,11 +15484,27 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> + <style> + <class name="priority-4"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">13</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-GridNavigationBar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator97"> + <object class="GtkSeparator" id="separator152"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12475,13 +15515,13 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom123"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom165"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -12510,21 +15550,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator152"> - <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">5</property> </packing> </child> @@ -12535,19 +15560,34 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">14</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection6"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-TabDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom124"> + <object class="GtkSeparator" id="separator154"> <property name="visible">True</property> - <property name="can_focus">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="sfxlo-NotebookbarToolBox" id="SectionBottom122"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -12576,21 +15616,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator154"> - <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">1</property> </packing> </child> @@ -12601,19 +15626,34 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">15</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection7"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-ReadOnly"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom125"> + <object class="GtkSeparator" id="separator158"> <property name="visible">True</property> - <property name="can_focus">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="sfxlo-NotebookbarToolBox" id="SectionBottom123"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -12642,21 +15682,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator158"> - <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">1</property> </packing> </child> @@ -12667,7 +15692,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">16</property> </packing> </child> </object> diff --git a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui index 89ff672589cc..93088adcc129 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui @@ -2233,7 +2233,7 @@ <object class="GtkImage" id="paragraphstylei"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="pixbuf">cmd/lc_insertfieldctrl.png</property> + <property name="pixbuf">cmd/sc_insertfieldctrl.png</property> </object> <object class="GtkGrid" id="NotebookBar"> <property name="visible">True</property> @@ -2341,6 +2341,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom"> <property name="visible">True</property> @@ -2377,6 +2378,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom101"> <property name="visible">True</property> @@ -2402,7 +2404,7 @@ </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-7"/> </style> </object> <packing> @@ -2416,6 +2418,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="GtkSeparator" id="separator39"> <property name="visible">True</property> @@ -2467,6 +2470,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom102"> <property name="visible">True</property> @@ -2492,7 +2496,7 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-6"/> </style> </object> <packing> @@ -2506,6 +2510,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="GtkSeparator" id="separator8"> <property name="visible">True</property> @@ -2557,6 +2562,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom103"> <property name="visible">True</property> @@ -2582,7 +2588,7 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-5"/> </style> </object> <packing> @@ -2596,6 +2602,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="GtkSeparator" id="separator5"> <property name="visible">True</property> @@ -2646,6 +2653,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom104"> <property name="visible">True</property> @@ -2670,7 +2678,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-4"/> </style> </object> <packing> @@ -2684,6 +2692,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom6"> <property name="visible">True</property> @@ -2708,7 +2717,7 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-3"/> </style> </object> <packing> @@ -2722,6 +2731,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="GtkSeparator" id="separator2"> <property name="visible">True</property> @@ -2772,6 +2782,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom106"> <property name="visible">True</property> @@ -2810,6 +2821,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="Draw5"> <property name="visible">True</property> @@ -2848,6 +2860,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="GtkSeparator" id="separator35"> <property name="visible">True</property> @@ -2926,7 +2939,6 @@ <property name="can_focus">False</property> <property name="halign">end</property> <property name="valign">center</property> - <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom10"> <property name="visible">True</property> @@ -2985,7 +2997,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom3"> <property name="visible">True</property> @@ -3057,12 +3068,12 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="DefaultContainer"> + <object class="sfxlo-PriorityMergedHBox" id="HomeContainer"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-Select"> + <object class="sfxlo-OptionalBox" id="Home-Section-Select"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3126,7 +3137,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-Area1"> + <object class="sfxlo-OptionalBox" id="Home-Section-Area1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3181,7 +3192,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-Area2"> + <object class="sfxlo-OptionalBox" id="Home-Section-Area2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3221,7 +3232,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-FillShadow"> + <object class="sfxlo-OptionalBox" id="Home-Section-FillShadow"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3260,7 +3271,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-AreaDialog"> + <object class="sfxlo-OptionalBox" id="Home-Section-AreaDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3301,7 +3312,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-Line1"> + <object class="sfxlo-OptionalBox" id="Home-Section-Line1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3341,7 +3352,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-Line2"> + <object class="sfxlo-OptionalBox" id="Home-Section-Line2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3380,7 +3391,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-Line3"> + <object class="sfxlo-OptionalBox" id="Home-Section-Line3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3419,7 +3430,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-Line4"> + <object class="sfxlo-OptionalBox" id="Home-Section-Line4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3458,7 +3469,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-Line5"> + <object class="sfxlo-OptionalBox" id="Home-Section-Line5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3496,7 +3507,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-LineDialog"> + <object class="sfxlo-OptionalBox" id="Home-Section-LineDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3537,7 +3548,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-TextBox"> + <object class="sfxlo-OptionalBox" id="Home-Section-TextBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3602,7 +3613,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-Line"> + <object class="sfxlo-OptionalBox" id="Home-Section-Line"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3634,6 +3645,31 @@ <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">12</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Home-Section-Line6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom177"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Default-BasicShapes.ellipse"> <property name="visible">True</property> @@ -3667,11 +3703,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">12</property> + <property name="position">13</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-LineToolbox"> + <object class="sfxlo-OptionalBox" id="Home-Section-LineToolbox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3738,17 +3774,17 @@ </packing> </child> <style> - <class name="priority-19"/> + <class name="priority-20"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">13</property> + <property name="position">14</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-BasicShapes"> + <object class="sfxlo-OptionalBox" id="Home-Section-BasicShapes"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3815,17 +3851,17 @@ </packing> </child> <style> - <class name="priority-18"/> + <class name="priority-19"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">14</property> + <property name="position">15</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-FlowChartShapes"> + <object class="sfxlo-OptionalBox" id="Home-Section-FlowChartShapes"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3874,6 +3910,34 @@ <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> + <style> + <class name="priority-18"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">16</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Home-Section-FlowChartShapes1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Default-FlowChartShapes"> <property name="visible">True</property> @@ -3910,11 +3974,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">15</property> + <property name="position">17</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-Styles"> + <object class="sfxlo-OptionalBox" id="Home-Section-Styles"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3958,18 +4022,15 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-6"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">16</property> + <property name="position">18</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-Insert"> + <object class="sfxlo-OptionalBox" id="Home-Section-Insert"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4014,8 +4075,23 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-6"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">19</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Home-Section-Insert1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom57"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom133"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -4055,11 +4131,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">17</property> + <property name="position">20</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-Zoom1"> + <object class="sfxlo-OptionalBox" id="Home-Section-Zoom1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4120,11 +4196,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">18</property> + <property name="position">21</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-Zoom2"> + <object class="sfxlo-OptionalBox" id="Home-Section-Zoom2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4170,11 +4246,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">19</property> + <property name="position">22</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-Snap1"> + <object class="sfxlo-OptionalBox" id="Home-Section-Snap1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4235,11 +4311,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">20</property> + <property name="position">23</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-Snap2"> + <object class="sfxlo-OptionalBox" id="Home-Section-Snap2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4296,7 +4372,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">21</property> + <property name="position">24</property> </packing> </child> </object> @@ -4361,6 +4437,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom2"> <property name="visible">True</property> @@ -4397,11 +4474,12 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom151"> <property name="visible">True</property> <property name="can_focus">False</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="Insert-DuplicateSlide"> @@ -4421,9 +4499,6 @@ <property name="position">0</property> </packing> </child> - <style> - <class name="priority-15"/> - </style> </object> <packing> <property name="expand">False</property> @@ -4436,6 +4511,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="GtkSeparator" id="separator40"> <property name="visible">True</property> @@ -4487,6 +4563,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom65"> <property name="visible">True</property> @@ -4526,6 +4603,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom127"> <property name="visible">True</property> @@ -4565,6 +4643,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="GtkSeparator" id="separator6"> <property name="visible">True</property> @@ -4612,21 +4691,22 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="InsertAVMediaSection"> + <object class="sfxlo-OptionalBox" id="GallerySection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom153"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom152"> <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="Insert-InsertAVMedia"> + <object class="GtkToolButton" id="Insert-Gallery"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertAVMedia</property> + <property name="action_name">.uno:Gallery</property> </object> <packing> <property name="expand">False</property> @@ -4651,21 +4731,22 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="GallerySection"> + <object class="sfxlo-OptionalBox" id="InsertAVMediaSection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom152"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom153"> <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="Insert-Gallery"> + <object class="GtkToolButton" id="Insert-InsertAVMedia"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Gallery</property> + <property name="action_name">.uno:InsertAVMedia</property> </object> <packing> <property name="expand">False</property> @@ -4690,25 +4771,41 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="PhotoAlbumDialogSection"> + <object class="sfxlo-OptionalBox" id="HyperlinkSection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom154"> + <object class="GtkSeparator" id="separator13"> <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="sfxlo-NotebookbarToolBox" id="SectionBottom11"> + <property name="visible">True</property> + <property name="can_focus">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Insert-PhotoAlbumDialog"> + <object class="GtkToolButton" id="Insert-HyperlinkDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:PhotoAlbumDialog</property> + <property name="action_name">.uno:HyperlinkDialog</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -4718,9 +4815,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-10"/> - </style> </object> <packing> <property name="expand">False</property> @@ -4733,21 +4827,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <child> - <object class="GtkSeparator" id="separator13"> - <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> + <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom156"> <property name="visible">True</property> @@ -4773,6 +4853,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-9"/> + </style> </object> <packing> <property name="expand">False</property> @@ -4781,21 +4864,22 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="HyperlinkSection"> + <object class="sfxlo-OptionalBox" id="InsertObjectFloatingFrameSection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom11"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom129"> <property name="visible">True</property> - <property name="can_focus">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="Insert-HyperlinkDialog"> + <object class="GtkToolButton" id="Insert-InsertObjectFloatingFrame"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:HyperlinkDialog</property> + <property name="action_name">.uno:InsertObjectFloatingFrame</property> </object> <packing> <property name="expand">False</property> @@ -4810,7 +4894,7 @@ </packing> </child> <style> - <class name="priority-9"/> + <class name="priority-8"/> </style> </object> <packing> @@ -4820,36 +4904,46 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="InsertObjectFloatingFrameSection"> + <object class="sfxlo-OptionalBox" id="FieldSection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom129"> + <object class="GtkSeparator" id="separator15"> <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="Insert-InsertObjectFloatingFrame"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:InsertObjectFloatingFrame</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> + <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="svtlo-ManagedMenuButton" id="Insert-FieldButton:MenuField"> + <property name="label" translatable="yes" context="notebookbar_draw_compact|FieldMenuButton">Fiel_d</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:FieldMenu</property> + <property name="image">paragraphstylei</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + <property name="always_show_image">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> <style> - <class name="priority-8"/> + <class name="priority-7"/> </style> </object> <packing> @@ -4859,10 +4953,11 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FontworkGalleryFloaterSection"> + <object class="sfxlo-OptionalBox" id="DrawTexSection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="GtkSeparator" id="separator17"> <property name="visible">True</property> @@ -4885,6 +4980,41 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> + <object class="GtkToolButton" id="Insert-DrawText1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DrawText</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Insert-VerticalText1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:VerticalText</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="sfxlo-NotebookbarToolBox" id="SectionBottom67"> + <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="Insert-FontworkGalleryFloater"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -4892,19 +5022,16 @@ </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> + <property name="position">2</property> </packing> </child> - <style> - <class name="priority-7"/> - </style> </object> <packing> <property name="expand">False</property> @@ -4913,21 +5040,59 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DrawCaptionSection"> + <object class="sfxlo-OptionalBox" id="DrawSection1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom67"> + <object class="GtkSeparator" id="separator156"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</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="sfxlo-NotebookbarToolBox" id="SectionBottom72"> + <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="Insert-DrawCaption"> + <object class="GtkToolButton" id="Insert-Line"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DrawCaption</property> + <property name="action_name">.uno:Line</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Insert-BasicShapes.rectangle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BasicShapes.rectangle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Insert-BasicShapes.ellipse"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BasicShapes.ellipse</property> </object> <packing> <property name="expand">False</property> @@ -4938,7 +5103,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <style> @@ -4952,21 +5117,59 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DrawCaptionSection1"> + <object class="sfxlo-OptionalBox" id="DrawSection2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom72"> + <object class="GtkSeparator" id="separator155"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</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="sfxlo-NotebookbarToolBox" id="SectionBottom154"> + <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="Insert-InsertLayer"> + <object class="GtkToolButton" id="Insert-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="Insert-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> + <child> + <object class="GtkToolButton" id="Insert-DrawCaption1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertLayer</property> + <property name="action_name">.uno:DrawCaption</property> </object> <packing> <property name="expand">False</property> @@ -4977,7 +5180,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <style> @@ -4991,12 +5194,13 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FieldSection"> + <object class="sfxlo-OptionalBox" id="DrawSection3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator15"> + <object class="GtkSeparator" id="separator101"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -5011,16 +5215,44 @@ </packing> </child> <child> - <object class="svtlo-ManagedMenuButton" id="Insert-FieldButton:MenuField"> - <property name="label" translatable="yes" context="notebookbar_draw_compact|FieldMenuButton">Fiel_d</property> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom117"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:FieldMenu</property> - <property name="image">paragraphstylei</property> - <property name="relief">none</property> - <property name="use_underline">True</property> - <property name="always_show_image">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="Insert-BasicShapes1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BasicShapes</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Insert-ArrowShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ArrowShapes</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Insert-FlowChartShapes1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlowChartShapes</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -5043,6 +5275,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="GtkSeparator" id="separator16"> <property name="visible">True</property> @@ -5082,9 +5315,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-3"/> - </style> </object> <packing> <property name="expand">False</property> @@ -5097,6 +5327,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom128"> <property name="visible">True</property> @@ -5136,6 +5367,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom115"> <property name="visible">True</property> @@ -5192,15 +5424,14 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Insert-InsertDraw"> + <object class="GtkToolButton" id="Insert-InsertSlide1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:InsertDraw</property> + <property name="action_name">.uno:InsertSlide</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -5284,7 +5515,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="PageLayoutSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-PageLayout"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5321,7 +5552,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="BackgroundSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-Background"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5350,9 +5581,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-10"/> - </style> </object> <packing> <property name="expand">False</property> @@ -5361,7 +5589,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="BackgroundSection1"> + <object class="sfxlo-OptionalBox" id="Layout-Section-Background1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5391,7 +5619,7 @@ </packing> </child> <style> - <class name="priority-10"/> + <class name="priority-12"/> </style> </object> <packing> @@ -5401,7 +5629,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DeletePageSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-DeletePage"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5448,7 +5676,7 @@ </packing> </child> <style> - <class name="priority-9"/> + <class name="priority-11"/> </style> </object> <packing> @@ -5458,7 +5686,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="HideSlideSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-Section"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5490,7 +5718,7 @@ </packing> </child> <style> - <class name="priority-8"/> + <class name="priority-10"/> </style> </object> <packing> @@ -5500,7 +5728,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ShowSlideSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-ShowSlide"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5531,7 +5759,7 @@ </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-9"/> </style> </object> <packing> @@ -5541,7 +5769,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="MovePageSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-MovePage"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5587,7 +5815,7 @@ </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-8"/> </style> </object> <packing> @@ -5597,7 +5825,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="MovePageSection1"> + <object class="sfxlo-OptionalBox" id="Layout-Section-MovePage1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5628,7 +5856,7 @@ </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-7"/> </style> </object> <packing> @@ -5638,7 +5866,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="PresentationLayoutSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-PresentationLayout"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5683,7 +5911,7 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-6"/> </style> </object> <packing> @@ -5693,7 +5921,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DisplayMasterBackgroundSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-DisplayMasterBackground"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5723,7 +5951,7 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-5"/> </style> </object> <packing> @@ -5733,7 +5961,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DisplayMasterObjectsSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-DisplayMasterObjects"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5762,7 +5990,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-4"/> </style> </object> <packing> @@ -5772,7 +6000,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ToggleObjectRotateModeSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-ToggleObjectRotateMode"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5796,7 +6024,7 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom80"> <property name="visible">True</property> <property name="can_focus">True</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="Page-ToggleObjectRotateMode"> @@ -5817,7 +6045,7 @@ </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-3"/> </style> </object> <packing> @@ -5827,7 +6055,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ObjectAlignSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-ObjectAlign"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5857,7 +6085,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-2"/> </style> </object> <packing> @@ -5867,12 +6095,27 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ObjectPositionSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-ObjectPosition"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator104"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom130"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -5897,7 +6140,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-1"/> </style> </object> <packing> @@ -6084,9 +6327,6 @@ <property name="position">0</property> </packing> </child> - <style> - <class name="priority-8"/> - </style> </object> <packing> <property name="expand">False</property> @@ -6123,6 +6363,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-7"/> + </style> </object> <packing> <property name="expand">False</property> @@ -6160,7 +6403,7 @@ </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-6"/> </style> </object> <packing> @@ -6221,45 +6464,6 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Review-Section-ShowAnnotations"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom22"> - <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="Review-ShowAnnotations"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ShowAnnotations</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> - <style> - <class name="priority-6"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> - <child> <object class="sfxlo-OptionalBox" id="Review-Section-PreviousAnnotation"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -6295,7 +6499,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">5</property> </packing> </child> <child> @@ -6334,7 +6538,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">6</property> </packing> </child> <child> @@ -6373,7 +6577,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">7</property> </packing> </child> <child> @@ -6412,11 +6616,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">8</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Review-Section-EditDoc"> + <object class="sfxlo-OptionalBox" id="Review-Section-ShowAnnotations"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6436,16 +6640,16 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom133"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom22"> <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="Review-EditDoc"> + <object class="GtkToolButton" id="Review-ShowAnnotations"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:EditDoc</property> + <property name="action_name">.uno:ShowAnnotations</property> </object> <packing> <property name="expand">False</property> @@ -6466,7 +6670,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">10</property> + <property name="position">9</property> </packing> </child> </object> @@ -6583,7 +6787,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="ViewsSection"> + <object class="sfxlo-OptionalBox" id="View-Sections-Views"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6630,12 +6834,12 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="VisibleSection"> + <object class="sfxlo-OptionalBox" id="View-Sections-Zoom"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator22"> + <object class="GtkSeparator" id="separator37"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -6650,12 +6854,142 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom109"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom110"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> + <object class="GtkToolButton" id="View-ZoomPanning"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ZoomPanning</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="View-Sections-Zoom1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom23"> + <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="View-ZoomPrevious"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ZoomPrevious</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="View-Sections-Zoom2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom25"> + <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="View-ZoomNext"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ZoomNext</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> + <style> + <class name="priority-10"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="View-Section-Visible"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="GtkSeparator" id="separator112"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="vexpand">True</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">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom26"> + <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="View-Navigator"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -6666,17 +7000,75 @@ <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> + <style> + <class name="priority-9"/> + </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="View-Section-Visible1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom109"> + <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="View-ShowRuler"> + <object class="GtkToolButton" id="View-Rulers"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ShowRuler</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-8"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="View-Section-Visible2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom199"> + <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="View-GridVisible"> <property name="visible">True</property> @@ -6695,18 +7087,22 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-7"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">6</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="BarsSection"> + <object class="sfxlo-OptionalBox" id="View-Section-Bars"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="GtkSeparator" id="separator141"> <property name="visible">True</property> @@ -6725,7 +7121,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom112"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> @@ -6739,6 +7135,35 @@ <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> + <style> + <class name="priority-6"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="View-Section-Bars1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom200"> + <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="View-Sidebar"> <property name="visible">True</property> @@ -6764,16 +7189,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">8</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ZoomSection"> + <object class="sfxlo-OptionalBox" id="View-Section-Zoom"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator37"> + <object class="GtkSeparator" id="separator22"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -6788,16 +7214,16 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom110"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom201"> <property name="visible">True</property> - <property name="can_focus">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="View-ZoomPanning"> + <object class="GtkToolButton" id="View-ZoomOptimal1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ZoomPanning</property> + <property name="action_name">.uno:ZoomOptimal</property> </object> <packing> <property name="expand">False</property> @@ -6815,25 +7241,26 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">9</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ZoomSection1"> + <object class="sfxlo-OptionalBox" id="View-Section-Zoom1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom23"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom202"> <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="View-ZoomPrevious"> + <object class="GtkToolButton" id="View-Zoom100Percent1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ZoomPrevious</property> + <property name="action_name">.uno:Zoom100Percent</property> </object> <packing> <property name="expand">False</property> @@ -6844,7 +7271,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <style> @@ -6854,36 +7281,26 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">10</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ZoomSection2"> + <object class="sfxlo-OptionalBox" id="View-Section-Zoom2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom26"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom203"> <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="View-ZoomPage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ZoomPage</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="View-ZoomPageWidth"> + <object class="GtkToolButton" id="View-FullScreen"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ZoomPageWidth</property> + <property name="action_name">.uno:FullScreen</property> </object> <packing> <property name="expand">False</property> @@ -6894,7 +7311,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <style> @@ -6904,36 +7321,40 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">11</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ZoomSection3"> + <object class="sfxlo-OptionalBox" id="View-Sections-NewWindow"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom25"> + <object class="GtkSeparator" id="separator38"> <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="sfxlo-NotebookbarToolBox" id="SectionBottom111"> + <property name="visible">True</property> + <property name="can_focus">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="View-ZoomOptimal"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ZoomOptimal</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="View-Zoom100Percent"> + <object class="GtkToolButton" id="View-NewWindow"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Zoom100Percent</property> + <property name="action_name">.uno:NewWindow</property> </object> <packing> <property name="expand">False</property> @@ -6944,7 +7365,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <style> @@ -6954,40 +7375,44 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">12</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="NewWindowSction"> + <object class="sfxlo-OptionalBox" id="View-Section-EditDoc"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator38"> + <object class="GtkSeparator" id="separator102"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">center</property> <property name="margin_top">5</property> <property name="margin_bottom">5</property> + <property name="vexpand">True</property> <property name="orientation">vertical</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> <property name="padding">5</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom111"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom198"> <property name="visible">True</property> - <property name="can_focus">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="View-NewWindow"> + <object class="GtkToolButton" id="View-EditDoc"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:NewWindow</property> + <property name="action_name">.uno:EditDoc</property> </object> <packing> <property name="expand">False</property> @@ -7008,7 +7433,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">13</property> </packing> </child> </object> @@ -7761,7 +8186,7 @@ </packing> </child> <style> - <class name="priority-23"/> + <class name="priority-24"/> </style> </object> <packing> @@ -7801,7 +8226,7 @@ </packing> </child> <style> - <class name="priority-22"/> + <class name="priority-23"/> </style> </object> <packing> @@ -7851,6 +8276,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-22"/> + </style> </object> <packing> <property name="expand">False</property> @@ -8068,9 +8496,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-20"/> - </style> </object> <packing> <property name="expand">False</property> @@ -8109,9 +8534,6 @@ <property name="position">0</property> </packing> </child> - <style> - <class name="priority-19"/> - </style> </object> <packing> <property name="expand">False</property> @@ -8184,9 +8606,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-18"/> - </style> </object> <packing> <property name="expand">False</property> @@ -8608,9 +9027,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-11"/> - </style> </object> <packing> <property name="expand">False</property> @@ -9370,6 +9786,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="margin_left">5</property> <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Table-FontHeight1"> @@ -10672,6 +11089,66 @@ </packing> </child> <child> + <object class="sfxlo-DropdownBox" id="GraphicSelection"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom45"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Image-TransformDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="action_name">.uno:TransformDialog</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="svtlo-ManagedMenuButton" id="Image-GraphicButton:MenuImage"> + <property name="label" translatable="yes" context="notebookbar_draw_compact|ImageMenuButton">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="valign">center</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="sfxlo-PriorityMergedHBox" id="GraphicContainer"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -11889,66 +12366,6 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-DropdownBox" id="GraphicSelection"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom45"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Image-TransformDialog"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="action_name">.uno:TransformDialog</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="svtlo-ManagedMenuButton" id="Image-GraphicButton:MenuImage"> - <property name="label" translatable="yes" context="notebookbar_draw_compact|ImageMenuButton">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="valign">center</property> - <property name="relief">none</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> <property name="position">1</property> </packing> </child> @@ -14866,98 +15283,6 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Media-Section-AVMediaPlayer"> - <property name="width_request">122</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <child> - <object class="GtkSeparator" id="separator83"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</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="sfxlo-NotebookbarToolBox" id="ExtBottom48"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <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> - <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">11</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Media-Section-TransformDialog"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="Draw13"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Media-TransformDialog1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="visible_horizontal">False</property> - <property name="action_name">.uno:TransformDialog</property> - <property name="icon_name">sfx2/res/symphony/open_more.png</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">12</property> - </packing> - </child> - <child> <object class="sfxlo-OptionalBox" id="Media-Section-ObjectAlign"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -15006,7 +15331,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">13</property> + <property name="position">10</property> </packing> </child> <child> @@ -15056,7 +15381,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">14</property> + <property name="position">11</property> </packing> </child> <child> @@ -15117,7 +15442,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">15</property> + <property name="position">12</property> </packing> </child> <child> @@ -15169,7 +15494,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">16</property> + <property name="position">13</property> </packing> </child> <child> @@ -15208,7 +15533,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">17</property> + <property name="position">14</property> </packing> </child> <child> @@ -15258,7 +15583,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">18</property> + <property name="position">15</property> </packing> </child> <child> @@ -15324,7 +15649,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">19</property> + <property name="position">16</property> </packing> </child> <child> @@ -15363,7 +15688,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">20</property> + <property name="position">17</property> </packing> </child> <child> @@ -15418,7 +15743,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">21</property> + <property name="position">18</property> </packing> </child> <child> @@ -15471,7 +15796,104 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">22</property> + <property name="position">19</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Media-Section-AVMediaPlayer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="GtkSeparator" id="separator83"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</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="sfxlo-NotebookbarToolBox" id="ExtBottom48"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <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> + <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> + <style> + <class name="priority-13"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">20</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Media-Section-TransformDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Draw13"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Media-TransformDialog1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="visible_horizontal">False</property> + <property name="action_name">.uno:TransformDialog</property> + <property name="icon_name">sfx2/res/symphony/open_more.png</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> + <style> + <class name="priority-12"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">21</property> </packing> </child> </object> @@ -15653,9 +16075,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-18"/> - </style> </object> <packing> <property name="expand">False</property> @@ -15734,7 +16153,7 @@ <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator96"> + <object class="GtkSeparator" id="separator1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -15774,9 +16193,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-16"/> - </style> </object> <packing> <property name="expand">False</property> @@ -15814,9 +16230,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-15"/> - </style> </object> <packing> <property name="expand">False</property> @@ -15910,7 +16323,7 @@ <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator101"> + <object class="GtkSeparator" id="separator55"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -15961,7 +16374,7 @@ </packing> </child> <style> - <class name="priority-17"/> + <class name="priority-12"/> </style> </object> <packing> @@ -16011,7 +16424,7 @@ </packing> </child> <style> - <class name="priority-18"/> + <class name="priority-11"/> </style> </object> <packing> @@ -16026,7 +16439,7 @@ <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator102"> + <object class="GtkSeparator" id="separator63"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -16066,7 +16479,7 @@ </packing> </child> <style> - <class name="priority-12"/> + <class name="priority-10"/> </style> </object> <packing> @@ -16105,7 +16518,7 @@ </packing> </child> <style> - <class name="priority-12"/> + <class name="priority-9"/> </style> </object> <packing> @@ -16120,7 +16533,7 @@ <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator103"> + <object class="GtkSeparator" id="separator75"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -16218,7 +16631,7 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-8"/> </style> </object> <packing> @@ -16268,7 +16681,7 @@ </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-7"/> </style> </object> <packing> @@ -16283,7 +16696,7 @@ <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator104"> + <object class="GtkSeparator" id="separator96"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -16335,7 +16748,7 @@ <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom114"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom116"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -16351,34 +16764,6 @@ <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> - <style> - <class name="priority-10"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">14</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Arrange2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom116"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Object-ObjectBackOne3"> <property name="visible">True</property> @@ -16409,13 +16794,13 @@ </packing> </child> <style> - <class name="priority-9"/> + <class name="priority-6"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">15</property> + <property name="position">14</property> </packing> </child> <child> @@ -16424,7 +16809,7 @@ <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator105"> + <object class="GtkSeparator" id="separator106"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -16440,7 +16825,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom117"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom114"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -16467,34 +16852,6 @@ <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> - <style> - <class name="priority-8"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">16</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Arrange4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom177"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="MultiObject-ReverseOrder5"> <property name="visible">True</property> @@ -16514,13 +16871,13 @@ </packing> </child> <style> - <class name="priority-8"/> + <class name="priority-5"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">17</property> + <property name="position">16</property> </packing> </child> <child> @@ -16529,7 +16886,7 @@ <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator106"> + <object class="GtkSeparator" id="separator107"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -16583,8 +16940,36 @@ <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> + <style> + <class name="priority-4"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">17</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Form-Section-FormattedField3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom17"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Form-NumericField"> + <object class="GtkToolButton" id="Form-NumericField1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:NumericField</property> @@ -16595,7 +16980,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Form-CurrencyField"> + <object class="GtkToolButton" id="Form-CurrencyField1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:CurrencyField</property> @@ -16606,7 +16991,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Form-PatternField"> + <object class="GtkToolButton" id="Form-PatternField1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:PatternField</property> @@ -16624,7 +17009,7 @@ </packing> </child> <style> - <class name="priority-17"/> + <class name="priority-3"/> </style> </object> <packing> @@ -16639,7 +17024,7 @@ <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator107"> + <object class="GtkSeparator" id="separator99"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -16671,34 +17056,6 @@ <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> - <style> - <class name="priority-18"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">19</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Form-Section-FormattedField1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom21"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Form-ImageControl"> <property name="visible">True</property> @@ -16729,17 +17086,17 @@ </packing> </child> <style> - <class name="priority-17"/> + <class name="priority-2"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">20</property> + <property name="position">19</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-FormattedField2"> + <object class="sfxlo-OptionalBox" id="Form-Section-FormattedField5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -16779,13 +17136,13 @@ </packing> </child> <style> - <class name="priority-17"/> + <class name="priority-1"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">21</property> + <property name="position">20</property> </packing> </child> </object> @@ -18731,7 +19088,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="MacroSection"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Macro"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -18779,7 +19136,43 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="BmpMaskSection"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Macro1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom204"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Tools-MacroDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:MacroDialog</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Tools-Section-BmpMask"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -18823,18 +19216,15 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-3"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ImageMapDialogSection"> + <object class="sfxlo-OptionalBox" id="Tools-Section-ImageMapDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -18843,6 +19233,7 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom196"> <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="Tools-ImageMapDialog"> @@ -18862,15 +19253,18 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-13"/> + </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="AVMediaPlayerSection"> + <object class="sfxlo-OptionalBox" id="Tools-Section-AVMediaPlayer"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -18898,21 +19292,24 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-12"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection3"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-DesignMode"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator130"> + <object class="GtkSeparator" id="separator103"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -18932,7 +19329,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom142"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> @@ -18953,10 +19350,23 @@ <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-Wizzard"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom143"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -18978,17 +19388,17 @@ </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-11"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">6</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection4"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-LabelCheckbox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -19011,7 +19421,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom144"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -19047,6 +19457,35 @@ <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> + <style> + <class name="priority-10"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-LabelCheckbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom145"> + <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="Tools-RadioButton"> <property name="visible">True</property> @@ -19088,17 +19527,17 @@ </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-9"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">8</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection5"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-Buttons"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -19119,9 +19558,9 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom145"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom146"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -19154,17 +19593,17 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-8"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">9</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection6"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-Farmatted"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -19185,9 +19624,9 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom146"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom147"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -19223,6 +19662,35 @@ <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> + <style> + <class name="priority-7"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">10</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-Farmatted1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom148"> + <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="Tools-NumericField"> <property name="visible">True</property> @@ -19264,17 +19732,17 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-6"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">11</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection7"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-GroupBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -19295,9 +19763,9 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom147"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom149"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -19318,6 +19786,22 @@ <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">12</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-Controls"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="GtkSeparator" id="separator131"> <property name="visible">True</property> @@ -19334,9 +19818,9 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom148"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom178"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -19368,6 +19852,22 @@ <property name="position">3</property> </packing> </child> + <style> + <class name="priority-4"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">13</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-GridNavigationBar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="GtkSeparator" id="separator152"> <property name="visible">True</property> @@ -19384,9 +19884,9 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom149"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom179"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -19425,11 +19925,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">14</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection8"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-TabDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -19450,9 +19950,9 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom178"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom205"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -19491,11 +19991,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">15</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection9"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-ReadOnly"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -19516,9 +20016,9 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom179"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom206"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -19557,7 +20057,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">10</property> + <property name="position">16</property> </packing> </child> </object> diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_compact.ui index 04aa0764e981..4a7699136c0a 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui @@ -3084,7 +3084,6 @@ <property name="can_focus">False</property> <property name="halign">end</property> <property name="valign">center</property> - <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom10"> <property name="visible">True</property> @@ -3143,7 +3142,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom3"> <property name="visible">True</property> @@ -3219,9 +3217,8 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="StyleSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-Style"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3289,7 +3286,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="TextSection1"> + <object class="sfxlo-OptionalBox" id="Home-Section-FontName"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3316,12 +3313,14 @@ <object class="sfxlo-NotebookbarToolBox" id="ExtTop5"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="valign">center</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Home-CharFontName"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> <property name="action_name">.uno:CharFontName</property> </object> <packing> @@ -3337,7 +3336,7 @@ </packing> </child> <style> - <class name="priority-19"/> + <class name="priority-20"/> </style> </object> <packing> @@ -3347,7 +3346,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="TextSection2"> + <object class="sfxlo-OptionalBox" id="Home-Section-FontHeight"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3378,7 +3377,7 @@ </packing> </child> <style> - <class name="priority-18"/> + <class name="priority-19"/> </style> </object> <packing> @@ -3388,7 +3387,60 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormatSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-GrawShrink"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop12"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="hexpand">True</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Home-Grow"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Grow</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Home-Shrink"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Shrink</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> + <style> + <class name="priority-18"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Home-Section-BoldItalic"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3471,11 +3523,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormatSectionExt"> + <object class="sfxlo-OptionalBox" id="Home-Section-SubSuperScript"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3539,11 +3591,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ColorSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-Color"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3600,18 +3652,15 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-16"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Section-FontDialog"> + <object class="sfxlo-OptionalBox" id="Home-Section-FontDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3641,18 +3690,15 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-15"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="BulletsSection2"> + <object class="sfxlo-OptionalBox" id="Home-Section-Bullets"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3718,18 +3764,15 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-14"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">8</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="BulletsSection3"> + <object class="sfxlo-OptionalBox" id="Home-Section-Bullets1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3780,11 +3823,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">9</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="JustifySection"> + <object class="sfxlo-OptionalBox" id="Home-Section-Justify"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3876,11 +3919,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">10</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-LTR"> + <object class="sfxlo-OptionalBox" id="Home-Section-LTR"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3927,11 +3970,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">10</property> + <property name="position">11</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SpacingSection1"> + <object class="sfxlo-OptionalBox" id="Home-Section-Spacing"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3993,11 +4036,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">11</property> + <property name="position">12</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SpacingSection2"> + <object class="sfxlo-OptionalBox" id="Home-Section-Spacing1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4045,11 +4088,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">12</property> + <property name="position">13</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-ParagraphDialog"> + <object class="sfxlo-OptionalBox" id="Home-Section-ParagraphDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4086,11 +4129,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">13</property> + <property name="position">14</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="StyleDropdownSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-StyleDropdown"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4140,11 +4183,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">14</property> + <property name="position">15</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="StyleDropdownSection1"> + <object class="sfxlo-OptionalBox" id="Home-Section-Style1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4210,11 +4253,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">15</property> + <property name="position">16</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="StyleParagraphSection2"> + <object class="sfxlo-OptionalBox" id="Home-Section-Style2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4266,11 +4309,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">16</property> + <property name="position">17</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="StyleParagraphSection1"> + <object class="sfxlo-OptionalBox" id="Home-Section-StyleParagraph"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4321,11 +4364,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">17</property> + <property name="position">18</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="StyleParagraphSection3"> + <object class="sfxlo-OptionalBox" id="Home-Section-StyleParagraph1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4391,11 +4434,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">18</property> + <property name="position">19</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="StyleSectionExt1"> + <object class="sfxlo-OptionalBox" id="Home-Section-StyleParagraph2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4459,11 +4502,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">19</property> + <property name="position">20</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="InsertSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-Insert"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4526,11 +4569,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">20</property> + <property name="position">21</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="InsertSection1"> + <object class="sfxlo-OptionalBox" id="Home-Section-Insert1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4579,7 +4622,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">21</property> + <property name="position">22</property> </packing> </child> </object> @@ -4864,7 +4907,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> @@ -4904,7 +4947,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> @@ -4956,7 +4999,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <child> @@ -4996,7 +5039,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">3</property> </packing> </child> <child> @@ -5036,7 +5079,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">4</property> </packing> </child> <child> @@ -5088,7 +5131,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">5</property> </packing> </child> <child> @@ -5128,7 +5171,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">6</property> </packing> </child> <child> @@ -5168,7 +5211,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">7</property> </packing> </child> <child> @@ -5223,7 +5266,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">8</property> </packing> </child> <child> @@ -5282,6 +5325,43 @@ <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">9</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="DrawTexSection1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom172"> + <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="Insert-FontworkGalleryFloater1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkGalleryFloater</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> <style> <class name="priority-7"/> </style> @@ -5293,7 +5373,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DrawSection2"> + <object class="sfxlo-OptionalBox" id="DrawSection1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5370,7 +5450,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DrawSection"> + <object class="sfxlo-OptionalBox" id="DrawSection2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5447,7 +5527,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DrawSection1"> + <object class="sfxlo-OptionalBox" id="DrawSection3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5747,7 +5827,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="PageLayoutSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-PageLayout"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5817,7 +5897,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="BreakSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-Break"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5863,7 +5943,7 @@ </packing> </child> <style> - <class name="priority-10"/> + <class name="priority-14"/> </style> </object> <packing> @@ -5873,7 +5953,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="LeftParaMarginSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-LeftParaMargin"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5921,7 +6001,7 @@ </packing> </child> <style> - <class name="priority-9"/> + <class name="priority-13"/> </style> </object> <packing> @@ -5931,7 +6011,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="RightParaMarginSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-RightParaMargin"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5964,7 +6044,7 @@ </packing> </child> <style> - <class name="priority-8"/> + <class name="priority-12"/> </style> </object> <packing> @@ -5974,7 +6054,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="AboveSpacingSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-AboveSpacing"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6007,7 +6087,7 @@ </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-11"/> </style> </object> <packing> @@ -6017,7 +6097,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="BelowSpacingSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-BelowSpacing"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6049,7 +6129,7 @@ </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-10"/> </style> </object> <packing> @@ -6059,7 +6139,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="TitlepageSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-Titlepage"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6096,6 +6176,35 @@ <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> + <style> + <class name="priority-9"/> + </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="Layout-Section-Titlepage1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom170"> + <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="Layout-Watermark"> <property name="visible">True</property> @@ -6115,17 +6224,17 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-8"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="NumbersSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-Numbers"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6162,6 +6271,35 @@ <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> + <style> + <class name="priority-7"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">8</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Layout-Section-Numbers1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom169"> + <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="Layout-LineNumberingDialog"> <property name="visible">True</property> @@ -6182,17 +6320,17 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-6"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">9</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SelectGroupSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-SelectGroup"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6229,6 +6367,35 @@ <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> + <style> + <class name="priority-5"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">10</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Layout-Section-SelectGroup1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom168"> + <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="Layout-FormatGroup"> <property name="visible">True</property> @@ -6248,17 +6415,17 @@ </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">11</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="MultiObject-Section-ObjectAlign"> + <object class="sfxlo-OptionalBox" id="Layout-Section-ObjectAlign"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6284,6 +6451,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> <object class="GtkMenuToolButton" id="MultiObject-ObjectAlign"> @@ -6304,17 +6472,17 @@ </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">9</property> + <property name="position">12</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="BackFrontSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-Forward"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6326,7 +6494,7 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Layout-AlignBottom"> + <object class="GtkToolButton" id="Layout-ObjectForwardOne"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectForwardOne</property> @@ -6336,6 +6504,35 @@ <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> + <style> + <class name="priority-2"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">13</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Layout-Section-Backward"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom167"> + <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="Layout-ObjectBackOne"> <property name="visible">True</property> @@ -6361,7 +6558,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">10</property> + <property name="position">14</property> </packing> </child> </object> @@ -6556,7 +6753,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="IndexSection"> + <object class="sfxlo-OptionalBox" id="References-Section-Index"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6589,6 +6786,32 @@ <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> + <child> + <object class="sfxlo-OptionalBox" id="References-Section-Index1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom152"> + <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="References-UpdateAllIndexes"> <property name="visible">True</property> @@ -6604,11 +6827,27 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-7"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="References-Section-FootEndNote"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator149"> + <object class="GtkSeparator" id="separator24"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -6619,22 +6858,9 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> - </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="ReferenceSection1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom17"> <property name="visible">True</property> @@ -6652,6 +6878,32 @@ <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="sfxlo-OptionalBox" id="References-Section-FootEndNote1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom171"> + <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="References-InsertEndnote"> <property name="visible">True</property> @@ -6667,21 +6919,47 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-6"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Home-Section-FootnoteDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator24"> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop10"> <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> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Default-FootnoteDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="visible_horizontal">False</property> + <property name="action_name">.uno:FootnoteDialog</property> + <property name="icon_name">sfx2/res/symphony/open_more.png</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="padding">5</property> <property name="position">1</property> </packing> </child> @@ -6689,16 +6967,31 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">4</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="CaptionSection"> + <object class="sfxlo-OptionalBox" id="References-Section-Caption"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator129"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom82"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -6715,6 +7008,32 @@ <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">5</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="References-Section-Caption1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom173"> + <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="References-InsertCaptionDialog"> <property name="visible">True</property> @@ -6730,41 +7049,41 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator129"> - <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">1</property> </packing> </child> <style> - <class name="priority-3"/> + <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">6</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="BibliothekSection"> + <object class="sfxlo-OptionalBox" id="References-Section-Bibliothek"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator96"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom19"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -6781,6 +7100,35 @@ <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> + <style> + <class name="priority-4"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="References-Section-Bibliothek1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom174"> + <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="References-BibliographyComponent"> <property name="visible">True</property> @@ -6796,11 +7144,27 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">8</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="References-Section-Database"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator96"> + <object class="GtkSeparator" id="separator99"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -6811,6 +7175,30 @@ <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="sfxlo-NotebookbarToolBox" id="SectionBottom83"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="References-ViewDataSourceBrowser"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ViewDataSourceBrowser</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> @@ -6821,26 +7209,26 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">9</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DatabaseSection"> + <object class="sfxlo-OptionalBox" id="References-Section-Database1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom83"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom175"> <property name="visible">True</property> - <property name="can_focus">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="References-ViewDataSourceBrowser"> + <object class="GtkToolButton" id="References-ChangeDatabaseField"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ViewDataSourceBrowser</property> + <property name="action_name">.uno:ChangeDatabaseField</property> </object> <packing> <property name="expand">False</property> @@ -6851,21 +7239,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator99"> - <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">1</property> </packing> </child> @@ -6876,7 +7249,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">10</property> </packing> </child> </object> @@ -6947,6 +7320,32 @@ <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Review-Section-Language1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom166"> + <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="Review-ThesaurusDialog"> <property name="visible">True</property> @@ -6965,11 +7364,53 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-12"/> + </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="Review-Section-Hyphenation"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom146"> + <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="Review-Hyphenate"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Hyphenate</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> + <style> + <class name="priority-11"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> <child> @@ -7009,7 +7450,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <child> @@ -7040,7 +7481,7 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Review-TrackChanges1"> + <object class="GtkToolButton" id="Review-TrackChanges"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:TrackChanges</property> @@ -7061,7 +7502,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">4</property> </packing> </child> <child> @@ -7077,7 +7518,7 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Review-PreviousTrackedChange2"> + <object class="GtkToolButton" id="Review-PreviousTrackedChange"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:PreviousTrackedChange</property> @@ -7088,7 +7529,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Review-NextTrackedChange2"> + <object class="GtkToolButton" id="Review-NextTrackedChange"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:NextTrackedChange</property> @@ -7112,7 +7553,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">5</property> </packing> </child> <child> @@ -7163,7 +7604,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">6</property> </packing> </child> <child> @@ -7202,7 +7643,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">7</property> </packing> </child> <child> @@ -7236,14 +7677,11 @@ <property name="position">0</property> </packing> </child> - <style> - <class name="priority-6"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">8</property> </packing> </child> <child> @@ -7295,26 +7733,26 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">9</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Review-Section-Comment2"> + <object class="sfxlo-OptionalBox" id="Review-Section-Comment3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom22"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom23"> <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="Review-ReplyComment3"> + <object class="GtkToolButton" id="Review-DeleteComment3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ReplyComment</property> + <property name="action_name">.uno:DeleteComment</property> </object> <packing> <property name="expand">False</property> @@ -7335,26 +7773,25 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">10</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Review-Section-Comment3"> + <object class="sfxlo-OptionalBox" id="Review-Section-Comment4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom23"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom135"> <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="Review-DeleteComment3"> + <object class="GtkToolButton" id="Review-DeleteAllNotes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DeleteComment</property> + <property name="action_name">.uno:DeleteAllNotes</property> </object> <packing> <property name="expand">False</property> @@ -7375,25 +7812,27 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">11</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Review-Section-Comment4"> + <object class="sfxlo-OptionalBox" id="Review-Section-FormatNotesDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom135"> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop7"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Review-DeleteAllNotes"> + <object class="GtkToolButton" id="Review-FormatAllNotes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DeleteAllNotes</property> + <property name="visible_horizontal">False</property> + <property name="action_name">.uno:FormatAllNotes</property> + <property name="icon_name">sfx2/res/symphony/open_more.png</property> </object> <packing> <property name="expand">False</property> @@ -7407,14 +7846,11 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-3"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">10</property> + <property name="position">12</property> </packing> </child> <child> @@ -7463,13 +7899,13 @@ </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">11</property> + <property name="position">13</property> </packing> </child> <child> @@ -7485,7 +7921,7 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Review-CompareDocuments1"> + <object class="GtkToolButton" id="Review-CompareDocuments"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:CompareDocuments</property> @@ -7495,8 +7931,37 @@ <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> + <style> + <class name="priority-2"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">14</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Review-Section-Compare2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom22"> + <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="Review-MergeDocuments1"> + <object class="GtkToolButton" id="Review-MergeDocuments"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:MergeDocuments</property> @@ -7520,7 +7985,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">12</property> + <property name="position">15</property> </packing> </child> </object> @@ -7637,7 +8102,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="ViewsSection"> + <object class="sfxlo-OptionalBox" id="View-Section-Views"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7670,17 +8135,6 @@ <property name="homogeneous">True</property> </packing> </child> - <child> - <object class="GtkToolButton" id="View-EditDoc"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:EditDoc</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -7688,8 +8142,21 @@ <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="sfxlo-OptionalBox" id="View-Section-Toolbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator30"> + <object class="GtkSeparator" id="separator31"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -7703,23 +8170,9 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="padding">5</property> - <property name="pack_type">end</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="sfxlo-OptionalBox" id="ToolbarSection"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom108"> <property name="visible">True</property> @@ -7737,6 +8190,32 @@ <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="sfxlo-OptionalBox" id="View-Section-Toolbar1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom159"> + <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="View-HideWhitespace"> <property name="visible">True</property> @@ -7752,11 +8231,27 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-10"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="View-Section-Visible"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator31"> + <object class="GtkSeparator" id="separator30"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -7770,44 +8265,56 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="padding">5</property> - <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom109"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="View-Navigator"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Navigator</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> <style> - <class name="priority-5"/> + <class name="priority-9"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="VisibleSection"> + <object class="sfxlo-OptionalBox" id="View-Section-Visible1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom109"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom157"> <property name="visible">True</property> - <property name="can_focus">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="View-Navigator"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Navigator</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> <object class="GtkToolButton" id="View-Ruler"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -7818,6 +8325,35 @@ <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> + <style> + <class name="priority-8"/> + </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="View-Section-Visible2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom158"> + <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="View-GridVisible"> <property name="visible">True</property> @@ -7833,26 +8369,41 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-4"/> + <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">5</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="BarsSection"> + <object class="sfxlo-OptionalBox" id="View-Section-Bars"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator141"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom112"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -7869,6 +8420,35 @@ <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> + <style> + <class name="priority-6"/> + </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="View-Section-Bars1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom156"> + <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="View-Sidebar"> <property name="visible">True</property> @@ -7884,41 +8464,41 @@ <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="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">1</property> </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">3</property> + <property name="position">7</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ZoomSection"> + <object class="sfxlo-OptionalBox" id="View-Section-Zoom"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator37"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom110"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -7935,6 +8515,32 @@ <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">8</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="View-Section-Zoom1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom154"> + <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="View-Zoom100Percent"> <property name="visible">True</property> @@ -7946,6 +8552,35 @@ <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> + <style> + <class name="priority-4"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">9</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="View-Section-Zoom2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom155"> + <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="View-FullScreen"> <property name="visible">True</property> @@ -7961,21 +8596,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator37"> - <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">1</property> </packing> </child> @@ -7986,16 +8606,31 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">10</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="NewWindowSction"> + <object class="sfxlo-OptionalBox" id="View-Section-NewWindow"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator38"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom111"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -8016,32 +8651,75 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-2"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">11</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="View-Section-EditDoc"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator38"> + <object class="GtkSeparator" id="separator22"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">center</property> <property name="margin_top">5</property> <property name="margin_bottom">5</property> + <property name="vexpand">True</property> <property name="orientation">vertical</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom153"> + <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="View-EditDoc"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:EditDoc</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> <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">12</property> </packing> </child> </object> @@ -8267,21 +8945,32 @@ <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="sfxlo-OptionalBox" id="Table-Section-Optimize"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom37"> + <object class="sfxlo-NotebookbarToolBox" id="Anchor4"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">icons</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Table-AutoFormat"> + <object class="GtkMenuToolButton" id="Table-OptimizeTable"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:AutoFormat</property> + <property name="action_name">.uno:OptimizeTable</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -8296,17 +8985,17 @@ <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="MergeSection"> + <object class="sfxlo-OptionalBox" id="Table-Section-Column"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator51"> + <object class="GtkSeparator" id="separator175"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -8321,27 +9010,27 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom41"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom38"> <property name="visible">True</property> <property name="can_focus">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="Table-MergeCells"> + <object class="GtkToolButton" id="Table-InsertColumnsBefore"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:MergeCells</property> + <property name="action_name">.uno:InsertColumnsBefore</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="Table-SplitCell"> + <object class="GtkToolButton" id="Table-InsertColumnsAfter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SplitCell</property> + <property name="action_name">.uno:InsertColumnsAfter</property> </object> <packing> <property name="expand">False</property> @@ -8349,10 +9038,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-SplitTable"> + <object class="GtkToolButton" id="Table-DeleteColumns"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SplitTable</property> + <property name="action_name">.uno:DeleteColumns</property> </object> <packing> <property name="expand">False</property> @@ -8367,7 +9056,7 @@ </packing> </child> <style> - <class name="priority-14"/> + <class name="priority-17"/> </style> </object> <packing> @@ -8377,13 +9066,13 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ColumnSection"> + <object class="sfxlo-OptionalBox" id="Table-Section-Row"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator53"> + <object class="GtkSeparator" id="separator56"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -8398,16 +9087,16 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom38"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Table-InsertColumnsBefore"> + <object class="GtkToolButton" id="Table-InsertRowsBefore"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertColumnsBefore</property> + <property name="action_name">.uno:InsertRowsBefore</property> </object> <packing> <property name="expand">False</property> @@ -8415,10 +9104,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-InsertColumnsAfter"> + <object class="GtkToolButton" id="Table-InsertRowsAfter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertColumnsAfter</property> + <property name="action_name">.uno:InsertRowsAfter</property> </object> <packing> <property name="expand">False</property> @@ -8426,10 +9115,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-DeleteColumns"> + <object class="GtkToolButton" id="Table-DeleteRows"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DeleteColumns</property> + <property name="action_name">.uno:DeleteRows</property> </object> <packing> <property name="expand">False</property> @@ -8444,7 +9133,7 @@ </packing> </child> <style> - <class name="priority-13"/> + <class name="priority-16"/> </style> </object> <packing> @@ -8454,13 +9143,13 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="RowSection"> + <object class="sfxlo-OptionalBox" id="Table-Section-Justify"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator56"> + <object class="GtkSeparator" id="separator122"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -8475,27 +9164,18 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom89"> <property name="visible">True</property> - <property name="can_focus">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="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"> + <object class="GtkToolButton" id="Table-LeftPara"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertRowsAfter</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:LeftPara</property> </object> <packing> <property name="expand">False</property> @@ -8503,10 +9183,12 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-DeleteRows"> + <object class="GtkToolButton" id="Table-CenterPara"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DeleteRows</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:CenterPara</property> </object> <packing> <property name="expand">False</property> @@ -8521,7 +9203,7 @@ </packing> </child> <style> - <class name="priority-12"/> + <class name="priority-15"/> </style> </object> <packing> @@ -8531,37 +9213,37 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SelectSection"> + <object class="sfxlo-OptionalBox" id="Table-Section-Justify1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator175"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom178"> <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="sfxlo-NotebookbarToolBox" id="SectionBottom42"> - <property name="visible">True</property> - <property name="can_focus">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="Table-EntireCell"> + <object class="GtkToolButton" id="Table-RightPara"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:EntireCell</property> + <property name="halign">center</property> + <property name="hexpand">True</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="halign">center</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:JustifyPara</property> </object> <packing> <property name="expand">False</property> @@ -8576,7 +9258,7 @@ </packing> </child> <style> - <class name="priority-11"/> + <class name="priority-14"/> </style> </object> <packing> @@ -8586,47 +9268,67 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SelectSection1"> + <object class="sfxlo-OptionalBox" id="Table-Section-VJustify"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom35"> + <object class="GtkSeparator" id="separator130"> <property name="visible">True</property> - <property name="can_focus">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="sfxlo-NotebookbarToolBox" id="SectionBottom179"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Table-EntireColumn"> + <object class="GtkToolButton" id="Text-CellVertTop"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:EntireColumn</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:CellVertTop</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="Table-EntireRow"> + <object class="GtkToolButton" id="Text-CellVertCenter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:EntireRow</property> + <property name="action_name">.uno:CellVertCenter</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="Table-SelectTable"> + <object class="GtkToolButton" id="Text-CellVertBottom"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SelectTable</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:CellVertBottom</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -8638,7 +9340,7 @@ </packing> </child> <style> - <class name="priority-10"/> + <class name="priority-13"/> </style> </object> <packing> @@ -8648,13 +9350,13 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Table-Section-Area1"> + <object class="sfxlo-OptionalBox" id="Table-Section-Style"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator25"> + <object class="GtkSeparator" id="separator53"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -8669,7 +9371,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom136"> + <object class="sfxlo-NotebookbarToolBox" id="Anchor5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> @@ -8692,6 +9394,37 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-12"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-Area1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="GtkSeparator" id="separator25"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom79"> <property name="visible">True</property> @@ -8716,14 +9449,11 @@ <property name="position">2</property> </packing> </child> - <style> - <class name="priority-9"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">8</property> </packing> </child> <child> @@ -8756,13 +9486,13 @@ </packing> </child> <style> - <class name="priority-8"/> + <class name="priority-11"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">9</property> </packing> </child> <child> @@ -8781,7 +9511,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="visible_horizontal">False</property> - <property name="action_name">.uno:FormatArea</property> + <property name="action_name">.uno:AutoFormat</property> <property name="icon_name">sfx2/res/symphony/open_more.png</property> </object> <packing> @@ -8796,14 +9526,11 @@ <property name="position">0</property> </packing> </child> - <style> - <class name="priority-7"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">10</property> </packing> </child> <child> @@ -8836,14 +9563,11 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-6"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">11</property> </packing> </child> <child> @@ -8887,13 +9611,13 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-10"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">10</property> + <property name="position">12</property> </packing> </child> <child> @@ -8926,13 +9650,13 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-9"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">11</property> + <property name="position">13</property> </packing> </child> <child> @@ -8966,18 +9690,261 @@ <property name="position">0</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">14</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-Merge"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="GtkSeparator" id="separator51"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom41"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <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> + </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">15</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-Splitt"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom181"> + <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="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> + </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">16</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-Splitt1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom182"> + <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="Table-SplitTable"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SplitTable</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> + <style> + <class name="priority-8"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">17</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-Select"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="GtkSeparator" id="separator136"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom42"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Table-EntireCell"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:EntireCell</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> <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">12</property> + <property name="position">18</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-Select1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom35"> + <property name="visible">True</property> + <property name="can_focus">True</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> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <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> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-SelectTable"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SelectTable</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> + <style> + <class name="priority-6"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">19</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="CalcSection"> + <object class="sfxlo-OptionalBox" id="Table-Section-Calc"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -9014,6 +9981,35 @@ <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> + <style> + <class name="priority-5"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">20</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-Calc1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom136"> + <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="Table-AutoSum"> <property name="visible">True</property> @@ -9025,6 +10021,35 @@ <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> + <style> + <class name="priority-4"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">21</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-Calc2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom180"> + <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="Table-TableSort"> <property name="visible">True</property> @@ -9044,17 +10069,17 @@ </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">13</property> + <property name="position">22</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormatCalcSection"> + <object class="sfxlo-OptionalBox" id="Table-Section-FormatCalc"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -9102,6 +10127,35 @@ <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> + <style> + <class name="priority-2"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">23</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-FormatCalc1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom37"> + <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="Table-NumberFormatDate"> <property name="visible">True</property> @@ -9138,9 +10192,15 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">15</property> + <property name="position">24</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">True</property> @@ -9516,13 +10576,13 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Graphic-Section-Align1"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Align"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator66"> + <object class="GtkSeparator" id="separator100"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -9537,21 +10597,46 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align7"> + <object class="sfxlo-NotebookbarToolBox" id="Align12"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Graphic-ObjectAlignLeft"> + <object class="GtkMenuToolButton" id="Graphic-ObjectAlign"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectAlignLeft</property> + <property name="action_name">.uno:ObjectAlign</property> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Align1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Graphic-AlignCenter"> <property name="visible">True</property> @@ -9588,7 +10673,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <child> @@ -9649,7 +10734,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">8</property> </packing> </child> <child> @@ -9713,7 +10798,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">9</property> </packing> </child> <child> @@ -9762,7 +10847,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">10</property> </packing> </child> <child> @@ -9814,7 +10899,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">10</property> + <property name="position">11</property> </packing> </child> <child> @@ -9872,7 +10957,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">11</property> + <property name="position">12</property> </packing> </child> <child> @@ -9910,7 +10995,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">12</property> + <property name="position">13</property> </packing> </child> <child> @@ -9965,7 +11050,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">13</property> + <property name="position">14</property> </packing> </child> <child> @@ -10005,7 +11090,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">14</property> + <property name="position">15</property> </packing> </child> <child> @@ -10044,7 +11129,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">15</property> + <property name="position">16</property> </packing> </child> <child> @@ -10083,7 +11168,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">16</property> + <property name="position">17</property> </packing> </child> <child> @@ -10145,7 +11230,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">17</property> + <property name="position">18</property> </packing> </child> <child> @@ -10192,7 +11277,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">18</property> + <property name="position">19</property> </packing> </child> </object> @@ -10387,7 +11472,7 @@ </packing> </child> <style> - <class name="priority-11"/> + <class name="priority-13"/> </style> </object> <packing> @@ -10441,7 +11526,7 @@ </packing> </child> <style> - <class name="priority-10"/> + <class name="priority-12"/> </style> </object> <packing> @@ -10502,7 +11587,7 @@ </packing> </child> <style> - <class name="priority-9"/> + <class name="priority-11"/> </style> </object> <packing> @@ -10564,7 +11649,7 @@ </packing> </child> <style> - <class name="priority-8"/> + <class name="priority-10"/> </style> </object> <packing> @@ -10605,7 +11690,7 @@ </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-9"/> </style> </object> <packing> @@ -10615,7 +11700,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Draw-Section-Align1"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Align"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -10636,21 +11721,46 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align1"> + <object class="sfxlo-NotebookbarToolBox" id="Align15"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-ObjectAlignLeft2"> + <object class="GtkMenuToolButton" id="Draw-ObjectAlign"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectAlignLeft</property> + <property name="action_name">.uno:ObjectAlign</property> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Align1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Draw-AlignCenter2"> <property name="visible">True</property> @@ -10681,13 +11791,13 @@ </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-8"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <child> @@ -10742,13 +11852,13 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-7"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">8</property> </packing> </child> <child> @@ -10806,13 +11916,13 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-6"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">9</property> </packing> </child> <child> @@ -10855,13 +11965,13 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-5"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">10</property> </packing> </child> <child> @@ -10909,14 +12019,11 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-22"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">10</property> + <property name="position">11</property> </packing> </child> <child> @@ -10956,7 +12063,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">11</property> + <property name="position">12</property> </packing> </child> <child> @@ -10990,14 +12097,11 @@ <property name="position">0</property> </packing> </child> - <style> - <class name="priority-20"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">12</property> + <property name="position">13</property> </packing> </child> <child> @@ -11030,14 +12134,11 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-19"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">13</property> + <property name="position">14</property> </packing> </child> <child> @@ -11076,7 +12177,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">14</property> + <property name="position">15</property> </packing> </child> <child> @@ -11115,7 +12216,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">15</property> + <property name="position">16</property> </packing> </child> <child> @@ -11154,7 +12255,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">16</property> + <property name="position">17</property> </packing> </child> <child> @@ -11193,7 +12294,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">17</property> + <property name="position">18</property> </packing> </child> <child> @@ -11227,14 +12328,11 @@ <property name="position">0</property> </packing> </child> - <style> - <class name="priority-14"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">18</property> + <property name="position">19</property> </packing> </child> <child> @@ -11296,7 +12394,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">19</property> + <property name="position">20</property> </packing> </child> <child> @@ -11343,7 +12441,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">20</property> + <property name="position">21</property> </packing> </child> <child> @@ -11381,7 +12479,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">21</property> + <property name="position">22</property> </packing> </child> <child> @@ -11443,6 +12541,34 @@ <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> + <style> + <class name="priority-4"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">23</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-3d1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> <object class="GtkMenuToolButton" id="Draw-Extrusion3DColor"> <property name="visible">True</property> @@ -11473,13 +12599,13 @@ </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">22</property> + <property name="position">24</property> </packing> </child> <child> @@ -11530,6 +12656,34 @@ <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> + <style> + <class name="priority-2"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">25</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Fontwork1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Draw-FontworkSameLetterHeights"> <property name="visible">True</property> @@ -11577,9 +12731,18 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">23</property> + <property name="position">26</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">True</property> @@ -11792,7 +12955,7 @@ </packing> </child> <style> - <class name="priority-11"/> + <class name="priority-9"/> </style> </object> <packing> @@ -11846,7 +13009,7 @@ </packing> </child> <style> - <class name="priority-10"/> + <class name="priority-8"/> </style> </object> <packing> @@ -11856,7 +13019,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Object-Section-Wrap3"> + <object class="sfxlo-OptionalBox" id="Object-Section-Wrap1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -11907,7 +13070,7 @@ </packing> </child> <style> - <class name="priority-9"/> + <class name="priority-7"/> </style> </object> <packing> @@ -11917,16 +13080,16 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Object-Section-Wrap4"> + <object class="sfxlo-OptionalBox" id="Object-Section-Wrap2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_left">5</property> <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="Wrap3"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_left">5</property> <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Object-WrapLeft"> @@ -11969,7 +13132,7 @@ </packing> </child> <style> - <class name="priority-8"/> + <class name="priority-6"/> </style> </object> <packing> @@ -12010,7 +13173,7 @@ </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-5"/> </style> </object> <packing> @@ -12020,13 +13183,13 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Object-Section-Align3"> + <object class="sfxlo-OptionalBox" id="Object-Section-Align"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator52"> + <object class="GtkSeparator" id="separator66"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12041,21 +13204,46 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align2"> + <object class="sfxlo-NotebookbarToolBox" id="Align13"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-ObjectAlignLeft3"> + <object class="GtkMenuToolButton" id="Object-ObjectAlign"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectAlignLeft</property> + <property name="action_name">.uno:ObjectAlign</property> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-Align3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Object-AlignCenter3"> <property name="visible">True</property> @@ -12086,13 +13274,13 @@ </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-4"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <child> @@ -12147,13 +13335,13 @@ </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">7</property> + <property name="position">8</property> </packing> </child> <child> @@ -12211,13 +13399,13 @@ </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">8</property> + <property name="position">9</property> </packing> </child> <child> @@ -12260,13 +13448,13 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-1"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">10</property> </packing> </child> <child> @@ -12314,14 +13502,11 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-19"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">10</property> + <property name="position">11</property> </packing> </child> <child> @@ -12355,13 +13540,13 @@ </packing> </child> <style> - <class name="priority-18"/> + <class name="priority-12"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">11</property> + <property name="position">12</property> </packing> </child> <child> @@ -12395,14 +13580,11 @@ <property name="position">0</property> </packing> </child> - <style> - <class name="priority-17"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">12</property> + <property name="position">13</property> </packing> </child> <child> @@ -12435,14 +13617,11 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-16"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">13</property> + <property name="position">14</property> </packing> </child> <child> @@ -12486,13 +13665,13 @@ </packing> </child> <style> - <class name="priority-15"/> + <class name="priority-11"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">14</property> + <property name="position">15</property> </packing> </child> <child> @@ -12525,13 +13704,13 @@ </packing> </child> <style> - <class name="priority-14"/> + <class name="priority-10"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">15</property> + <property name="position">16</property> </packing> </child> <child> @@ -12565,14 +13744,11 @@ <property name="position">0</property> </packing> </child> - <style> - <class name="priority-13"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">16</property> + <property name="position">17</property> </packing> </child> <child> @@ -12647,7 +13823,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">17</property> + <property name="position">18</property> </packing> </child> <child> @@ -12685,7 +13861,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">18</property> + <property name="position">19</property> </packing> </child> </object> @@ -13128,13 +14304,13 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Media-Section-Align1"> + <object class="sfxlo-OptionalBox" id="Media-Section-Align"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator82"> + <object class="GtkSeparator" id="separator52"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -13149,21 +14325,46 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align9"> + <object class="sfxlo-NotebookbarToolBox" id="Align14"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-ObjectAlignLeft"> + <object class="GtkMenuToolButton" id="Media-ObjectAlign"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectAlignLeft</property> + <property name="action_name">.uno:ObjectAlign</property> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Media-Section-Align1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Media-AlignCenter"> <property name="visible">True</property> @@ -13200,7 +14401,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <child> @@ -13261,7 +14462,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">8</property> </packing> </child> <child> @@ -13325,7 +14526,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">9</property> </packing> </child> <child> @@ -13374,7 +14575,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">10</property> </packing> </child> <child> @@ -13426,7 +14627,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">10</property> + <property name="position">11</property> </packing> </child> <child> @@ -13475,13 +14676,13 @@ </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-12"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">11</property> + <property name="position">12</property> </packing> </child> </object> @@ -14398,45 +15599,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Styles1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom89"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Form-StyleApply5"> - <property name="can_focus">False</property> - <property name="action_name">.uno:StyleApply</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> - <style> - <class name="priority-11"/> - </style> - </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="Form-Section-Anchor1"> + <object class="sfxlo-OptionalBox" id="Form-Section-Wrap3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -14457,44 +15620,6 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Anchor4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Form-AnchorMenu"> - <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">True</property> - <property name="position">1</property> - </packing> - </child> - <style> - <class name="priority-10"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Wrap3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <child> <object class="sfxlo-NotebookbarToolBox" id="Wrap5"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -14546,7 +15671,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> <child> @@ -14559,6 +15684,7 @@ <object class="sfxlo-NotebookbarToolBox" id="Wrap7"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_left">5</property> <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Media-WrapLeft4"> @@ -14607,7 +15733,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">2</property> </packing> </child> <child> @@ -14648,17 +15774,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">3</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Align3"> + <object class="sfxlo-OptionalBox" id="Form-Section-Align"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator105"> + <object class="GtkSeparator" id="separator82"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -14673,21 +15799,46 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align5"> + <object class="sfxlo-NotebookbarToolBox" id="Align16"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-ObjectAlignLeft4"> + <object class="GtkMenuToolButton" id="Form-ObjectAlign"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectAlignLeft</property> + <property name="action_name">.uno:ObjectAlign</property> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Form-Section-Align3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Media-AlignCenter4"> <property name="visible">True</property> @@ -14724,7 +15875,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">5</property> </packing> </child> <child> @@ -14785,7 +15936,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">6</property> </packing> </child> <child> @@ -14849,7 +16000,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">7</property> </packing> </child> <child> @@ -14898,7 +16049,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">8</property> </packing> </child> <child> @@ -14967,14 +16118,11 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-18"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">10</property> + <property name="position">9</property> </packing> </child> <child> @@ -15028,14 +16176,11 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-17"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">11</property> + <property name="position">10</property> </packing> </child> <child> @@ -15083,14 +16228,11 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-16"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">12</property> + <property name="position">11</property> </packing> </child> <child> @@ -15123,14 +16265,11 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-15"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">13</property> + <property name="position">12</property> </packing> </child> <child> @@ -15170,7 +16309,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">14</property> + <property name="position">13</property> </packing> </child> <child> @@ -15210,7 +16349,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">15</property> + <property name="position">14</property> </packing> </child> <child> @@ -15275,9 +16414,148 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="position">15</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Form-Section-Form-Farmatted1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="GtkSeparator" id="separator119"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom176"> + <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="Form-FormattedField"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormattedField</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-DateField"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DateField</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-TimeField"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:TimeField</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> + <style> + <class name="priority-2"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">16</property> </packing> </child> + <child> + <object class="sfxlo-OptionalBox" id="Form-Section-Form-Farmatted2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom177"> + <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="Form-NumericField"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NumericField</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-CurrencyField"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CurrencyField</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-PatternField"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PatternField</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> + <style> + <class name="priority-1"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">17</property> + </packing> + </child> </object> <packing> <property name="expand">True</property> @@ -15476,7 +16754,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="MacroSection"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Macro"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -15516,39 +16794,71 @@ <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="sfxlo-OptionalBox" id="Tools-Section-Macro1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator119"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom160"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="valign">center</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Tools-MacroDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:MacroDialog</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="padding">5</property> - <property name="pack_type">end</property> - <property name="position">1</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="MailMergeSection"> + <object class="sfxlo-OptionalBox" id="Tools-Section-MailMerge"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator128"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom124"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -15569,66 +16879,103 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Tools-Section-Envelope"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator128"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom161"> <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> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Tools-InsertEnvelope"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertEnvelope</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="padding">5</property> <property name="position">1</property> </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-13"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection2"> + <object class="sfxlo-OptionalBox" id="Tools-Section-SendMail"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom125"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom162"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Tools-SwitchControlDesignMode"> + <object class="GtkToolButton" id="Tools-SendMail"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SwitchControlDesignMode</property> + <property name="action_name">.uno:SendMail</property> </object> <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="expand">True</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-12"/> + </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="Tools-Section-Form-DesignMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator130"> + <object class="GtkSeparator" id="separator94"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -15642,10 +16989,46 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="padding">5</property> - <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom125"> + <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="Tools-SwitchControlDesignMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SwitchControlDesignMode</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">5</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-Wizzard"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom141"> <property name="visible">True</property> @@ -15671,22 +17054,37 @@ </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-11"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">6</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection3"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-LabelCheckbox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator138"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom142"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -15725,6 +17123,35 @@ <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> + <style> + <class name="priority-10"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-LabelCheckbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom163"> + <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="Tools-RadioButton"> <property name="visible">True</property> @@ -15762,41 +17189,41 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator138"> - <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">1</property> </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-9"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">8</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection4"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-Buttons"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator144"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom143"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -15828,41 +17255,41 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator144"> - <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">1</property> </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-8"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">9</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection5"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-Farmatted"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator145"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom144"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -15901,6 +17328,35 @@ <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> + <style> + <class name="priority-7"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">10</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-Farmatted1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom164"> + <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="Tools-NumericField"> <property name="visible">True</property> @@ -15938,41 +17394,41 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator145"> - <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">1</property> </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-6"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">11</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection6"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-GroupBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator146"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom145"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -15993,11 +17449,27 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-5"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">12</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-Controls"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator146"> + <object class="GtkSeparator" id="separator131"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -16008,13 +17480,13 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom146"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom147"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -16043,11 +17515,27 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> + <style> + <class name="priority-4"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">13</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-GridNavigationBar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator131"> + <object class="GtkSeparator" id="separator152"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -16058,13 +17546,13 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom147"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom165"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -16093,21 +17581,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator152"> - <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">5</property> </packing> </child> @@ -16118,16 +17591,31 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">14</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection7"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-TabDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator154"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom148"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -16159,21 +17647,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator154"> - <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">1</property> </packing> </child> @@ -16184,16 +17657,31 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">15</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection8"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form-ReadOnly"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator158"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom149"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -16225,21 +17713,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator158"> - <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">1</property> </packing> </child> @@ -16250,7 +17723,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">16</property> </packing> </child> </object> diff --git a/sw/uiconfig/swriter/ui/notebookbar_single.ui b/sw/uiconfig/swriter/ui/notebookbar_single.ui index b9b0d1d679a5..5387187d67ff 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_single.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_single.ui @@ -240,6 +240,7 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom54"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_left">5</property> <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Default-FontHeight"> @@ -1509,6 +1510,7 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom56"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_left">5</property> <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Default-FontHeight1"> |