diff options
| author | andreas kainz <kainz.a@gmail.com> | 2018-12-12 00:58:44 +0100 |
|---|---|---|
| committer | andreas_kainz <kainz.a@gmail.com> | 2018-12-18 07:40:22 +0100 |
| commit | e34f51bc082016bedec9aa2f58145ff67ac45707 (patch) | |
| tree | de48d6f057ca3670b1e3b325f776537cfc0325fd | |
| parent | 8c7473e2998e13fc9c62aaa9ce9d7b536e81be57 (diff) | |
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/65296
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
| -rw-r--r-- | sc/uiconfig/scalc/ui/notebookbar.ui | 1769 | ||||
| -rw-r--r-- | sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui | 793 | ||||
| -rw-r--r-- | sd/uiconfig/sdraw/ui/notebookbar.ui | 1766 | ||||
| -rw-r--r-- | sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui | 768 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/ui/notebookbar.ui | 1791 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui | 768 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar.ui | 2052 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 810 |
8 files changed, 8696 insertions, 1821 deletions
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,7 +11613,165 @@ </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="orientation">vertical</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> @@ -11413,9 +11785,6 @@ <property name="position">3</property> </packing> </child> - <style> - <class name="priority-3"/> - </style> </object> <packing> <property name="expand">False</property> @@ -11424,13 +11793,13 @@ </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,13 +12122,38 @@ <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="valign">center</property> + <property name="action_name">.uno:FormatArea</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <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">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -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,231 +12351,41 @@ </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"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="third2"> - <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> - </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="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> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box15"> + <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> - <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> + <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="SectionBottom54"> - <property name="width_request">200</property> + <object class="GtkToolButton" id="Media-AVMediaToolBox"> + <property name="width_request">800</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="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> + <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">1</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">2</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator65"> + <object class="GtkSeparator" id="separator34"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12216,6 +12399,9 @@ <property name="position">3</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> </object> <packing> <property name="expand">False</property> @@ -12224,13 +12410,13 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Object-Section-ObjectAlign"> + <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="SectionBottom56"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom71"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -12239,7 +12425,7 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkMenuToolButton" id="Object-Anchor"> + <object class="GtkMenuToolButton" id="Image-AnchorMenu2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12259,22 +12445,24 @@ </packing> </child> <child> - <object class="GtkBox" id="box17"> + <object class="GtkBox" id="box5"> <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="AlignGroup4"> + <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="Align7"> + <object class="sfxlo-NotebookbarToolBox" id="Align5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-ObjectAlignLeft"> + <object class="GtkToolButton" id="Media-ObjectAlignLeft"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignLeft</property> @@ -12285,7 +12473,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-AlignCenter"> + <object class="GtkToolButton" id="Media-AlignCenter"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignCenter</property> @@ -12296,7 +12484,7 @@ </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"> + <property name="label" translatable="yes" context="CalcNotebookbar|MediaMenuButton">_Media</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="focus_on_click">False</property> <property name="receives_default">False</property> <property name="halign">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">True</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> <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="halign">end</property> @@ -12553,38 +12739,13 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="Object-FormatArea"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:FormatArea</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <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"> + <object class="GtkToolButton" id="Media-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="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -12611,7 +12772,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator114"> + <object class="GtkSeparator" id="separator42"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -12633,14 +12794,13 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="ObjectLabel"> + <object class="GtkLabel" id="MediaLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="CalcNotebookbar|FrameLabel">~Object</property> + <property name="label" translatable="yes" context="CalcNotebookbar|MediaLabel">~Media</property> <property name="use_underline">True</property> <style> - <class name="context-Frame"/> - <class name="context-OLE"/> + <class name="context-Media"/> </style> </object> <packing> @@ -13112,7 +13272,7 @@ </child> </object> <packing> - <property name="position">10</property> + <property name="position">11</property> </packing> </child> <child type="tab"> @@ -13126,6 +13286,799 @@ </style> </object> <packing> + <property name="position">11</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="sfxlo-PriorityHBox" id="FormBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-DropdownBox" id="Form-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="Form-Section"> + <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="Form-FormButton:MenuForm"> + <property name="label" translatable="yes" context="CalcNotebookbar|FormMenuButton">Fo_rm</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">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">True</property> + <property name="halign">end</property> + <property name="hexpand">True</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <property name="icon_size">1</property> + <child> + <object class="GtkToolButton" id="FormMenu-FormProperties"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormProperties</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> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator44"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-PriorityMergedHBox" id="Form-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="Form-Section-Form1"> + <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">True</property> + <property name="valign">center</property> + <property name="margin_left">5</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="GtkToolButton" id="Form-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">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="GroupB21"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin10"> + <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="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Form-UseWizards"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:UseWizards</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="belowspacing10"> + <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="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Form-GroupBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GroupBox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator47"> + <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">0</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Form-Section-Form"> + <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="GroupB59"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom114"> + <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="Form-FormProperties"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormProperties</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="SectionBottom115"> + <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="Form-ShowFmExplorer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ShowFmExplorer</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="GtkBox" id="GroupB72"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom116"> + <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="Form-TabDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:TabDialog</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="SectionBottom98"> + <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="Form-OpenReadOnly"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:OpenReadOnly</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="GroupB68"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom120"> + <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="Form-ControlProperties"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ControlProperties</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="SectionBottom123"> + <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="Form-AutoControlFocus"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AutoControlFocus</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="separator48"> + <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="Form-Section-Form2"> + <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="GroupB25"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom110"> + <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="Form-Label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Label</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-Edit"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Edit</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-CheckBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CheckBox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-RadioButton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RadioButton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ListBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ListBox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ComboBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ComboBox</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="SectionBottom111"> + <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="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">True</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">True</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">True</property> + </packing> + </child> + <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">True</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">True</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">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="GtkSeparator" id="separator49"> + <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-2"/> + </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-Form3"> + <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="GroupB34"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom112"> + <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="Form-Pushbutton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Pushbutton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-Imagebutton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Imagebutton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ImageControl"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ImageControl</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="SectionBottom113"> + <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="Form-FileControl"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FileControl</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-NavigationBar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NavigationBar</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-Grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Grid</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> + <style> + <class name="priority-1"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="position">12</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="FormLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="CalcNotebookbar|FormLabel">Fo~rm</property> + <property name="use_underline">True</property> + <style> + <class name="context-Form"/> + </style> + </object> + <packing> <property name="position">12</property> <property name="tab_fill">False</property> </packing> @@ -13168,7 +14121,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom34"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="halign">end</property> @@ -13239,7 +14192,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom41"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -13267,7 +14220,7 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB34"> + <object class="GtkBox" id="GroupB42"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -13357,7 +14310,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom41"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom57"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -13384,7 +14337,7 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB42"> + <object class="GtkBox" id="GroupB44"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -13446,7 +14399,7 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB44"> + <object class="GtkBox" id="GroupB58"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -13536,7 +14489,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom57"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom60"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -13590,7 +14543,7 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB59"> + <object class="GtkBox" id="GroupB62"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -13683,7 +14636,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom60"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom61"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -13710,14 +14663,14 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB58"> + <object class="GtkBox" id="GroupB63"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin10"> + <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin13"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -13743,7 +14696,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="belowspacing10"> + <object class="sfxlo-NotebookbarToolBox" id="belowspacing14"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -13807,14 +14760,14 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB62"> + <object class="GtkBox" id="GroupB64"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom61"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom63"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="toolbar_style">icons</property> @@ -13893,7 +14846,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom63"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom64"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="toolbar_style">icons</property> @@ -14010,14 +14963,14 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB63"> + <object class="GtkBox" id="GroupB75"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom64"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom68"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="toolbar_style">icons</property> @@ -14063,7 +15016,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom68"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom75"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="toolbar_style">icons</property> @@ -14147,7 +15100,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB64"> + <object class="GtkBox" id="GroupB76"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -14200,7 +15153,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom75"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom85"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="toolbar_style">icons</property> @@ -14271,7 +15224,7 @@ </child> </object> <packing> - <property name="position">11</property> + <property name="position">13</property> </packing> </child> <child type="tab"> @@ -14282,7 +15235,7 @@ <property name="use_underline">True</property> </object> <packing> - <property name="position">11</property> + <property name="position">13</property> <property name="tab_fill">False</property> </packing> </child> diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui index 8d3438a991df..836a1486898d 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui @@ -1000,6 +1000,19 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuEdit-SwitchControlDesignMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SwitchControlDesignMode</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuEdit-separator6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuEdit-PageFormatDialog"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1187,6 +1200,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="MenuFormat"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -3135,23 +3308,6 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator122"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="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">False</property> - <property name="padding">5</property> - <property name="pack_type">end</property> - <property name="position">2</property> - </packing> - </child> - <child> <object class="sfxlo-DropdownBox" id="ClipboardSection"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -3259,7 +3415,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> @@ -10018,10 +10174,611 @@ <property name="position">7</property> </packing> </child> + <child> + <object class="sfxlo-PriorityMergedHBox" id="FormContainer"> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-OptionalBox" id="Form-Section-Form"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkSeparator" id="separator9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="Section2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom50"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">end</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Form-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> + <child> + <object class="GtkToolButton" id="Form-UseWizards"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:UseWizards</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-GroupBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GroupBox</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="svtlo-ManagedMenuButton" id="Form-FormButton:MenuForm"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|FormButton">Fo_rm</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Form-Section-Property"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkSeparator" id="separator12"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="Section36"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom51"> + <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="Form-FormProperties"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormProperties</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-TabDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:TabDialog</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ControlProperties"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ControlProperties</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="SectionBottom56"> + <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="Form-ShowFmExplorer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ShowFmExplorer</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-OpenReadOnly"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:OpenReadOnly</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-AutoControlFocus"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AutoControlFocus</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">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> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Form-Section-Form1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</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="GtkBox" id="Section20"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom110"> + <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="Form-Label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Label</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-Edit"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Edit</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-CheckBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CheckBox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-RadioButton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RadioButton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ListBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ListBox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ComboBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ComboBox</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="SectionBottom111"> + <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="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">True</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">True</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">True</property> + </packing> + </child> + <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">True</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">True</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">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> + <style> + <class name="priority-2"/> + </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-Form2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkSeparator" id="separator35"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="Section38"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom112"> + <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="Form-Pushbutton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Pushbutton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-Imagebutton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Imagebutton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ImageControl"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ImageControl</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="SectionBottom113"> + <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="Form-FileControl"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FileControl</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-NavigationBar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NavigationBar</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-Grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Grid</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> + <style> + <class name="priority-1"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <style> + <class name="context-Form"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">8</property> + </packing> + </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator122"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="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">False</property> + <property name="padding">5</property> + <property name="pack_type">end</property> <property name="position">4</property> </packing> </child> diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui index fc6508027afd..8715155f56ed 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar.ui @@ -513,6 +513,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> @@ -6301,7 +6461,7 @@ </child> </object> <packing> - <property name="position">5</property> + <property name="position">4</property> </packing> </child> <child type="tab"> @@ -6312,7 +6472,7 @@ <property name="use_underline">True</property> </object> <packing> - <property name="position">5</property> + <property name="position">4</property> <property name="tab_fill">False</property> </packing> </child> @@ -7361,7 +7521,7 @@ </child> </object> <packing> - <property name="position">6</property> + <property name="position">5</property> </packing> </child> <child type="tab"> @@ -7372,7 +7532,7 @@ <property name="use_underline">True</property> </object> <packing> - <property name="position">6</property> + <property name="position">5</property> <property name="tab_fill">False</property> </packing> </child> @@ -8690,7 +8850,7 @@ </child> </object> <packing> - <property name="position">4</property> + <property name="position">6</property> </packing> </child> <child type="tab"> @@ -8702,10 +8862,11 @@ <style> <class name="context-Text"/> <class name="context-DrawText"/> + <class name="context-TextObject"/> </style> </object> <packing> - <property name="position">4</property> + <property name="position">6</property> <property name="tab_fill">False</property> </packing> </child> @@ -10729,7 +10890,6 @@ </object> <packing> <property name="position">8</property> - <property name="tab_fill">False</property> </packing> </child> <child type="tab"> @@ -12036,7 +12196,8 @@ <style> <class name="context-Draw"/> <class name="context-DrawLine"/> - <class name="context-ThreeDObject"/> + <class name="context-3DObject"/> + <class name="context-MultiObject"/> </style> </object> <packing> @@ -12045,23 +12206,23 @@ </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> @@ -12071,7 +12232,7 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Media-NameGroup"> + <object class="GtkToolButton" id="Object-NameGroup"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12079,25 +12240,25 @@ <property name="action_name">.uno:NameGroup</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="GroupB26"> + <object class="GtkBox" id="GroupB43"> <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="SectionBottom26"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -12105,10 +12266,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="Object-ToggleObjectBezierMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AVMediaPlayer</property> + <property name="action_name">.uno:AdvancedMode</property> </object> <packing> <property name="expand">False</property> @@ -12123,7 +12284,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom31"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom30"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -12131,7 +12292,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-ToggleObjectRotateMode"> + <object class="GtkToolButton" id="Object-ToggleObjectRotateMode"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ToggleObjectRotateMode</property> @@ -12142,7 +12303,18 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-FlipVertical"> + <object class="GtkToolButton" id="Object-FlipHorizontal"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlipHorizontal</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-FlipVertical"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FlipVertical</property> @@ -12153,10 +12325,21 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-FlipHorizontal"> + <object class="GtkToolButton" id="Object-Shear"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> + <property name="action_name">.uno:Shear</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-CrookSlant"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CrookSlant</property> </object> <packing> <property name="expand">False</property> @@ -12178,7 +12361,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator41"> + <object class="GtkSeparator" id="separator37"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12200,30 +12383,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="first12"> - <property name="width_request">1000</property> + <object class="GtkBox" id="box14"> <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="third3"> <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> @@ -12234,7 +12449,165 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator31"> + <object class="GtkBox" id="box15"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box16"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first16"> + <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="SectionBottom46"> + <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="SectionBottom47"> + <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="separator32"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12248,9 +12621,6 @@ <property name="position">3</property> </packing> </child> - <style> - <class name="priority-3"/> - </style> </object> <packing> <property name="expand">False</property> @@ -12259,13 +12629,14 @@ </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="margin_right">5</property> <property name="vexpand">True</property> <child> - <object class="svtlo-ManagedMenuButton" id="Image-ConvertButton:MenuConvert2"> + <object class="svtlo-ManagedMenuButton" id="Object-ConvertButton:MenuConvert"> <property name="label" translatable="yes" context="drawnotebookbar|ConvertMenuButton">Convert</property> <property name="width_request">70</property> <property name="visible">True</property> @@ -12285,22 +12656,22 @@ </packing> </child> <child> - <object class="GtkBox" id="box12"> + <object class="GtkBox" id="box17"> <property name="visible">True</property> <property name="can_focus">False</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="Align3"> + <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="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-ObjectAlignLeft2"> + <object class="GtkToolButton" id="Object-ObjectAlignLeft"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignLeft</property> @@ -12311,7 +12682,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-AlignCenter2"> + <object class="GtkToolButton" id="Object-AlignCenter"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignCenter</property> @@ -12322,7 +12693,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-ObjectAlignRight2"> + <object class="GtkToolButton" id="Object-ObjectAlignRight"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignRight</property> @@ -12340,13 +12711,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align4"> + <object class="sfxlo-NotebookbarToolBox" id="Align8"> <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="Image-AlignUp2"> + <object class="GtkToolButton" id="Object-AlignUp"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignUp</property> @@ -12357,7 +12728,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-AlignDown2"> + <object class="GtkToolButton" id="Object-AlignDown"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignDown</property> @@ -12368,7 +12739,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-AlignMiddle2"> + <object class="GtkToolButton" id="Object-AlignMiddle"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignMiddle</property> @@ -12400,7 +12771,7 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-6"/> </style> </object> <packing> @@ -12410,23 +12781,23 @@ </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="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="first14"> + <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="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> @@ -12443,13 +12814,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="second5"> + <object class="sfxlo-NotebookbarToolBox" id="second4"> <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> @@ -12466,13 +12837,13 @@ </packing> </child> <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">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> @@ -12489,13 +12860,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> @@ -12519,7 +12890,7 @@ </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-5"/> </style> </object> <packing> @@ -12536,38 +12907,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="GroupB71"> <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="drawnotebookbar|MediaMenuButton">_Media</property> + <object class="svtlo-ManagedMenuButton" id="Object-ObjectButton:MenuObject"> + <property name="label" translatable="yes" context="drawnotebookbar|ObjectMenuButton">_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="SectionBottom25"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom49"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="halign">end</property> @@ -12576,13 +12949,38 @@ <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="valign">center</property> + <property name="action_name">.uno:FormatArea</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <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">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -12609,7 +13007,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator38"> + <object class="GtkSeparator" id="separator88"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -12631,38 +13029,39 @@ </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="drawnotebookbar|MediaLabel">~Media</property> + <property name="label" translatable="yes" context="drawnotebookbar|ObjectLabel">~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">10</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> @@ -12672,7 +13071,7 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Object-NameGroup"> + <object class="GtkToolButton" id="Media-NameGroup"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12680,25 +13079,25 @@ <property name="action_name">.uno:NameGroup</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="GroupB43"> + <object class="GtkBox" id="GroupB26"> <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="SectionBottom26"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom28"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -12706,10 +13105,10 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-ToggleObjectBezierMode"> + <object class="GtkToolButton" id="Media-AVMediaPlayer"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AdvancedMode</property> + <property name="action_name">.uno:AVMediaPlayer</property> </object> <packing> <property name="expand">False</property> @@ -12724,7 +13123,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom30"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom31"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -12732,7 +13131,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-ToggleObjectRotateMode"> + <object class="GtkToolButton" id="Media-ToggleObjectRotateMode"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ToggleObjectRotateMode</property> @@ -12743,18 +13142,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-FlipHorizontal"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Object-FlipVertical"> + <object class="GtkToolButton" id="Media-FlipVertical"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FlipVertical</property> @@ -12765,21 +13153,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-Shear"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Shear</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Object-CrookSlant"> + <object class="GtkToolButton" id="Media-FlipHorizontal"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CrookSlant</property> + <property name="action_name">.uno:FlipHorizontal</property> </object> <packing> <property name="expand">False</property> @@ -12801,7 +13178,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator37"> + <object class="GtkSeparator" id="separator41"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12823,231 +13200,41 @@ </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="box14"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="third3"> - <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> - </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="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> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box15"> + <object class="sfxlo-NotebookbarToolBox" id="first12"> + <property name="width_request">1000</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkBox" id="box16"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="first16"> - <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> + <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="SectionBottom46"> - <property name="width_request">200</property> + <object class="GtkToolButton" id="Media-AVMediaToolBox"> + <property name="width_request">800</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="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="SectionBottom47"> - <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> + <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">1</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">2</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator32"> + <object class="GtkSeparator" id="separator31"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -13061,6 +13248,9 @@ <property name="position">3</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> </object> <packing> <property name="expand">False</property> @@ -13069,14 +13259,13 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Object-Section-ObjectAlign"> + <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="margin_right">5</property> <property name="vexpand">True</property> <child> - <object class="svtlo-ManagedMenuButton" id="Object-ConvertButton:MenuConvert"> + <object class="svtlo-ManagedMenuButton" id="Image-ConvertButton:MenuConvert2"> <property name="label" translatable="yes" context="drawnotebookbar|ConvertMenuButton">Convert</property> <property name="width_request">70</property> <property name="visible">True</property> @@ -13096,22 +13285,22 @@ </packing> </child> <child> - <object class="GtkBox" id="box17"> + <object class="GtkBox" id="box12"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkBox" id="AlignGroup4"> + <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="Align7"> + <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="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-ObjectAlignLeft"> + <object class="GtkToolButton" id="Image-ObjectAlignLeft2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignLeft</property> @@ -13122,7 +13311,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-AlignCenter"> + <object class="GtkToolButton" id="Image-AlignCenter2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignCenter</property> @@ -13133,7 +13322,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-ObjectAlignRight"> + <object class="GtkToolButton" id="Image-ObjectAlignRight2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignRight</property> @@ -13151,13 +13340,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align8"> + <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="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-AlignUp"> + <object class="GtkToolButton" id="Image-AlignUp2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignUp</property> @@ -13168,7 +13357,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-AlignDown"> + <object class="GtkToolButton" id="Image-AlignDown2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignDown</property> @@ -13179,7 +13368,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-AlignMiddle"> + <object class="GtkToolButton" id="Image-AlignMiddle2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignMiddle</property> @@ -13211,7 +13400,7 @@ </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-2"/> </style> </object> <packing> @@ -13221,23 +13410,23 @@ </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="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="first17"> + <object class="sfxlo-NotebookbarToolBox" id="first14"> <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> @@ -13254,13 +13443,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="second4"> + <object class="sfxlo-NotebookbarToolBox" id="second5"> <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> @@ -13277,13 +13466,13 @@ </packing> </child> <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">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> @@ -13300,13 +13489,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> @@ -13330,7 +13519,7 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-1"/> </style> </object> <packing> @@ -13347,40 +13536,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="GroupB71"> + <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-ObjectButton:MenuObject"> - <property name="label" translatable="yes" context="drawnotebookbar|ObjectMenuButton">_Object</property> + <object class="svtlo-ManagedMenuButton" id="media:MenuMedia"> + <property name="label" translatable="yes" context="drawnotebookbar|MediaMenuButton">_Media</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="focus_on_click">False</property> <property name="receives_default">False</property> <property name="halign">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">True</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom49"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom25"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="halign">end</property> @@ -13389,35 +13576,126 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="Object-FormatArea"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:FormatArea</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Object-FormatLine"> + <object class="GtkToolButton" id="Media-TransformDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:FormatLine</property> + <property name="action_name">.uno:TransformDialog</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator38"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="pack_type">end</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="position">11</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="MediaLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="drawnotebookbar|MediaLabel">~Media</property> + <property name="use_underline">True</property> + <style> + <class name="context-Media"/> + </style> + </object> + <packing> + <property name="position">11</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="sfxlo-PriorityHBox" id="FormBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-DropdownBox" id="Form-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="Form-Section"> + <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="Form-FormButton:MenuForm"> + <property name="label" translatable="yes" context="DrawNotebookbar|FormMenuButton">Fo_rm</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">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom63"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">end</property> + <property name="hexpand">True</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="Object-TransformDialog"> + <object class="GtkToolButton" id="FormMenu-FormProperties"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:TransformDialog</property> + <property name="action_name">.uno:FormProperties</property> </object> <packing> <property name="expand">False</property> @@ -13443,11 +13721,11 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="pack_type">end</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator88"> + <object class="GtkSeparator" id="separator25"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -13460,27 +13738,703 @@ <property name="fill">True</property> <property name="padding">5</property> <property name="pack_type">end</property> - <property name="position">3</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-PriorityMergedHBox" id="Form-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="Form-Section-Form1"> + <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">True</property> + <property name="valign">center</property> + <property name="margin_left">5</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="GtkToolButton" id="Form-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">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="GroupB52"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin2"> + <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="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Form-UseWizards"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:UseWizards</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="belowspacing2"> + <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="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Form-GroupBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GroupBox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator11"> + <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">0</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Form-Section-Form"> + <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="GroupB34"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom114"> + <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="Form-FormProperties"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormProperties</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="SectionBottom115"> + <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="Form-ShowFmExplorer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ShowFmExplorer</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="GtkBox" id="GroupB72"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom116"> + <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="Form-TabDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:TabDialog</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="SectionBottom64"> + <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="Form-OpenReadOnly"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:OpenReadOnly</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="GroupB68"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom120"> + <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="Form-ControlProperties"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ControlProperties</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="SectionBottom123"> + <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="Form-AutoControlFocus"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AutoControlFocus</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="separator24"> + <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="Form-Section-Form2"> + <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="GroupB54"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom110"> + <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="Form-Label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Label</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-Edit"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Edit</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-CheckBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CheckBox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-RadioButton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RadioButton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ListBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ListBox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ComboBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ComboBox</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="SectionBottom111"> + <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="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">True</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">True</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">True</property> + </packing> + </child> + <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">True</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">True</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">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="GtkSeparator" id="separator40"> + <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-2"/> + </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-Form3"> + <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="GroupB56"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom112"> + <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="Form-Pushbutton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Pushbutton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-Imagebutton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Imagebutton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ImageControl"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ImageControl</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="SectionBottom113"> + <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="Form-FileControl"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FileControl</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-NavigationBar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NavigationBar</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-Grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Grid</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> + <style> + <class name="priority-1"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> </object> <packing> - <property name="position">10</property> + <property name="position">12</property> </packing> </child> <child type="tab"> - <object class="GtkLabel" id="ObjectLabel"> + <object class="GtkLabel" id="FormLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="drawnotebookbar|ObjectLabel">~Object</property> + <property name="label" translatable="yes" context="DrawNotebookbar|FormLabel">Fo~rm</property> <property name="use_underline">True</property> <style> - <class name="context-Frame"/> - <class name="context-OLE"/> + <class name="context-Form"/> </style> </object> <packing> - <property name="position">10</property> + <property name="position">12</property> <property name="tab_fill">False</property> </packing> </child> @@ -13524,7 +14478,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom63"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom68"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="halign">end</property> @@ -13566,7 +14520,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator11"> + <object class="GtkSeparator" id="separator44"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -13595,7 +14549,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom64"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom70"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -13685,7 +14639,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator24"> + <object class="GtkSeparator" id="separator46"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -13713,7 +14667,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom68"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom72"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -13767,7 +14721,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator25"> + <object class="GtkSeparator" id="separator47"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -13798,7 +14752,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom70"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom73"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -13825,7 +14779,7 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB34"> + <object class="GtkBox" id="GroupB39"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -13922,14 +14876,14 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB39"> + <object class="GtkBox" id="GroupB55"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom72"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom74"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="toolbar_style">icons</property> @@ -14008,7 +14962,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom73"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom75"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="toolbar_style">icons</property> @@ -14125,14 +15079,14 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB54"> + <object class="GtkBox" id="GroupB60"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom74"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom76"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="toolbar_style">icons</property> @@ -14178,7 +15132,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom75"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom77"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="toolbar_style">icons</property> @@ -14262,14 +15216,14 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB56"> + <object class="GtkBox" id="GroupB61"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom77"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom96"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="toolbar_style">icons</property> @@ -14315,7 +15269,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom76"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom99"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="toolbar_style">icons</property> @@ -14386,7 +15340,7 @@ </child> </object> <packing> - <property name="position">11</property> + <property name="position">13</property> </packing> </child> <child type="tab"> @@ -14397,7 +15351,7 @@ <property name="use_underline">True</property> </object> <packing> - <property name="position">11</property> + <property name="position">13</property> <property name="tab_fill">False</property> </packing> </child> diff --git a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui index 2eeb42fb779a..8bb4849471ca 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui @@ -628,6 +628,19 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuEdit-SwitchControlDesignMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SwitchControlDesignMode</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuEdit-separator5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuEdit-PageSetup"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -815,6 +828,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="MenuFormat"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -11681,6 +11854,601 @@ <property name="position">8</property> </packing> </child> + <child> + <object class="sfxlo-PriorityMergedHBox" id="FormContainer"> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-OptionalBox" id="Form-Section-Form"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkSeparator" id="separator55"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="Section14"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom50"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">end</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Form-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> + <child> + <object class="GtkToolButton" id="Form-UseWizards"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:UseWizards</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-GroupBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GroupBox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-OpenReadOnly1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:OpenReadOnly</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="svtlo-ManagedMenuButton" id="Form-FormButton:MenuForm"> + <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|FormButton">Fo_rm</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Form-Section-Property"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkSeparator" id="separator56"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="Section20"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom51"> + <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="Form-FormProperties"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormProperties</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-TabDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:TabDialog</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ControlProperties"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ControlProperties</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="SectionBottom56"> + <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="Form-ShowFmExplorer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ShowFmExplorer</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-OpenReadOnly"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:OpenReadOnly</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-AutoControlFocus"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AutoControlFocus</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">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> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Form-Section-Form1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkSeparator" id="separator58"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="Section43"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom110"> + <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="Form-Label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Label</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-Edit"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Edit</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-CheckBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CheckBox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-RadioButton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RadioButton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ListBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ListBox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ComboBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ComboBox</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="SectionBottom111"> + <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="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">True</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">True</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">True</property> + </packing> + </child> + <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">True</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">True</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">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> + <style> + <class name="priority-2"/> + </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-Form2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkSeparator" id="separator59"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="Section45"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom112"> + <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="Form-Pushbutton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Pushbutton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-Imagebutton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Imagebutton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ImageControl"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ImageControl</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="SectionBottom113"> + <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="Form-FileControl"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FileControl</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-NavigationBar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NavigationBar</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-Grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Grid</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> + <style> + <class name="priority-1"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <style> + <class name="context-Form"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">9</property> + </packing> + </child> </object> <packing> <property name="expand">True</property> diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui index f7cf49d2d304..f6ea9e34e9c6 100644 --- a/sd/uiconfig/simpress/ui/notebookbar.ui +++ b/sd/uiconfig/simpress/ui/notebookbar.ui @@ -513,6 +513,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> @@ -10442,7 +10602,6 @@ </object> <packing> <property name="position">8</property> - <property name="tab_fill">False</property> </packing> </child> <child type="tab"> @@ -11750,6 +11909,7 @@ <class name="context-Draw"/> <class name="context-DrawLine"/> <class name="context-3DObject"/> + <class name="context-MultiObject"/> </style> </object> <packing> @@ -11758,23 +11918,23 @@ </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> @@ -11784,7 +11944,7 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Media-AnimationEffects"> + <object class="GtkToolButton" id="Object-AnimationEffects"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -11792,25 +11952,25 @@ <property name="action_name">.uno:AnimationEffects</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="GroupB45"> + <object class="GtkBox" id="GroupB55"> <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="SectionBottom26"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -11818,10 +11978,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="Object-ToggleObjectBezierMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AVMediaPlayer</property> + <property name="action_name">.uno:AdvancedMode</property> </object> <packing> <property name="expand">False</property> @@ -11836,15 +11996,15 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom31"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom30"> <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="Object-ToggleObjectRotateMode"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ToggleObjectRotateMode</property> @@ -11854,6 +12014,50 @@ <property name="homogeneous">True</property> </packing> </child> + <child> + <object class="GtkToolButton" id="Object-FlipVertical"> + <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="Object-FlipHorizontal"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlipHorizontal</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-Shear"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Shear</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-CrookSlant"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CrookSlant</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -11869,7 +12073,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator41"> + <object class="GtkSeparator" id="separator37"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -11891,30 +12095,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="first6"> - <property name="width_request">1000</property> + <object class="GtkBox" id="box14"> <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="third3"> <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> @@ -11925,7 +12161,165 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator31"> + <object class="GtkBox" id="box15"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box16"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first16"> + <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="SectionBottom46"> + <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="SectionBottom47"> + <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="separator32"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -11939,9 +12333,6 @@ <property name="position">3</property> </packing> </child> - <style> - <class name="priority-3"/> - </style> </object> <packing> <property name="expand">False</property> @@ -11950,13 +12341,13 @@ </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="svtlo-ManagedMenuButton" id="Media-ConvertButton:MenuConvert"> + <object class="svtlo-ManagedMenuButton" id="Object-ConvertButton:MenuConvert"> <property name="label" translatable="yes" context="impressnotebookbar|ConvertMenuButton">Convert</property> <property name="width_request">70</property> <property name="visible">True</property> @@ -11976,23 +12367,23 @@ </packing> </child> <child> - <object class="GtkBox" id="box12"> + <object class="GtkBox" id="box17"> <property name="visible">True</property> <property name="can_focus">False</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="margin_right">5</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align3"> + <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="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> @@ -12003,7 +12394,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> @@ -12014,7 +12405,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> @@ -12032,13 +12423,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align4"> + <object class="sfxlo-NotebookbarToolBox" id="Align8"> <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-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> @@ -12049,7 +12440,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> @@ -12060,7 +12451,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> @@ -12092,7 +12483,7 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-6"/> </style> </object> <packing> @@ -12102,23 +12493,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="first14"> + <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="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> @@ -12135,13 +12527,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="second5"> + <object class="sfxlo-NotebookbarToolBox" id="second4"> <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> @@ -12158,13 +12550,13 @@ </packing> </child> <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">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> @@ -12181,13 +12573,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> @@ -12211,7 +12603,7 @@ </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-5"/> </style> </object> <packing> @@ -12228,38 +12620,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="GroupB71"> <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="impressnotebookbar|MediaMenuButton">_Media</property> + <object class="svtlo-ManagedMenuButton" id="Object-ObjectButton:MenuObject"> + <property name="label" translatable="yes" context="impressnotebookbar|ObjectMenuButton">_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="SectionBottom25"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom49"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="halign">end</property> @@ -12268,13 +12662,38 @@ <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="valign">center</property> + <property name="action_name">.uno:FormatArea</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <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">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -12297,11 +12716,11 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="pack_type">end</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator38"> + <object class="GtkSeparator" id="separator88"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -12323,38 +12742,39 @@ </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="impressnotebookbar|MediaLabel">~Media</property> + <property name="label" translatable="yes" context="impressnotebookbar|ObjectLabel">~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">10</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> @@ -12364,7 +12784,7 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Object-AnimationEffects"> + <object class="GtkToolButton" id="Media-AnimationEffects"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12372,25 +12792,25 @@ <property name="action_name">.uno:AnimationEffects</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="GroupB55"> + <object class="GtkBox" id="GroupB45"> <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="SectionBottom26"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom28"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -12398,10 +12818,10 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-ToggleObjectBezierMode"> + <object class="GtkToolButton" id="Media-AVMediaPlayer"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AdvancedMode</property> + <property name="action_name">.uno:AVMediaPlayer</property> </object> <packing> <property name="expand">False</property> @@ -12416,15 +12836,15 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom30"> + <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="Object-ToggleObjectRotateMode"> + <object class="GtkToolButton" id="Media-ToggleObjectRotateMode"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ToggleObjectRotateMode</property> @@ -12434,50 +12854,6 @@ <property name="homogeneous">True</property> </packing> </child> - <child> - <object class="GtkToolButton" id="Object-FlipVertical"> - <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="Object-FlipHorizontal"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Object-Shear"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Shear</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Object-CrookSlant"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:CrookSlant</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -12493,7 +12869,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator37"> + <object class="GtkSeparator" id="separator41"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12515,231 +12891,41 @@ </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="box14"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="third3"> - <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> - </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="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> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box15"> + <object class="sfxlo-NotebookbarToolBox" id="first6"> + <property name="width_request">1000</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkBox" id="box16"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="first16"> - <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> + <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="SectionBottom46"> - <property name="width_request">200</property> + <object class="GtkToolButton" id="Media-AVMediaToolBox"> + <property name="width_request">800</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="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="SectionBottom47"> - <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> + <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">1</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">2</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator32"> + <object class="GtkSeparator" id="separator31"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12753,6 +12939,9 @@ <property name="position">3</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> </object> <packing> <property name="expand">False</property> @@ -12761,13 +12950,13 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Object-Section-ObjectAlign"> + <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="svtlo-ManagedMenuButton" id="Object-ConvertButton:MenuConvert"> + <object class="svtlo-ManagedMenuButton" id="Media-ConvertButton:MenuConvert"> <property name="label" translatable="yes" context="impressnotebookbar|ConvertMenuButton">Convert</property> <property name="width_request">70</property> <property name="visible">True</property> @@ -12787,23 +12976,23 @@ </packing> </child> <child> - <object class="GtkBox" id="box17"> + <object class="GtkBox" id="box12"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_right">5</property> <child> - <object class="GtkBox" id="AlignGroup4"> + <object class="GtkBox" id="AlignGroup2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_right">5</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align7"> + <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="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-ObjectAlignLeft"> + <object class="GtkToolButton" id="Media-ObjectAlignLeft"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignLeft</property> @@ -12814,7 +13003,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-AlignCenter"> + <object class="GtkToolButton" id="Media-AlignCenter"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignCenter</property> @@ -12825,7 +13014,7 @@ </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> @@ -12843,13 +13032,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align8"> + <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="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> @@ -12860,7 +13049,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> @@ -12871,7 +13060,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> @@ -12903,7 +13092,7 @@ </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-2"/> </style> </object> <packing> @@ -12913,24 +13102,23 @@ </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="first17"> + <object class="sfxlo-NotebookbarToolBox" id="first14"> <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> @@ -12947,13 +13135,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="second4"> + <object class="sfxlo-NotebookbarToolBox" id="second5"> <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> @@ -12970,13 +13158,13 @@ </packing> </child> <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">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> @@ -12993,13 +13181,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> @@ -13023,7 +13211,7 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-1"/> </style> </object> <packing> @@ -13040,40 +13228,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="GroupB71"> + <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-ObjectButton:MenuObject"> - <property name="label" translatable="yes" context="impressnotebookbar|ObjectMenuButton">_Object</property> + <object class="svtlo-ManagedMenuButton" id="media:MenuMedia"> + <property name="label" translatable="yes" context="impressnotebookbar|MediaMenuButton">_Media</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="focus_on_click">False</property> <property name="receives_default">False</property> <property name="halign">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">True</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom49"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom25"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="halign">end</property> @@ -13082,35 +13268,126 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="Object-FormatArea"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:FormatArea</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Object-FormatLine"> + <object class="GtkToolButton" id="Media-TransformDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:FormatLine</property> + <property name="action_name">.uno:TransformDialog</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator38"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="pack_type">end</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="position">11</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="MediaLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="impressnotebookbar|MediaLabel">~Media</property> + <property name="use_underline">True</property> + <style> + <class name="context-Media"/> + </style> + </object> + <packing> + <property name="position">11</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="sfxlo-PriorityHBox" id="FormBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-DropdownBox" id="Form-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="Form-Section"> + <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="Form-FormButton:MenuForm"> + <property name="label" translatable="yes" context="ImpressNotebookbar|FormMenuButton">Fo_rm</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">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom58"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">end</property> + <property name="hexpand">True</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="Object-TransformDialog"> + <object class="GtkToolButton" id="FormMenu-FormProperties"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:TransformDialog</property> + <property name="action_name">.uno:FormProperties</property> </object> <packing> <property name="expand">False</property> @@ -13136,11 +13413,11 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="pack_type">end</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator88"> + <object class="GtkSeparator" id="separator25"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -13153,27 +13430,703 @@ <property name="fill">True</property> <property name="padding">5</property> <property name="pack_type">end</property> - <property name="position">3</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-PriorityMergedHBox" id="Form-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="Form-Section-Form1"> + <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">True</property> + <property name="valign">center</property> + <property name="margin_left">5</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="GtkToolButton" id="Form-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">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="GroupB52"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin2"> + <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="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Form-UseWizards"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:UseWizards</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="belowspacing1"> + <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="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Form-GroupBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GroupBox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator39"> + <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">0</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Form-Section-Form"> + <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="GroupB25"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom114"> + <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="Form-FormProperties"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormProperties</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="SectionBottom115"> + <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="Form-ShowFmExplorer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ShowFmExplorer</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="GtkBox" id="GroupB72"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom116"> + <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="Form-TabDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:TabDialog</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="SectionBottom63"> + <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="Form-OpenReadOnly"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:OpenReadOnly</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="GroupB68"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom120"> + <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="Form-ControlProperties"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ControlProperties</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="SectionBottom123"> + <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="Form-AutoControlFocus"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AutoControlFocus</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="separator42"> + <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="Form-Section-Form2"> + <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="GroupB54"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom110"> + <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="Form-Label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Label</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-Edit"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Edit</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-CheckBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CheckBox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-RadioButton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RadioButton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ListBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ListBox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ComboBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ComboBox</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="SectionBottom111"> + <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="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">True</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">True</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">True</property> + </packing> + </child> + <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">True</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">True</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">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="GtkSeparator" id="separator40"> + <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-2"/> + </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-Form3"> + <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="GroupB56"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom112"> + <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="Form-Pushbutton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Pushbutton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-Imagebutton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Imagebutton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ImageControl"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ImageControl</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="SectionBottom113"> + <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="Form-FileControl"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FileControl</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-NavigationBar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NavigationBar</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-Grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Grid</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> + <style> + <class name="priority-1"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> </object> <packing> - <property name="position">10</property> + <property name="position">12</property> </packing> </child> <child type="tab"> - <object class="GtkLabel" id="ObjectLabel"> + <object class="GtkLabel" id="FormLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="impressnotebookbar|ObjectLabel">~Object</property> + <property name="label" translatable="yes" context="ImpressNotebookbar|FormLabel">Fo~rm</property> <property name="use_underline">True</property> <style> - <class name="context-Frame"/> - <class name="context-OLE"/> + <class name="context-Form"/> </style> </object> <packing> - <property name="position">10</property> + <property name="position">12</property> <property name="tab_fill">False</property> </packing> </child> @@ -13215,7 +14168,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom58"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom64"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="halign">end</property> @@ -13257,7 +14210,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator25"> + <object class="GtkSeparator" id="separator23"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -13286,7 +14239,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom63"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom68"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -13404,7 +14357,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom64"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom70"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -13431,7 +14384,7 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB52"> + <object class="GtkBox" id="GroupB50"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -13528,7 +14481,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom68"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom72"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -13555,7 +14508,7 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB50"> + <object class="GtkBox" id="GroupB60"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -13652,14 +14605,14 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB54"> + <object class="GtkBox" id="GroupB61"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom70"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom73"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="toolbar_style">icons</property> @@ -13738,7 +14691,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom72"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom74"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="toolbar_style">icons</property> @@ -13855,14 +14808,14 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB56"> + <object class="GtkBox" id="GroupB65"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom73"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom75"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="toolbar_style">icons</property> @@ -13908,7 +14861,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom74"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom77"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="toolbar_style">icons</property> @@ -13992,14 +14945,14 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB65"> + <object class="GtkBox" id="GroupB69"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom77"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom93"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="toolbar_style">icons</property> @@ -14045,7 +14998,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom75"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom95"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="toolbar_style">icons</property> @@ -14116,7 +15069,7 @@ </child> </object> <packing> - <property name="position">11</property> + <property name="position">13</property> </packing> </child> <child type="tab"> @@ -14127,7 +15080,7 @@ <property name="use_underline">True</property> </object> <packing> - <property name="position">11</property> + <property name="position">13</property> <property name="tab_fill">False</property> </packing> </child> diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui index 5d2b7c9e591a..a8359670f70b 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui @@ -628,6 +628,19 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuEdit-SwitchControlDesignMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SwitchControlDesignMode</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuEdit-separator5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuEdit-PageSetup"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -815,6 +828,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="MenuFormat"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -11888,6 +12061,601 @@ <property name="position">8</property> </packing> </child> + <child> + <object class="sfxlo-PriorityMergedHBox" id="FormContainer"> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-OptionalBox" id="Form-Section-Form"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkSeparator" id="separator56"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="Section43"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom50"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">end</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Form-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> + <child> + <object class="GtkToolButton" id="Form-UseWizards"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:UseWizards</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-GroupBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GroupBox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-OpenReadOnly1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:OpenReadOnly</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="svtlo-ManagedMenuButton" id="Form-FormButton:MenuForm"> + <property name="label" translatable="yes" context="impress_notebookbar_groupedbar_compact|FormButton">Fo_rm</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Form-Section-Property"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkSeparator" id="separator58"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="Section45"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom51"> + <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="Form-FormProperties"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormProperties</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-TabDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:TabDialog</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ControlProperties"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ControlProperties</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="SectionBottom56"> + <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="Form-ShowFmExplorer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ShowFmExplorer</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-OpenReadOnly"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:OpenReadOnly</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-AutoControlFocus"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AutoControlFocus</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">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> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Form-Section-Form1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkSeparator" id="separator59"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="Section46"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom110"> + <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="Form-Label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Label</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-Edit"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Edit</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-CheckBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CheckBox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-RadioButton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RadioButton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ListBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ListBox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ComboBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ComboBox</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="SectionBottom111"> + <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="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">True</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">True</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">True</property> + </packing> + </child> + <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">True</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">True</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">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> + <style> + <class name="priority-2"/> + </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-Form2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkSeparator" id="separator62"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="Section47"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom112"> + <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="Form-Pushbutton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Pushbutton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-Imagebutton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Imagebutton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ImageControl"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ImageControl</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="SectionBottom113"> + <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="Form-FileControl"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FileControl</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-NavigationBar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NavigationBar</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-Grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Grid</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> + <style> + <class name="priority-1"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <style> + <class name="context-Form"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">9</property> + </packing> + </child> </object> <packing> <property name="expand">True</property> diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui index 746b0996236a..f2d5ae0626ea 100644 --- a/sw/uiconfig/swriter/ui/notebookbar.ui +++ b/sw/uiconfig/swriter/ui/notebookbar.ui @@ -242,6 +242,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> @@ -12191,7 +12351,8 @@ <style> <class name="context-Draw"/> <class name="context-DrawLine"/> - <class name="context-ThreeDObject"/> + <class name="context-3DObject"/> + <class name="context-MultiObject"/> </style> </object> <packing> @@ -12200,131 +12361,301 @@ </packing> </child> <child> - <object class="sfxlo-PriorityHBox" id="PrintBox"> + <object class="sfxlo-PriorityHBox" id="ObjectBox"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="Print-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="Print-Section-ShowPageGroup"> + <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="first22"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom26"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> + <property name="margin_left">5</property> <property name="vexpand">True</property> - <property name="resize_mode">immediate</property> <property name="toolbar_style">both</property> <property name="show_arrow">False</property> + <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Print-ShowSinglePage"> + <object class="GtkToolButton" id="Object-InsertCaptionDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ShowSinglePage</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="action_name">.uno:InsertCaptionDialog</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> </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="first21"> + <object class="GtkBox" id="GroupB55"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="resize_mode">immediate</property> - <property name="toolbar_style">both</property> - <property name="show_arrow">False</property> + <property name="orientation">vertical</property> <child> - <object class="GtkMenuToolButton" id="Print-ShowMultiplePages"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom54"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> - <property name="action_name">.uno:ShowMultiplePages</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-ChainFrames"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ChainFrames</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom57"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-UnhainFrames"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:UnhainFrames</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">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkBox" id="box11"> + <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">3</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-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="GtkBox" id="box14"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first4"> + <object class="sfxlo-NotebookbarToolBox" id="third4"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="resize_mode">immediate</property> - <property name="toolbar_style">both-horiz</property> + <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Print-ShowTwoPages"> + <object class="GtkToolButton" id="Object-BorderDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ShowTwoPages</property> + <property name="action_name">.uno:BorderDialog</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> <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="second9"> + <object class="sfxlo-NotebookbarToolBox" id="third5"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="resize_mode">immediate</property> - <property name="toolbar_style">both-horiz</property> + <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Print-ShowBookview"> + <object class="GtkToolButton" id="Object-FormatArea"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ShowBookview</property> + <property name="action_name">.uno:FormatArea</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">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box15"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box16"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first16"> + <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-SetBorderStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:SetBorderStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-LineStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineStyle</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom60"> + <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-FrameLineColor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FrameLineColor</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="SectionBottom61"> + <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">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -12336,7 +12667,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator74"> + <object class="GtkSeparator" id="separator32"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12347,113 +12678,130 @@ <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> + </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> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom30"> + <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> <style> - <class name="priority-1"/> + <class name="priority-4"/> </style> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="fill">True</property> + <property name="position">3</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Print-Section-Arrange"> + <object class="sfxlo-OptionalBox" id="Object-Section-Wrap"> <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="box4"> + <object class="GtkBox" id="WrapGroup3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first6"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap9"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="resize_mode">immediate</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Print-GoToStartOfDoc"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:GoToStartOfDoc</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Print-PageUp"> + <object class="GtkToolButton" id="Object-WrapOff"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:PageUp</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="Print-JumpToSpecificPage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:JumpToSpecificPage</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> - <object class="GtkToolButton" id="Print-PageDown"> + <object class="GtkToolButton" id="Object-WrapOn"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:PageDown</property> + <property name="action_name">.uno:WrapOn</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> - <object class="GtkToolButton" id="Print-GoToEndOfDoc"> + <object class="GtkToolButton" id="Object-WrapIdeal"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:GoToEndOfDoc</property> + <property name="action_name">.uno:WrapIdeal</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="second7"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap10"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="resize_mode">immediate</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Print-ZoomMinus"> + <object class="GtkToolButton" id="Object-WrapLeft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ZoomMinus</property> + <property name="action_name">.uno:WrapLeft</property> </object> <packing> <property name="expand">False</property> @@ -12461,21 +12809,21 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Print-PreviewZoom"> + <object class="GtkToolButton" id="Object-WrapThrough"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:PreviewZoom</property> + <property name="action_name">.uno:WrapThrough</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="Print-ZoomPlus"> + <object class="GtkToolButton" id="Object-WrapRight"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ZoomPlus</property> + <property name="action_name">.uno:WrapRight</property> </object> <packing> <property name="expand">False</property> @@ -12485,7 +12833,7 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -12497,93 +12845,324 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator1"> + <object class="GtkBox" id="WrapGroup6"> <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> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Wrap11"> + <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="Object-ContourDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ContourDialog</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="Wrap12"> + <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="Object-TextWrap"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:TextWrap</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="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">False</property> - <property name="position">1</property> + <property name="fill">True</property> + <property name="position">4</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Print-Section-Print"> + <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="margin_right">5</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first3"> + <object class="GtkBox" id="box8"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="resize_mode">immediate</property> - <property name="toolbar_style">both</property> - <property name="show_arrow">False</property> + <property name="can_focus">False</property> <child> - <object class="GtkToolButton" id="Print-Print"> + <object class="GtkBox" id="AlignGroup2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Print</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align1"> + <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-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="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-ObjectAlignRight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignRight</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align2"> + <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-AlignUp"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignUp</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-AlignDown"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignDown</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-AlignMiddle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignMiddle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">5</property> - <property name="position">0</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">5</property> + </packing> + </child> + <child> + <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="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first19"> + <object class="GtkGrid" id="grid5"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="resize_mode">immediate</property> - <property name="toolbar_style">both</property> - <property name="show_arrow">False</property> + <property name="can_focus">False</property> <child> - <object class="GtkToolButton" id="Print-ClosePreview1"> + <object class="sfxlo-NotebookbarToolBox" id="first17"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ClosePreview</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"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BringToFront</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="second6"> + <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"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SendToBack</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first18"> + <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"> + <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="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Second4"> + <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"> + <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> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> + <style> + <class name="priority-1"/> + </style> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> + <property name="fill">True</property> + <property name="position">6</property> </packing> </child> </object> @@ -12594,50 +13173,53 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="Print-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="GroupB78"> + <object class="GtkBox" id="GroupB71"> <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="print:MenuPrint"> - <property name="label" translatable="yes" context="WriterNotebookbar|PrintMenuButton">_Print</property> + <object class="svtlo-ManagedMenuButton" id="Object-ObjectButton:MenuObject"> + <property name="label" translatable="yes" context="WriterNotebookbar|ObjectMenuButton">_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="SectionBottom79"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom86"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="halign">end</property> <property name="hexpand">True</property> - <property name="toolbar_style">both-horiz</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="Print-FullScreen"> + <object class="GtkToolButton" id="Object-FrameDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FullScreen</property> + <property name="valign">center</property> + <property name="action_name">.uno:FrameDialog</property> </object> <packing> <property name="expand">True</property> @@ -12667,7 +13249,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator114"> + <object class="GtkSeparator" id="separator88"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -12689,17 +13271,18 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="PrintLabel"> + <object class="GtkLabel" id="ObjectLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="WriterNotebookbar|PrintLabel">~Print</property> + <property name="label" translatable="yes" context="WriterNotebookbar|ObjectLabel">~Object</property> <property name="use_underline">True</property> <style> - <class name="context-Printpreview"/> + <class name="context-Frame"/> + <class name="context-OLE"/> </style> </object> <packing> - <property name="position">12</property> + <property name="position">10</property> <property name="tab_fill">False</property> </packing> </child> @@ -13503,7 +14086,7 @@ </child> </object> <packing> - <property name="position">10</property> + <property name="position">11</property> </packing> </child> <child type="tab"> @@ -13517,75 +14100,101 @@ </style> </object> <packing> - <property name="position">12</property> + <property name="position">11</property> <property name="tab_fill">False</property> </packing> </child> <child> - <object class="sfxlo-PriorityHBox" id="ObjectBox"> + <object class="sfxlo-PriorityHBox" id="PrintBox"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="Object-Container"> + <object class="sfxlo-PriorityMergedHBox" id="Print-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="Print-Section-ShowPageGroup"> <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="first22"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> - <property name="margin_left">5</property> <property name="vexpand">True</property> + <property name="resize_mode">immediate</property> <property name="toolbar_style">both</property> <property name="show_arrow">False</property> - <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Object-InsertCaptionDialog"> + <object class="GtkToolButton" id="Print-ShowSinglePage"> <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:InsertCaptionDialog</property> + <property name="action_name">.uno:ShowSinglePage</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="fill">False</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="GroupB55"> + <object class="sfxlo-NotebookbarToolBox" id="first21"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="valign">center</property> - <property name="orientation">vertical</property> + <property name="vexpand">True</property> + <property name="resize_mode">immediate</property> + <property name="toolbar_style">both</property> + <property name="show_arrow">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom54"> + <object class="GtkMenuToolButton" id="Print-ShowMultiplePages"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> + <property name="action_name">.uno:ShowMultiplePages</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first4"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="resize_mode">immediate</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-ChainFrames"> + <object class="GtkToolButton" id="Print-ShowTwoPages"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ChainFrames</property> + <property name="action_name">.uno:ShowTwoPages</property> </object> <packing> <property name="expand">False</property> @@ -13595,23 +14204,22 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom57"> + <object class="sfxlo-NotebookbarToolBox" id="second9"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> + <property name="can_focus">True</property> + <property name="resize_mode">immediate</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-UnhainFrames"> + <object class="GtkToolButton" id="Print-ShowBookview"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:UnhainFrames</property> + <property name="action_name">.uno:ShowBookview</property> </object> <packing> <property name="expand">False</property> @@ -13621,7 +14229,7 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> @@ -13629,11 +14237,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="separator37"> + <object class="GtkSeparator" id="separator74"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -13647,176 +14255,142 @@ <property name="position">3</property> </packing> </child> + <style> + <class name="priority-1"/> + </style> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Object-Section-FormatLineArea"> + <object class="sfxlo-OptionalBox" id="Print-Section-Arrange"> <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="box14"> + <object class="GtkBox" id="box4"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="third4"> + <object class="sfxlo-NotebookbarToolBox" id="first6"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="toolbar_style">text</property> + <property name="resize_mode">immediate</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-BorderDialog"> + <object class="GtkToolButton" id="Print-GoToStartOfDoc"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BorderDialog</property> + <property name="action_name">.uno:GoToStartOfDoc</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="third5"> - <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="Object-FormatArea"> + <object class="GtkToolButton" id="Print-PageUp"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatArea</property> + <property name="action_name">.uno:PageUp</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">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box15"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkBox" id="box16"> - <property name="visible">True</property> - <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first16"> + <object class="GtkToolButton" id="Print-JumpToSpecificPage"> <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-SetBorderStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:SetBorderStyle</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Object-LineStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:LineStyle</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="can_focus">False</property> + <property name="action_name">.uno:JumpToSpecificPage</property> </object> <packing> <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom60"> + <object class="GtkToolButton" id="Print-PageDown"> <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-FrameLineColor"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FrameLineColor</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="can_focus">False</property> + <property name="action_name">.uno:PageDown</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Print-GoToEndOfDoc"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GoToEndOfDoc</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="fill">False</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom61"> + <object class="sfxlo-NotebookbarToolBox" id="second7"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> + <property name="can_focus">True</property> + <property name="resize_mode">immediate</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-FillStyle"> + <object class="GtkToolButton" id="Print-ZoomMinus"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FillStyle</property> + <property name="action_name">.uno:ZoomMinus</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Print-PreviewZoom"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PreviewZoom</property> </object> <packing> <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> + <child> + <object class="GtkToolButton" id="Print-ZoomPlus"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ZoomPlus</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="fill">False</property> <property name="position">1</property> </packing> </child> @@ -13824,11 +14398,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator32"> + <object class="GtkSeparator" id="separator1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -13839,110 +14413,453 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">4</property> + <property name="position">2</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Object-Section-Anchor"> + <object class="sfxlo-OptionalBox" id="Print-Section-Print"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> - <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom30"> + <object class="sfxlo-NotebookbarToolBox" id="first3"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> <property name="vexpand">True</property> + <property name="resize_mode">immediate</property> <property name="toolbar_style">both</property> <property name="show_arrow">False</property> - <property name="icon_size">3</property> <child> - <object class="GtkMenuToolButton" id="Object-Anchor"> + <object class="GtkToolButton" id="Print-Print"> <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:Print</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">False</property> + <property name="padding">5</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="valign">center</property> + <property name="vexpand">True</property> + <property name="resize_mode">immediate</property> + <property name="toolbar_style">both</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Print-ClosePreview1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ClosePreview</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-DropdownBox" id="Print-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"> + <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="print:MenuPrint"> + <property name="label" translatable="yes" context="WriterNotebookbar|PrintMenuButton">_Print</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">False</property> + <property name="halign">end</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom79"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">end</property> + <property name="hexpand">True</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <property name="icon_size">1</property> + <child> + <object class="GtkToolButton" id="Print-FullScreen"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FullScreen</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator114"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="pack_type">end</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="position">12</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="PrintLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="WriterNotebookbar|PrintLabel">~Print</property> + <property name="use_underline">True</property> + <style> + <class name="context-Printpreview"/> + </style> + </object> + <packing> + <property name="position">12</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="sfxlo-PriorityHBox" id="FormBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-DropdownBox" id="Form-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="Form-Section"> + <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="Form-FormButton:MenuForm"> + <property name="label" translatable="yes" context="WriterNotebookbar|FormMenuButton">Fo_rm</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">True</property> <property name="position">0</property> </packing> </child> - <style> - <class name="priority-4"/> - </style> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom97"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">end</property> + <property name="hexpand">True</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <property name="icon_size">1</property> + <child> + <object class="GtkToolButton" id="FormMenu-FormProperties"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormProperties</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">2</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="GtkSeparator" id="separator25"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-PriorityMergedHBox" id="Form-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-Wrap"> + <object class="sfxlo-OptionalBox" id="Form-Section-Form1"> <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="WrapGroup3"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom109"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="margin_left">5</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="GtkToolButton" id="Form-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">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="GroupB52"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap9"> + <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin10"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="toolbar_style">icons</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-WrapOff"> + <object class="GtkToolButton" id="Form-UseWizards"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WrapOff</property> + <property name="action_name">.uno:UseWizards</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">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="belowspacing11"> + <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="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-WrapOn"> + <object class="GtkToolButton" id="Form-GroupBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WrapOn</property> + <property name="action_name">.uno:GroupBox</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">False</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="GtkSeparator" id="separator39"> + <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">0</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Form-Section-Form"> + <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="GroupB59"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom114"> + <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-WrapIdeal"> + <object class="GtkToolButton" id="Form-FormProperties"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WrapIdeal</property> + <property name="action_name">.uno:FormProperties</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -13953,38 +14870,78 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap10"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom115"> <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="Object-WrapLeft"> + <object class="GtkToolButton" id="Form-ShowFmExplorer"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WrapLeft</property> + <property name="action_name">.uno:ShowFmExplorer</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="GtkBox" id="GroupB72"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom116"> + <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-WrapThrough"> + <object class="GtkToolButton" id="Form-TabDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WrapThrough</property> + <property name="action_name">.uno:TabDialog</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="SectionBottom98"> + <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-WrapRight"> + <object class="GtkToolButton" id="Form-OpenReadOnly"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WrapRight</property> + <property name="action_name">.uno:OpenReadOnly</property> </object> <packing> <property name="expand">False</property> @@ -14002,29 +14959,31 @@ <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="WrapGroup6"> + <object class="GtkBox" id="GroupB68"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap11"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom120"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="toolbar_style">text</property> + <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-ContourDialog"> + <object class="GtkToolButton" id="Form-ControlProperties"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ContourDialog</property> + <property name="action_name">.uno:ControlProperties</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -14035,20 +14994,20 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap12"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom123"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="toolbar_style">text</property> + <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-TextWrap"> + <object class="GtkToolButton" id="Form-AutoControlFocus"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:TextWrap</property> + <property name="action_name">.uno:AutoControlFocus</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -14062,7 +15021,22 @@ <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="separator42"> + <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> @@ -14072,115 +15046,92 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">1</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Object-Section-ObjectAlign"> + <object class="sfxlo-OptionalBox" id="Form-Section-Form2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_right">5</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="box8"> + <object class="GtkBox" id="GroupB54"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="AlignGroup2"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom110"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <property name="can_focus">True</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align1"> + <object class="GtkToolButton" id="Form-Label"> <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-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="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Object-ObjectAlignRight"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectAlignRight</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="can_focus">False</property> + <property name="action_name">.uno:Label</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align2"> + <object class="GtkToolButton" id="Form-Edit"> <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-AlignUp"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AlignUp</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Object-AlignDown"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AlignDown</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Object-AlignMiddle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AlignMiddle</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="can_focus">False</property> + <property name="action_name">.uno:Edit</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-CheckBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CheckBox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-RadioButton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RadioButton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ListBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ListBox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ComboBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ComboBox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -14190,10 +15141,104 @@ <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">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">True</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">True</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">True</property> + </packing> + </child> + <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">True</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">True</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">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="GtkSeparator" id="separator40"> + <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> @@ -14204,30 +15249,55 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">2</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Object-Section-Arrange"> + <object class="sfxlo-OptionalBox" id="Form-Section-Form3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkGrid" id="grid5"> + <object class="GtkBox" id="GroupB56"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first17"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom112"> <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="Form-Pushbutton"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BringToFront</property> + <property name="action_name">.uno:Pushbutton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-Imagebutton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Imagebutton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ImageControl"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ImageControl</property> </object> <packing> <property name="expand">False</property> @@ -14236,67 +15306,44 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="second6"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom113"> <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="Form-FileControl"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SendToBack</property> + <property name="action_name">.uno:FileControl</property> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="first18"> - <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="Form-NavigationBar"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> + <property name="action_name">.uno:NavigationBar</property> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="Second4"> - <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="Form-Grid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> + <property name="action_name">.uno:Grid</property> </object> <packing> <property name="expand">False</property> @@ -14305,8 +15352,9 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> @@ -14323,127 +15371,33 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">3</property> </packing> </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-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="GroupB71"> - <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-ObjectButton:MenuObject"> - <property name="label" translatable="yes" context="WriterNotebookbar|ObjectMenuButton">_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">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom86"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">end</property> - <property name="hexpand">True</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <property name="icon_size">1</property> - <child> - <object class="GtkToolButton" id="Object-FrameDialog"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:FrameDialog</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <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> - <property name="pack_type">end</property> <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator88"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="pack_type">end</property> - <property name="position">3</property> - </packing> - </child> </object> <packing> - <property name="position">10</property> + <property name="position">13</property> </packing> </child> <child type="tab"> - <object class="GtkLabel" id="ObjectLabel"> + <object class="GtkLabel" id="FormLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="WriterNotebookbar|ObjectLabel">~Object</property> + <property name="label" translatable="yes" context="WriterNotebookbar|FormLabel">Fo~rm</property> <property name="use_underline">True</property> <style> - <class name="context-Frame"/> - <class name="context-OLE"/> + <class name="context-Form"/> </style> </object> <packing> - <property name="position">10</property> + <property name="position">13</property> <property name="tab_fill">False</property> </packing> </child> @@ -15385,7 +16339,7 @@ </child> </object> <packing> - <property name="position">11</property> + <property name="position">14</property> </packing> </child> <child type="tab"> @@ -15396,7 +16350,7 @@ <property name="use_underline">True</property> </object> <packing> - <property name="position">11</property> + <property name="position">14</property> <property name="tab_fill">False</property> </packing> </child> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui index 7055e0c099a1..e14188c9c99d 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui @@ -810,6 +810,19 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuEdit-SwitchControlDesignMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SwitchControlDesignMode</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuEdit-separator5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuEdit-PageDialog"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -997,6 +1010,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="MenuFormat"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -3244,21 +3417,6 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator122"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">5</property> - <property name="pack_type">end</property> - <property name="position">2</property> - </packing> - </child> - <child> <object class="sfxlo-DropdownBox" id="ClipboardSection"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -3369,7 +3527,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> @@ -7126,7 +7284,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> @@ -8212,7 +8370,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> @@ -9044,7 +9202,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> @@ -9560,7 +9718,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> @@ -10124,7 +10282,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> @@ -10722,6 +10880,601 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="sfxlo-PriorityMergedHBox" id="FormContainer"> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-OptionalBox" id="Form-Section-Form"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkSeparator" id="separator9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="Section16"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom50"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">end</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Form-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> + <child> + <object class="GtkToolButton" id="Form-UseWizards"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:UseWizards</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-GroupBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GroupBox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-OpenReadOnly1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:OpenReadOnly</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="svtlo-ManagedMenuButton" id="Form-FormButton:MenuForm"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|FormButton">Fo_rm</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Form-Section-Property"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkSeparator" id="separator12"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="Section36"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom51"> + <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="Form-FormProperties"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormProperties</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-TabDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:TabDialog</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ControlProperties"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ControlProperties</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="SectionBottom56"> + <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="Form-ShowFmExplorer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ShowFmExplorer</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-OpenReadOnly"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:OpenReadOnly</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-AutoControlFocus"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AutoControlFocus</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">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> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Form-Section-Form1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</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="GtkBox" id="Section37"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom110"> + <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="Form-Label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Label</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-Edit"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Edit</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-CheckBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CheckBox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-RadioButton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RadioButton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ListBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ListBox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ComboBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ComboBox</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="SectionBottom111"> + <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="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">True</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">True</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">True</property> + </packing> + </child> + <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">True</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">True</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">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> + <style> + <class name="priority-2"/> + </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-Form2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkSeparator" id="separator35"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="Section38"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom112"> + <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="Form-Pushbutton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Pushbutton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-Imagebutton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Imagebutton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-ImageControl"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ImageControl</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="SectionBottom113"> + <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="Form-FileControl"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FileControl</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-NavigationBar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NavigationBar</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-Grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Grid</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> + <style> + <class name="priority-1"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <style> + <class name="context-Form"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">8</property> </packing> </child> @@ -10729,6 +11482,21 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator122"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</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">4</property> </packing> </child> |