diff options
| author | andreas kainz <kainz.a@gmail.com> | 2018-10-16 23:46:55 +0200 |
|---|---|---|
| committer | andreas_kainz <kainz.a@gmail.com> | 2018-10-17 00:58:30 +0200 |
| commit | d92319d2ffeaa65e31f923e0e9c7328b8d7c97bf (patch) | |
| tree | 641a0c7b916cb00dd317c94068f165d6c7023152 | |
| parent | 9672d034b9e760f24ac9a6652ab45dee15ee260a (diff) | |
Notebookbar: update calc tabbed notebookbar
Add Printpreview, Object, Media,
Update Image, Draw
Context tab
Change-Id: I4433ba838ca734f2214679f9bdfa50427edfcc71
Reviewed-on: https://gerrit.libreoffice.org/61856
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
| -rw-r--r-- | sc/uiconfig/scalc/ui/notebookbar.ui | 2230 |
1 files changed, 1470 insertions, 760 deletions
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui index 2564260cbf86..a1c5cecedee6 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -995,7 +995,7 @@ <object class="GtkMenuItem" id="MenuImage-FitCellSize"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:OriginalSize</property> + <property name="action_name">.uno:FitCellSize</property> </object> </child> <child> @@ -1012,10 +1012,10 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuImage-NameGroup"> + <object class="GtkMenuItem" id="MenuImage-RenameObject"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:NameGroup</property> + <property name="action_name">.uno:RenameObject</property> </object> </child> <child> @@ -1186,6 +1186,37 @@ </object> </child> </object> + <object class="GtkMenu" id="MenuMedia"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="MenuMedia-AVMediaPlayer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AVMediaPlayer</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuMedia-separator1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuMedia-RenameObject"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RenameObject</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuMedia-ObjectTitleDescription"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectTitleDescription</property> + </object> + </child> + </object> <object class="GtkMenu" id="MenuPage"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1291,6 +1322,57 @@ </object> </child> </object> + <object class="GtkMenu" id="MenuPrint"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="MenuPrint-PreviousPage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PreviousPage</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuPrint-NextPage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NextPage</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuPrint-separator1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuPrint-PageFormatDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PageFormatDialog</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuPrint-separator2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuPrint-Print"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Print</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuPrint-ClosePreview"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ClosePreview</property> + </object> + </child> + </object> <object class="GtkMenu" id="MenuReview"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -8952,6 +9034,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="margin_left">5</property> <property name="vexpand">True</property> <property name="toolbar_style">both</property> <property name="show_arrow">False</property> @@ -9935,13 +10018,13 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="EditGroup"> + <object class="sfxlo-OptionalBox" id="Draw-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="SectionBottom46"> + <object class="sfxlo-NotebookbarToolBox" id="Big1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -9951,21 +10034,23 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Draw-ObjectTitleDescription"> + <object class="GtkToolButton" id="Draw-AssignMacro"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectTitleDescription</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="action_name">.uno:AssignMacro</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> @@ -9975,26 +10060,15 @@ <property name="valign">center</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom71"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom43"> <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">icons</property> + <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-ToggleObjectRotateMode"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectRotateMode</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Draw-ToggleObjectBezierMode"> + <object class="GtkToolButton" id="Draw-ToggleObjectBezierMode1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ToggleObjectBezierMode</property> @@ -10012,7 +10086,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom49"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom44"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -10020,6 +10094,17 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> + <object class="GtkToolButton" id="Draw-ToggleObjectRotateMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ToggleObjectRotateMode</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> <object class="GtkToolButton" id="Draw-FlipVertical"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -10052,11 +10137,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="separator66"> + <object class="GtkSeparator" id="separator46"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10078,30 +10163,27 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="TextGroup"> + <object class="sfxlo-OptionalBox" id="Draw-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="GroupB60"> + <object class="GtkBox" id="box59"> <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="SectionBottom43"> + <object class="sfxlo-NotebookbarToolBox" id="third10"> <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="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-DrawText"> + <object class="GtkToolButton" id="Draw-FormatLine2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DrawText</property> + <property name="action_name">.uno:FormatLine</property> </object> <packing> <property name="expand">True</property> @@ -10116,18 +10198,16 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom44"> + <object class="sfxlo-NotebookbarToolBox" id="third13"> <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">icons</property> + <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-AssignMacro"> + <object class="GtkToolButton" id="Draw-FormatArea2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AssignMacro</property> + <property name="action_name">.uno:FormatArea</property> </object> <packing> <property name="expand">True</property> @@ -10145,90 +10225,66 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator76"> - <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> + <property name="position">0</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="EditGroup1"> - <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="box72"> + <object class="GtkBox" id="box56"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="shapes2"> + <object class="GtkBox" id="box4"> <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="Draw-Line"> + <object class="sfxlo-NotebookbarToolBox" id="first8"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Line</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Draw-Polygon_Unfilled"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Polygon_Unfilled</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Draw-Bezier_Unfilled"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Bezier_Unfilled</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Draw-XLineStyle"> + <property name="width_request">100</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:XLineStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkToolButton" id="Draw-ArrowsToolbox"> + <object class="sfxlo-NotebookbarToolBox" id="first9"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ArrowsToolbox</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-XLineColor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:XLineColor</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> @@ -10239,55 +10295,23 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="shapes4"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom50"> + <property name="width_request">200</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">icons</property> + <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-BasicShapes.rectangle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BasicShapes.rectangle</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Draw-BasicShapes.ellipse"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BasicShapes.ellipse</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Draw-DrawCaption"> + <object class="GtkToolButton" id="Draw-FillStyle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DrawCaption</property> + <property name="action_name">.uno:FillStyle</property> </object> <packing> <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> - <child> - <object class="GtkToolButton" id="Draw-LineToolbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:LineToolbox</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -10303,169 +10327,21 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator130"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box73"> + <object class="GtkBox" id="box12"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="shapes5"> + <object class="sfxlo-NotebookbarToolBox" id="first13"> <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="Draw-BasicShapes"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BasicShapes</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Draw-SymbolShapes"> + <object class="GtkToolButton" id="Draw-LineEndStyle2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SymbolShapes</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Draw-ArrowShapes"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ArrowShapes</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="shapes7"> - <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="Draw-StarShapes"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:StarShapes</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Draw-CalloutShapes"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:CalloutShapes</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Draw-FlowChartShapes"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FlowChartShapes</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator70"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="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">4</property> - </packing> - </child> - <style> - <class name="priority-5"/> - </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="StyleGroup"> - <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="box59"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="third10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="toolbar_style">text</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Draw-FormatLine3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FormatLine</property> + <property name="action_name">.uno:LineEndStyle</property> </object> <packing> <property name="expand">True</property> @@ -10480,126 +10356,26 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="third13"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="toolbar_style">text</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="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="box56"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="first41"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom46"> <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="Draw-LineEndStyle"> + <object class="GtkToolButton" id="Draw-FillShadow"> <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> - <child> - <object class="GtkMenuToolButton" id="Draw-XLineStyle"> - <property name="width_request">100</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:XLineStyle</property> + <property name="action_name">.uno:FillShadow</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Draw-XLineColor"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:XLineColor</property> - </object> - <packing> - <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> - <child> - <object class="GtkMenuToolButton" id="Draw-LineWidth"> - <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:LineWidth</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="SectionBottom50"> - <property name="width_request">200</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="hexpand">False</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Draw-FillStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FillStyle</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -10607,7 +10383,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> @@ -10625,24 +10401,21 @@ <property name="position">3</property> </packing> </child> - <style> - <class name="priority-4"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ArrangeSection2"> + <object class="sfxlo-OptionalBox" id="Draw-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="SectionBottom47"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom49"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -10651,7 +10424,7 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkMenuToolButton" id="Draw-AnchorMenu"> + <object class="GtkMenuToolButton" id="Image-AnchorMenu1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -10671,23 +10444,10 @@ </packing> </child> <child> - <object class="GtkBox" id="box4"> + <object class="GtkBox" id="box14"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator69"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">1</property> - </packing> - </child> - <child> <object class="GtkBox" id="AlignGroup1"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -10699,7 +10459,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-ObjectAlignLeft"> + <object class="GtkToolButton" id="Image-ObjectAlignLeft1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignLeft</property> @@ -10710,7 +10470,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-AlignCenter"> + <object class="GtkToolButton" id="Image-AlignCenter1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignCenter</property> @@ -10721,7 +10481,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-ObjectAlignRight"> + <object class="GtkToolButton" id="Image-ObjectAlignRight1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignRight</property> @@ -10745,7 +10505,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-AlignUp"> + <object class="GtkToolButton" id="Image-AlignUp1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignUp</property> @@ -10756,10 +10516,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-AlignMiddle"> + <object class="GtkToolButton" id="Image-AlignDown1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignMiddle</property> + <property name="action_name">.uno:AlignDown</property> </object> <packing> <property name="expand">False</property> @@ -10767,10 +10527,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-AlignDown"> + <object class="GtkToolButton" id="Image-AlignMiddle1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignDown</property> + <property name="action_name">.uno:AlignMiddle</property> </object> <packing> <property name="expand">False</property> @@ -10788,113 +10548,138 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-6"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-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="grid2"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator125"> + <object class="sfxlo-NotebookbarToolBox" id="first10"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-BringToFront"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BringToFront</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkBox" id="SendToFrontGroup1"> + <object class="sfxlo-NotebookbarToolBox" id="second5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="OneStep1"> + <object class="GtkToolButton" id="Draw-SendToBack"> <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="Draw-ObjectForwardOne"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Draw-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> + <property name="action_name">.uno:SendToBack</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> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first12"> + <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="sfxlo-NotebookbarToolBox" id="BackgroundFront1"> + <object class="GtkToolButton" id="Draw-ObjectForwardOne"> <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="Draw-ObjectBackOne"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Draw-SendToBack"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SendToBack</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="action_name">.uno:ObjectForwardOne</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Second1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-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">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator129"> + <object class="GtkSeparator" id="separator67"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10905,21 +10690,21 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-5"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">3</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="GroupGroup"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Group"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -10963,7 +10748,7 @@ <property name="can_focus">False</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-EnterGroup"> @@ -10989,7 +10774,7 @@ <property name="can_focus">False</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-LeaveGroup"> @@ -11038,11 +10823,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">4</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="3dGroup"> + <object class="sfxlo-OptionalBox" id="Draw-Section-3D"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -11148,7 +10933,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">5</property> </packing> </child> </object> @@ -11297,23 +11082,23 @@ </packing> </child> <child> - <object class="sfxlo-PriorityHBox" id="FrameBox"> + <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="EditGroup2"> + <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="SectionBottom54"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom27"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -11323,12 +11108,12 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Object-ObjectTitleDescription"> + <object class="GtkToolButton" id="Media-AssignMacro"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> - <property name="action_name">.uno:ObjectTitleDescription</property> + <property name="action_name">.uno:AssignMacro</property> </object> <packing> <property name="expand">True</property> @@ -11343,26 +11128,230 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB75"> + <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="GtkBox" id="box5"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom28"> <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="sfxlo-NotebookbarToolBox" id="SectionBottom94"> + <object class="GtkToolButton" id="Media-AVMediaPlayer"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> + <property name="action_name">.uno:AVMediaPlayer</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom31"> + <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="Media-ToggleObjectRotateMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ToggleObjectRotateMode</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </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="separator28"> + <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="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="sfxlo-NotebookbarToolBox" id="first14"> + <property name="width_request">1000</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Media-AVMediaToolBox"> + <property name="width_request">800</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:AVMediaToolBox</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="GtkSeparator" id="separator34"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">3</property> + </packing> + </child> + <style> + <class name="priority-3"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Media-Section-ObjectAlign"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom71"> + <property name="visible">True</property> + <property name="can_focus">False</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="Image-AnchorMenu2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="action_name">.uno:AnchorMenu</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="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="AlignGroup2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <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-SetBorderStyle"> + <object class="GtkToolButton" id="Media-ObjectAlignLeft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SetBorderStyle</property> + <property name="action_name">.uno:ObjectAlignLeft</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Media-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="Media-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> @@ -11377,16 +11366,27 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom74"> + <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-LineStyle"> + <object class="GtkToolButton" id="Media-AlignUp"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignUp</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Media-AlignDown"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LineStyle</property> + <property name="action_name">.uno:AlignDown</property> </object> <packing> <property name="expand">False</property> @@ -11394,10 +11394,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-FrameLineColor"> + <object class="GtkToolButton" id="Media-AlignMiddle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FrameLineColor</property> + <property name="action_name">.uno:AlignMiddle</property> </object> <packing> <property name="expand">False</property> @@ -11418,25 +11418,508 @@ <property name="position">0</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <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="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="grid4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first15"> + <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-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="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="second7"> + <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-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="GtkBox" id="box7"> + <object class="sfxlo-NotebookbarToolBox" id="first16"> <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="sfxlo-NotebookbarToolBox" id="third2"> + <object class="GtkToolButton" id="Media-ObjectForwardOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">text</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="Second3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Media-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">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">0</property> + </packing> + </child> + <child> + <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="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="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="receives_default">False</property> + <property name="halign">start</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + <property name="focus_on_click">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom30"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="hexpand">True</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <property name="icon_size">1</property> + <child> + <object class="GtkToolButton" id="Media-TransformDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:TransformDialog</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </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="separator42"> + <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> + <style> + <class name="context-Media"/> + </style> + </object> + <packing> + <property name="position">10</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="CalcNotebookbar|MediaLabel">Media</property> + <style> + <class name="context-Media"/> + </style> + </object> + <packing> + <property name="position">12</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="sfxlo-PriorityHBox" id="ObjectBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <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="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="Big2"> + <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> + <property name="toolbar_style">both</property> + <property name="show_arrow">False</property> + <property name="icon_size">3</property> + <child> + <object class="GtkToolButton" id="Object-AssignMacro"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="action_name">.uno:AssignMacro</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="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="SectionBottom42"> + <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="Draw-ToggleObjectBezierMode2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ToggleObjectBezierMode</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom47"> + <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">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-ToggleObjectRotateMode1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ToggleObjectRotateMode</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-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> + <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="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">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="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">False</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">False</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"> + <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">False</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-FormatArea"> + <object class="GtkMenuToolButton" id="Object-XLineStyle"> + <property name="width_request">100</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatArea</property> + <property name="valign">center</property> + <property name="action_name">.uno:XLineStyle</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -11447,20 +11930,19 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom98"> + <object class="sfxlo-NotebookbarToolBox" id="first19"> <property name="visible">True</property> <property name="can_focus">False</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-FillStyle"> - <property name="width_request">200</property> + <object class="GtkToolButton" id="Object-XLineColor"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FillStyle</property> + <property name="action_name">.uno:XLineColor</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -11475,6 +11957,91 @@ <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">False</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">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-FillShadow"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillShadow</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -11486,7 +12053,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator141"> + <object class="GtkSeparator" id="separator65"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -11504,17 +12071,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ArrangeSection4"> + <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="SectionBottom60"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom56"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -11523,7 +12090,7 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkMenuToolButton" id="Object-AnchorMenu"> + <object class="GtkMenuToolButton" id="Object-Anchor"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -11543,29 +12110,16 @@ </packing> </child> <child> - <object class="GtkBox" id="box9"> + <object class="GtkBox" id="box17"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator147"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="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> @@ -11611,7 +12165,7 @@ </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> @@ -11628,10 +12182,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-AlignMiddle"> + <object class="GtkToolButton" id="Object-AlignDown"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignMiddle</property> + <property name="action_name">.uno:AlignDown</property> </object> <packing> <property name="expand">False</property> @@ -11639,10 +12193,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-AlignDown"> + <object class="GtkToolButton" id="Object-AlignMiddle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignDown</property> + <property name="action_name">.uno:AlignMiddle</property> </object> <packing> <property name="expand">False</property> @@ -11660,159 +12214,227 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-6"/> + </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="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="grid3"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator148"> + <object class="sfxlo-NotebookbarToolBox" id="first18"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</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="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkBox" id="SendToFrontGroup2"> + <object class="sfxlo-NotebookbarToolBox" id="second8"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="OneStep2"> + <object class="GtkToolButton" id="Object-SendToBack"> <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-AlignBottom"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="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> + <property name="action_name">.uno:SendToBack</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> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first21"> + <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="sfxlo-NotebookbarToolBox" id="BackgroundFront2"> + <object class="GtkToolButton" id="Object-ObjectForwardOne"> <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-ObjectBackOne"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="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> + <property name="action_name">.uno:ObjectForwardOne</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Second2"> + <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-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">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator149"> - <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> + <property name="position">0</property> </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-5"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</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="sfxlo-OptionalBox" id="GroupGroup1"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom55"> + <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">False</property> + <property name="receives_default">False</property> <property name="valign">center</property> <property name="vexpand">True</property> - <property name="toolbar_style">both</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + <property name="focus_on_click">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom58"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="hexpand">True</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> - <property name="icon_size">3</property> + <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="Object-FormatGroup"> + <object class="GtkToolButton" id="Object-FormatArea"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatGroup</property> + <property name="valign">center</property> + <property name="action_name">.uno:FormatArea</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-FormatLine"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:FormatLine</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-TransformDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:TransformDialog</property> + </object> + <packing> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -11823,69 +12445,115 @@ <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> + <style> + <class name="Context-Frame"/> + <class name="Context-OLE"/> + </style> + </object> + <packing> + <property name="position">10</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="ObjectLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="CalcNotebookbar|FrameLabel">Object</property> + <style> + <class name="context-Frame"/> + <class name="context-OLE"/> + </style> + </object> + <packing> + <property name="position">10</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="sfxlo-PriorityHBox" id="PrintBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <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="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="GtkBox" id="GroupB77"> + <object class="sfxlo-NotebookbarToolBox" id="first22"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="orientation">vertical</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> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom61"> + <object class="GtkToolButton" id="Print-PreviousPage"> <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">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Object-EnterGroup"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:EnterGroup</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="action_name">.uno:PreviousPage</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="SectionBottom73"> + <object class="GtkToolButton" id="Print-NextPage"> <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">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Object-LeaveGroup"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:LeaveGroup</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="action_name">.uno:NextPage</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> + <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> @@ -11909,98 +12577,97 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> + <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ChartGroup"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom42"> + <object class="sfxlo-NotebookbarToolBox" id="first23"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> + <property name="resize_mode">immediate</property> <property name="toolbar_style">both</property> <property name="show_arrow">False</property> - <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Object-ChartElementSelector"> + <object class="GtkToolButton" id="Print-PageFormatDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ChartElementSelector</property> + <property name="action_name">.uno:PageFormatDialog</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="GroupB66"> + <object class="GtkBox" id="box20"> <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="SectionBottom56"> + <object class="sfxlo-NotebookbarToolBox" id="first25"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> + <property name="resize_mode">immediate</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-FormatSelection"> + <object class="GtkToolButton" id="Print-FullScreen"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatSelection</property> + <property name="action_name">.uno:FullScreen</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="sfxlo-NotebookbarToolBox" id="SectionBottom58"> + <object class="sfxlo-NotebookbarToolBox" id="second12"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> + <property name="resize_mode">immediate</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-DiagramType"> + <object class="GtkToolButton" id="Print-ClosePreview1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DiagramType</property> + <property name="action_name">.uno:ClosePreview</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">1</property> </packing> </child> @@ -12008,17 +12675,69 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator76"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> <property name="position">2</property> </packing> </child> - <style> - <class name="priority-1"/> - </style> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Print-Section-Print"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first26"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="resize_mode">immediate</property> + <property name="toolbar_style">both</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Print-Print"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Print</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> </packing> </child> </object> @@ -12029,34 +12748,34 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="Object-Menu"> + <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"> + <object class="GtkBox" id="GroupB33"> <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="print:MenuPrint"> + <property name="label" translatable="yes" context="CalcNotebookbar|PrintMenuButton">_Print</property> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> + <property name="halign">end</property> + <property name="hexpand">True</property> <property name="relief">none</property> <property name="use_underline">True</property> <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> @@ -12070,11 +12789,10 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="Object-FrameDialog"> + <object class="GtkToolButton" id="Print-ClosePreview"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:FrameDialog</property> + <property name="action_name">.uno:ClosePreview</property> </object> <packing> <property name="expand">True</property> @@ -12104,7 +12822,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator114"> + <object class="GtkSeparator" id="separator45"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -12120,27 +12838,19 @@ <property name="position">3</property> </packing> </child> - <style> - <class name="Context-Frame"/> - <class name="Context-OLE"/> - </style> </object> <packing> <property name="position">10</property> </packing> </child> <child type="tab"> - <object class="GtkLabel" id="FrameLabel"> + <object class="GtkLabel" id="PrintLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="CalcNotebookbar|FrameLabel">Object</property> - <style> - <class name="context-Frame"/> - <class name="context-OLE"/> - </style> + <property name="label" translatable="yes" context="CalcNotebookbar|PrintLabel">Print</property> </object> <packing> - <property name="position">10</property> + <property name="position">12</property> <property name="tab_fill">False</property> </packing> </child> @@ -12181,7 +12891,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom27"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom34"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -12223,7 +12933,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator28"> + <object class="GtkSeparator" id="separator62"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -12252,7 +12962,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom28"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12291,7 +13001,7 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB24"> + <object class="GtkBox" id="GroupB34"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12353,7 +13063,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator34"> + <object class="GtkSeparator" id="separator63"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12381,7 +13091,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">False</property> <property name="valign">center</property> @@ -12532,7 +13242,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator62"> + <object class="GtkSeparator" id="separator66"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12560,7 +13270,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">False</property> <property name="valign">center</property> @@ -12660,7 +13370,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator63"> + <object class="GtkSeparator" id="separator69"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12688,7 +13398,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom30"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom60"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12715,7 +13425,7 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB53"> + <object class="GtkBox" id="GroupB58"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12781,7 +13491,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator42"> + <object class="GtkSeparator" id="separator70"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12812,14 +13522,14 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB33"> + <object class="GtkBox" id="GroupB62"> <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="SectionBottom31"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom61"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">icons</property> @@ -12898,7 +13608,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom57"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom63"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">icons</property> @@ -12984,7 +13694,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator45"> + <object class="GtkSeparator" id="separator75"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -13015,14 +13725,14 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB34"> + <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="SectionBottom34"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom64"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">icons</property> @@ -13068,7 +13778,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">False</property> <property name="toolbar_style">icons</property> @@ -13152,7 +13862,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB58"> + <object class="GtkBox" id="GroupB64"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> |