sc/uiconfig/scalc/ui/notebookbar.ui | 2201 ++++++--- sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui | 801 +++ sd/uiconfig/sdraw/ui/notebookbar.ui | 2004 ++++++-- sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui | 768 +++ sd/uiconfig/simpress/ui/notebookbar.ui | 1971 ++++++-- sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui | 768 +++ sw/uiconfig/swriter/ui/notebookbar.ui | 3244 +++++++++----- sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 820 +++ 8 files changed, 9726 insertions(+), 2851 deletions(-)
New commits: commit cd41b2b7d6e6d808738a7a9f776346442da13855 Author: andreas kainz <kain...@gmail.com> AuthorDate: Wed Dec 12 00:58:44 2018 +0100 Commit: andreas_kainz <kain...@gmail.com> CommitDate: Tue Dec 18 07:40:34 2018 +0100 tdf#121592 add context-Form toolbar to NB tabbed and groupedbar_compact add context-form support Change-Id: I4a59d4b71bbbc253ee4188c4c15a7353e623e2f1 Reviewed-on: https://gerrit.libreoffice.org/65295 Tested-by: Jenkins Reviewed-by: andreas_kainz <kain...@gmail.com> diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui index fb3e5adbc753..adeb29754cde 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -528,6 +528,166 @@ </object> </child> </object> + <object class="GtkMenu" id="MenuForm"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="MenuForm-Label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Label</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuForm-Edit"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Edit</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuForm-CheckBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CheckBox</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuForm-RadioButton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RadioButton</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuForm-ListBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ListBox</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuForm-ComboBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ComboBox</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuForm-separator2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuForm-Pushbutton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Pushbutton</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuForm-Imagebutton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Imagebutton</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuForm-separator3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuForm-FormattedField"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormattedField</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuForm-separator4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuForm-DateField"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DateField</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuForm-TimeField"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:TimeField</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuForm-NumericField"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NumericField</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuForm-CurrencyField"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CurrencyField</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuForm-PatternField"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PatternField</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuForm-separator5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuForm-ImageControl"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ImageControl</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuForm-FileControl"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FileControl</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuForm-separator7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuForm-Grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Grid</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuForm-NavigationBar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NavigationBar</property> + </object> + </child> + </object> <object class="GtkMenu" id="MenuHelp"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -10138,7 +10298,6 @@ </object> <packing> <property name="position">7</property> - <property name="tab_fill">False</property> </packing> </child> <child type="tab"> @@ -11211,7 +11370,7 @@ </child> </object> <packing> - <property name="position">9</property> + <property name="position">8</property> </packing> </child> <child type="tab"> @@ -11223,32 +11382,33 @@ <style> <class name="context-Draw"/> <class name="context-DrawLine"/> - <class name="context-ThreeDObject"/> + <class name="context-3DObject"/> + <class name="context-MultiObject"/> </style> </object> <packing> - <property name="position">9</property> + <property name="position">8</property> <property name="tab_fill">False</property> </packing> </child> <child> - <object class="sfxlo-PriorityHBox" id="MediaBox"> + <object class="sfxlo-PriorityHBox" id="ObjectBox"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="Media-Container"> + <object class="sfxlo-PriorityMergedHBox" id="Object-Container"> <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="Media-Section-Edit"> + <object class="sfxlo-OptionalBox" id="Object-Section-Edit"> <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="SectionBottom27"> + <object class="sfxlo-NotebookbarToolBox" id="Big2"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -11258,7 +11418,7 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Media-AssignMacro"> + <object class="GtkToolButton" id="Object-AssignMacro"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -11266,25 +11426,25 @@ <property name="action_name">.uno:AssignMacro</property> </object> <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="expand">False</property> + <property name="homogeneous">False</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="GroupB24"> + <object class="GtkBox" id="GroupB60"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom28"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom42"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -11292,10 +11452,10 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-AVMediaPlayer"> + <object class="GtkToolButton" id="Draw-ToggleObjectBezierMode2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AVMediaPlayer</property> + <property name="action_name">.uno:ToggleObjectBezierMode</property> </object> <packing> <property name="expand">False</property> @@ -11310,15 +11470,15 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom31"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom47"> <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="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-ToggleObjectRotateMode"> + <object class="GtkToolButton" id="Draw-ToggleObjectRotateMode1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ToggleObjectRotateMode</property> @@ -11328,6 +11488,28 @@ <property name="homogeneous">True</property> </packing> </child> + <child> + <object class="GtkToolButton" id="Draw-FlipVertical1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlipVertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FlipHorizontal1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlipHorizontal</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -11339,11 +11521,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator28"> + <object class="GtkSeparator" id="separator56"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -11365,30 +11547,62 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Media-Section-AVMediaToolbox"> + <object class="sfxlo-OptionalBox" id="Object-Section-FormatLineArea"> <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="first14"> - <property name="width_request">1000</property> + <object class="GtkBox" id="box7"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="GtkToolButton" id="Media-AVMediaToolBox"> - <property name="width_request">800</property> + <object class="sfxlo-NotebookbarToolBox" id="third2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="action_name">.uno:AVMediaToolBox</property> + <property name="can_focus">True</property> + <property name="toolbar_style">text</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="action_name">.uno:FormatLine</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third4"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FormatArea3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatArea</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> @@ -11399,38 +11613,193 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator34"> + <object class="GtkBox" id="box15"> <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">3</property> - </packing> - </child> - <style> - <class name="priority-3"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> + <child> + <object class="GtkBox" id="box16"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first17"> + <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="GtkMenuToolButton" id="Object-XLineStyle"> + <property name="width_request">100</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:XLineStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first19"> + <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="Object-XLineColor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:XLineColor</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom54"> + <property name="width_request">200</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-FillStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillStyle</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box18"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first20"> + <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="Object-LineEndStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineEndStyle</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom55"> + <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="Object-FillShadow"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillShadow</property> + </object> + <packing> + <property name="expand">False</property> + <property name="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="GtkSeparator" id="separator65"> + <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">3</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="Media-Section-ObjectAlign"> + <object class="sfxlo-OptionalBox" id="Object-Section-ObjectAlign"> <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="SectionBottom56"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -11439,7 +11808,7 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkMenuToolButton" id="Image-AnchorMenu2"> + <object class="GtkMenuToolButton" id="Object-Anchor"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -11459,24 +11828,22 @@ </packing> </child> <child> - <object class="GtkBox" id="box5"> + <object class="GtkBox" id="box17"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">5</property> - <property name="margin_right">5</property> <child> - <object class="GtkBox" id="AlignGroup2"> + <object class="GtkBox" id="AlignGroup4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align5"> + <object class="sfxlo-NotebookbarToolBox" id="Align7"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-ObjectAlignLeft"> + <object class="GtkToolButton" id="Object-ObjectAlignLeft"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignLeft</property> @@ -11487,7 +11854,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-AlignCenter"> + <object class="GtkToolButton" id="Object-AlignCenter"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignCenter</property> @@ -11498,7 +11865,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-ObjectAlignRight"> + <object class="GtkToolButton" id="Object-ObjectAlignRight"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignRight</property> @@ -11516,13 +11883,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align6"> + <object class="sfxlo-NotebookbarToolBox" id="Align8"> <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="Media-AlignUp"> + <object class="GtkToolButton" id="Object-AlignUp"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignUp</property> @@ -11533,7 +11900,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-AlignDown"> + <object class="GtkToolButton" id="Object-AlignDown"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignDown</property> @@ -11544,7 +11911,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-AlignMiddle"> + <object class="GtkToolButton" id="Object-AlignMiddle"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignMiddle</property> @@ -11586,24 +11953,24 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Media-Section-Arrange"> + <object class="sfxlo-OptionalBox" id="Object-Section-Arrange"> <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="GtkGrid" id="grid4"> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first15"> + <object class="sfxlo-NotebookbarToolBox" id="first18"> <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="Media-BringToFront"> + <object class="GtkToolButton" id="Object-BringToFront"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BringToFront</property> @@ -11620,13 +11987,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="second7"> + <object class="sfxlo-NotebookbarToolBox" id="second8"> <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="Media-SendToBack"> + <object class="GtkToolButton" id="Object-SendToBack"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SendToBack</property> @@ -11643,13 +12010,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="first16"> + <object class="sfxlo-NotebookbarToolBox" id="first21"> <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="Media-ObjectForwardOne"> + <object class="GtkToolButton" id="Object-ObjectForwardOne"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectForwardOne</property> @@ -11666,13 +12033,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Second3"> + <object class="sfxlo-NotebookbarToolBox" id="Second2"> <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="Media-ObjectBackOne"> + <object class="GtkToolButton" id="Object-ObjectBackOne"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectBackOne</property> @@ -11713,38 +12080,40 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="Media-Menu"> + <object class="sfxlo-DropdownBox" id="Object-Menu"> <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="GtkBox" id="GroupB53"> + <object class="GtkBox" id="GroupB78"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="svtlo-ManagedMenuButton" id="media:MenuMedia"> - <property name="label" translatable="yes" context="CalcNotebookbar|MediaMenuButton">_Media</property> + <object class="svtlo-ManagedMenuButton" id="Object-DrawMenu:MenuDraw"> + <property name="label" translatable="yes" context="CalcNotebookbar|frame:MenuDraw">_Object</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="focus_on_click">False</property> <property name="receives_default">False</property> <property name="halign">end</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <property name="relief">none</property> <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom30"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom58"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="halign">end</property> @@ -11753,31 +12122,56 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="Media-TransformDialog"> + <object class="GtkToolButton" id="Object-FormatArea"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:TransformDialog</property> + <property name="valign">center</property> + <property name="action_name">.uno:FormatArea</property> </object> <packing> - <property name="expand">True</property> + <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> - </packing> - </child> - </object> + <child> + <object class="GtkToolButton" id="Object-FormatLine"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:FormatLine</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-TransformDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:TransformDialog</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> + </packing> + </child> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -11786,7 +12180,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator42"> + <object class="GtkSeparator" id="separator114"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -11804,42 +12198,43 @@ </child> </object> <packing> - <property name="position">10</property> + <property name="position">9</property> </packing> </child> <child type="tab"> - <object class="GtkLabel" id="MediaLabel"> + <object class="GtkLabel" id="ObjectLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="CalcNotebookbar|MediaLabel">~Media</property> + <property name="label" translatable="yes" context="CalcNotebookbar|FrameLabel">~Object</property> <property name="use_underline">True</property> <style> - <class name="context-Media"/> + <class name="context-Frame"/> + <class name="context-OLE"/> </style> </object> <packing> - <property name="position">12</property> + <property name="position">9</property> <property name="tab_fill">False</property> </packing> </child> <child> - <object class="sfxlo-PriorityHBox" id="ObjectBox"> + <object class="sfxlo-PriorityHBox" id="MediaBox"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="Object-Container"> + <object class="sfxlo-PriorityMergedHBox" id="Media-Container"> <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="Object-Section-Edit"> + <object class="sfxlo-OptionalBox" id="Media-Section-Edit"> <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="Big2"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom27"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -11849,7 +12244,7 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Object-AssignMacro"> + <object class="GtkToolButton" id="Media-AssignMacro"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -11857,25 +12252,25 @@ <property name="action_name">.uno:AssignMacro</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> <child> - <object class="GtkBox" id="GroupB60"> + <object class="GtkBox" id="GroupB24"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom42"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom28"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -11883,10 +12278,10 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-ToggleObjectBezierMode2"> + <object class="GtkToolButton" id="Media-AVMediaPlayer"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectBezierMode</property> + <property name="action_name">.uno:AVMediaPlayer</property> </object> <packing> <property name="expand">False</property> @@ -11901,15 +12296,15 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom47"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom31"> <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="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-ToggleObjectRotateMode1"> + <object class="GtkToolButton" id="Media-ToggleObjectRotateMode"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ToggleObjectRotateMode</property> @@ -11919,28 +12314,6 @@ <property name="homogeneous">True</property> </packing> </child> - <child> - <object class="GtkToolButton" id="Draw-FlipVertical1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FlipVertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Draw-FlipHorizontal1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -11952,11 +12325,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator56"> + <object class="GtkSeparator" id="separator28"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -11978,62 +12351,90 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Object-Section-FormatLineArea"> + <object class="sfxlo-OptionalBox" id="Media-Section-AVMediaToolbox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="box7"> + <object class="sfxlo-NotebookbarToolBox" id="first14"> + <property name="width_request">1000</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="third2"> + <object class="GtkToolButton" id="Media-AVMediaToolBox"> + <property name="width_request">800</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">text</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="action_name">.uno:FormatLine</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:AVMediaToolBox</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="expand">True</property> + <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator34"> + <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">3</property> + </packing> + </child> + <style> + <class name="priority-3"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Media-Section-ObjectAlign"> + <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"> + <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</property> + <property name="show_arrow">False</property> + <property name="icon_size">3</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="third4"> + <object class="GtkMenuToolButton" id="Image-AnchorMenu2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">text</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Draw-FormatArea3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FormatArea</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="action_name">.uno:AnchorMenu</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -12044,259 +12445,46 @@ </packing> </child> <child> - <object class="GtkBox" id="box15"> + <object class="GtkBox" id="box5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <property name="margin_left">5</property> + <property name="margin_right">5</property> <child> - <object class="GtkBox" id="box16"> + <object class="GtkBox" id="AlignGroup2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first17"> + <object class="sfxlo-NotebookbarToolBox" id="Align5"> <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="GtkMenuToolButton" id="Object-XLineStyle"> - <property name="width_request">100</property> + <object class="GtkToolButton" id="Media-ObjectAlignLeft"> <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:ObjectAlignLeft</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="first19"> - <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="Object-XLineColor"> + <object class="GtkToolButton" id="Media-AlignCenter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:XLineColor</property> + <property name="action_name">.uno:AlignCenter</property> </object> <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom54"> - <property name="width_request">200</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Object-FillStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FillStyle</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box18"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="first20"> - <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="Object-LineEndStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:LineEndStyle</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom55"> - <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="Object-FillShadow"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FillShadow</property> - </object> - <packing> - <property name="expand">False</property> - <property name="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="GtkSeparator" id="separator65"> - <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">3</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="Object-Section-ObjectAlign"> - <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"> - <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</property> - <property name="show_arrow">False</property> - <property name="icon_size">3</property> - <child> - <object class="GtkMenuToolButton" id="Object-Anchor"> - <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> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box17"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkBox" id="AlignGroup4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="Align7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Object-ObjectAlignLeft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectAlignLeft</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Object-AlignCenter"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AlignCenter</property> - </object> - <packing> - <property name="expand">False</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Object-ObjectAlignRight"> + <object class="GtkToolButton" id="Media-ObjectAlignRight"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignRight</property> @@ -12314,13 +12502,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align8"> + <object class="sfxlo-NotebookbarToolBox" id="Align6"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-AlignUp"> + <object class="GtkToolButton" id="Media-AlignUp"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignUp</property> @@ -12331,7 +12519,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-AlignDown"> + <object class="GtkToolButton" id="Media-AlignDown"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignDown</property> @@ -12342,7 +12530,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-AlignMiddle"> + <object class="GtkToolButton" id="Media-AlignMiddle"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignMiddle</property> @@ -12384,24 +12572,24 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Object-Section-Arrange"> + <object class="sfxlo-OptionalBox" id="Media-Section-Arrange"> <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="GtkGrid" id="grid3"> + <object class="GtkGrid" id="grid4"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first18"> + <object class="sfxlo-NotebookbarToolBox" id="first15"> <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="Object-BringToFront"> + <object class="GtkToolButton" id="Media-BringToFront"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BringToFront</property> @@ -12418,13 +12606,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="second8"> + <object class="sfxlo-NotebookbarToolBox" id="second7"> <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="Object-SendToBack"> + <object class="GtkToolButton" id="Media-SendToBack"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SendToBack</property> @@ -12441,13 +12629,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="first21"> + <object class="sfxlo-NotebookbarToolBox" id="first16"> <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="Object-ObjectForwardOne"> + <object class="GtkToolButton" id="Media-ObjectForwardOne"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectForwardOne</property> @@ -12464,13 +12652,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Second2"> + <object class="sfxlo-NotebookbarToolBox" id="Second3"> <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="Object-ObjectBackOne"> + <object class="GtkToolButton" id="Media-ObjectBackOne"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectBackOne</property> @@ -12511,40 +12699,38 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="Object-Menu"> + <object class="sfxlo-DropdownBox" id="Media-Menu"> <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="GtkBox" id="GroupB78"> + <object class="GtkBox" id="GroupB53"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="svtlo-ManagedMenuButton" id="Object-DrawMenu:MenuDraw"> - <property name="label" translatable="yes" context="CalcNotebookbar|frame:MenuDraw">_Object</property> + <object class="svtlo-ManagedMenuButton" id="media:MenuMedia"> ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits