diff options
author | andreas kainz <kainz.a@gmail.com> | 2018-10-14 23:35:45 +0200 |
---|---|---|
committer | andreas_kainz <kainz.a@gmail.com> | 2018-10-15 16:39:06 +0200 |
commit | a58e2af67af1daedd5b680c0b78ff8416bfdca45 (patch) | |
tree | ba3ccf2d63bb821fabd88f33f03035eadfd28a41 /sd | |
parent | Notebookbar: update writer context tabs (diff) | |
download | core-a58e2af67af1daedd5b680c0b78ff8416bfdca45.tar.gz core-a58e2af67af1daedd5b680c0b78ff8416bfdca45.zip |
Notebookbar: sync draw and impress context tabs
Change-Id: Ic1d87412821c6ce2103664eab56883e5e4033818
Reviewed-on: https://gerrit.libreoffice.org/61771
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/uiconfig/sdraw/ui/notebookbar.ui | 3655 | ||||
-rw-r--r-- | sd/uiconfig/simpress/ui/notebookbar.ui | 3607 |
2 files changed, 4664 insertions, 2598 deletions
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui index 2febf56d8d76..90f65dff3b9e 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar.ui @@ -61,188 +61,181 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="LineD"> + <object class="GtkMenuItem" id="MenuDraw-Line"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Line</property> </object> </child> <child> - <object class="GtkMenuItem" id="Freeline_UnfilledD"> + <object class="GtkMenuItem" id="MenuDraw-Freeline_Unfilled"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Freeline_Unfilled</property> </object> </child> <child> - <object class="GtkMenuItem" id="FreelineD"> + <object class="GtkMenuItem" id="MenuDraw-Freeline"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Freeline</property> </object> </child> <child> - <object class="GtkMenuItem" id="Bezier_UnfilledD"> + <object class="GtkMenuItem" id="MenuDraw-Bezier_Unfilled"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Bezier_Unfilled</property> </object> </child> <child> - <object class="GtkMenuItem" id="BezierFillD"> + <object class="GtkMenuItem" id="MenuDraw-BezierFill"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BezierFill</property> </object> </child> <child> - <object class="GtkMenuItem" id="Polygon_UnfilledD"> + <object class="GtkMenuItem" id="MenuDraw-Polygon_Unfilled"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Polygon_Unfilled</property> </object> </child> <child> - <object class="GtkMenuItem" id="Polygon_Diagonal_UnfilledD"> + <object class="GtkMenuItem" id="MenuDraw-Polygon_Diagonal_Unfilled"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Polygon_Diagonal_Unfilled</property> </object> </child> <child> - <object class="GtkMenuItem" id="Polygon_DiagonalD"> + <object class="GtkMenuItem" id="MenuDraw-Polygon_Diagonal"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Polygon_Diagonal</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator131"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="BasicShapesD"> + <object class="GtkMenuItem" id="MenuDraw-BasicShapes"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BasicShapes</property> </object> </child> <child> - <object class="GtkMenuItem" id="SymbolShapesD"> + <object class="GtkMenuItem" id="MenuDraw-SymbolShapes"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SymbolShapes</property> </object> </child> <child> - <object class="GtkMenuItem" id="ArrowShapesD"> + <object class="GtkMenuItem" id="MenuDraw-ArrowShapes"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ArrowShapes</property> </object> </child> <child> - <object class="GtkMenuItem" id="StarShapesD"> + <object class="GtkMenuItem" id="MenuDraw-StarShapes"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:StarShapes</property> </object> </child> <child> - <object class="GtkMenuItem" id="CalloutShapesD"> + <object class="GtkMenuItem" id="MenuDraw-CalloutShapes"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:CalloutShapes</property> </object> </child> <child> - <object class="GtkMenuItem" id="FlowChartShapesD"> + <object class="GtkMenuItem" id="MenuDraw-FlowChartShapes"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FlowChartShapes</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator134"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator2"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="DrawCaptionD"> + <object class="GtkMenuItem" id="MenuDraw-DrawCaption"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:DrawCaption</property> </object> </child> <child> - <object class="GtkMenuItem" id="VerticalCaptionD"> + <object class="GtkMenuItem" id="MenuDraw-VerticalCaption"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:VerticalCaption</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator135"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="DrawText3"> + <object class="GtkMenuItem" id="MenuDraw-DrawText"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:DrawText</property> </object> </child> <child> - <object class="GtkMenuItem" id="VerticalTextD"> + <object class="GtkMenuItem" id="MenuDraw-VerticalText"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:VerticalText</property> </object> </child> <child> - <object class="GtkMenuItem" id="InsertGraphicD2"> + <object class="GtkMenuItem" id="MenuDraw-FontWork"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertGraphic</property> + <property name="action_name">.uno:FontWork</property> </object> </child> <child> - <object class="GtkMenuItem" id="FontworkGalleryFloaterD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FontworkGalleryFloater</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="Text_MarqueeD"> + <object class="GtkMenuItem" id="MenuDraw-Text_Marquee"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Text_Marquee</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator136"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="ToggleObjectBezierModeD"> + <object class="GtkMenuItem" id="MenuDraw-NameGroup"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectBezierMode</property> + <property name="action_name">.uno:NameGroup</property> </object> </child> <child> - <object class="GtkMenuItem" id="ExtrusionToggleD"> + <object class="GtkMenuItem" id="MenuDraw-ObjectTitleDescription"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ExtrusionToggle</property> + <property name="action_name">.uno:ObjectTitleDescription</property> </object> </child> </object> @@ -323,156 +316,163 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="AddDirectD"> + <object class="GtkMenuItem" id="MenuFile-AddDirect"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AddDirect</property> </object> </child> <child> - <object class="GtkMenuItem" id="RecentFileListD"> + <object class="GtkMenuItem" id="MenuFile-RecentFileList"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:RecentFileList</property> </object> </child> <child> - <object class="GtkMenuItem" id="CloseDocD"> + <object class="GtkMenuItem" id="MenuFile-CloseDoc"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:CloseDoc</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator39"> + <object class="GtkSeparatorMenuItem" id="MenuFile-separator"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="SaveD"> + <object class="GtkMenuItem" id="MenuFile-Save"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Save</property> </object> </child> <child> - <object class="GtkMenuItem" id="SaveAsD"> + <object class="GtkMenuItem" id="MenuFile-SaveAs"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SaveAs</property> </object> </child> <child> - <object class="GtkMenuItem" id="SaveAsRemoteD"> + <object class="GtkMenuItem" id="MenuFile-SaveAsRemote"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SaveAsRemote</property> </object> </child> <child> - <object class="GtkMenuItem" id="NewGlobalDocD"> + <object class="GtkMenuItem" id="MenuFile-NewGlobalDoc"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:NewGlobalDoc</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator61"> + <object class="GtkSeparatorMenuItem" id="MenuFile-separator1"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="ExportToD"> + <object class="GtkMenuItem" id="MenuFile-ExportTo"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ExportTo</property> </object> </child> <child> - <object class="GtkMenuItem" id="ExportToPDFD"> + <object class="GtkMenuItem" id="MenuFile-ExportToPDF"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ExportToPDF</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator44"> + <object class="GtkMenuItem" id="MenuFile-ExportToEPUB"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ExportToEPUB</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuFile-separator2"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="SendMailD"> + <object class="GtkMenuItem" id="MenuFile-SendMail"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SendMail</property> </object> </child> <child> - <object class="GtkMenuItem" id="SendMailDocAsPDFD"> + <object class="GtkMenuItem" id="MenuFile-SendMailDocAsPDF"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SendMailDocAsPDF</property> </object> </child> <child> - <object class="GtkMenuItem" id="SendViaBluetoothD"> + <object class="GtkMenuItem" id="MenuFile-SendViaBluetooth"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SendViaBluetooth</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator48"> + <object class="GtkSeparatorMenuItem" id="MenuFile-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="PrintPreviewD"> + <object class="GtkMenuItem" id="MenuFile-PrintPreview"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:PrintPreview</property> </object> </child> <child> - <object class="GtkMenuItem" id="PrintDefaultD"> + <object class="GtkMenuItem" id="MenuFile-PrintDefault"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:PrintDefault</property> </object> </child> <child> - <object class="GtkMenuItem" id="PrinterSetupD"> + <object class="GtkMenuItem" id="MenuFile-PrinterSetup"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:PrinterSetup</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator50"> + <object class="GtkSeparatorMenuItem" id="MenuFile-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="SignatureD"> + <object class="GtkMenuItem" id="MenuFile-Signature"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Signature</property> </object> </child> <child> - <object class="GtkMenuItem" id="SignPDFD"> + <object class="GtkMenuItem" id="MenuFile-SignPDF"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SignPDF</property> </object> </child> <child> - <object class="GtkMenuItem" id="SetDocumentPropertiesD"> + <object class="GtkMenuItem" id="MenuFile-SetDocumentProperties"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SetDocumentProperties</property> @@ -485,402 +485,13 @@ </object> </child> <child> - <object class="GtkMenuItem" id="QuitD"> + <object class="GtkMenuItem" id="MenuFile-Quit"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Quit</property> </object> </child> </object> - <object class="GtkMenu" id="MenuGraphic"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkMenuItem" id="CropD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Crop</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ExternalEditD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ExternalEdit</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ChangePictureD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ChangePicture</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="CompressGraphicD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:CompressGraphic</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="SaveGraphicD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SaveGraphic</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator67"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ObjectMirrorVerticalD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectMirrorVertical</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ObjectMirrorHorizontalD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectMirrorHorizontal</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator124"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ChangeBezier1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ChangeBezier</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ChangePolygonD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ChangePolygon</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="convert_to_contourD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:convert_to_contour</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ConvertInto3DD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ConvertInto3D</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ConvertInto3DLatheFastD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ConvertInto3DLatheFast</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ConvertIntoBitmapD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ConvertIntoBitmap</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ConvertIntoMetaFileD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ConvertIntoMetaFile</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator128"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ImageMapDialogD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ImageMapDialog</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator142"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ObjectTitleDescription1"> - <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="MenuGraphic2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkMenuItem" id="InsertCaptionDialogD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:InsertCaptionDialog</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator60"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="CropD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Crop</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ExternalEditD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ExternalEdit</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ChangePictureD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ChangePicture</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="CompressGraphicD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:CompressGraphic</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="SaveGraphicD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SaveGraphic</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator62"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="RotateLeftD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:RotateLeft</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="RotateRightD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:RotateRight</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="Rotate180D"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Rotate180</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="FlipVerticalD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FlipVertical</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="FlipHorizontalD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator63"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ImageMapDialogD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ImageMapDialog</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator133"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="WrapOffD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:WrapOff</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="WrapOnD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:WrapOn</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="WrapIdealD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:WrapIdeal</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="WrapThroughD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:WrapThrough</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="WrapThroughTransparencyToggleD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:WrapThroughTransparencyToggle</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="WrapContourD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:WrapContour</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ContourDialogD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ContourDialog</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="WrapAnchorOnlyD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:WrapAnchorOnly</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="TextWrapD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:TextWrap</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator140"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="BringToFrontD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BringToFront</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ObjectForwardOneD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ObjectBackOneD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="SendToBackD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SendToBack</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="SetObjectToForegroundD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SetObjectToForeground</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="SetObjectToBackgroundD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SetObjectToBackground</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator137"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="AnchorMenuD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AnchorMenu</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator139"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="GraphicDialogD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:GraphicDialog</property> - </object> - </child> - </object> <object class="GtkMenu" id="MenuHelp"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1188,6 +799,85 @@ </object> </child> </object> + <object class="GtkMenu" id="MenuImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="MenuImage-ImageCrop"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Crop</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-ExternalEdit"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ExternalEdit</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-ChangePicture"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ChangePicture</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-CompressGraphic"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CompressGraphic</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-SaveGraphic"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SaveGraphic</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator62"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-ImageMapDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ImageMapDialog</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator139"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-NameGroup"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NameGroup</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-ObjectTitleDescription"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectTitleDescription</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-GraphicDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GraphicDialog</property> + </object> + </child> + </object> <object class="GtkMenu" id="MenuInsert"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1334,6 +1024,82 @@ </object> </child> </object> + <object class="GtkMenu" id="MenuMedia"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="MenuMedia-AVMediaPlayer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AVMediaPlayer</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuMedia-separator1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuMedia-NameGroup"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NameGroup</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuMedia-ObjectTitleDescription"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectTitleDescription</property> + </object> + </child> + </object> + <object class="GtkMenu" id="MenuObject"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="MenuObject-ChainFrames"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ChainFrames</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuObject-UnhainFrames"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:UnhainFrames</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuObject-separator"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuObject-NameGroup"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NameGroup</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuObject-ObjectTitleDescription"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectTitleDescription</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuObject-FrameDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FrameDialog</property> + </object> + </child> + </object> <object class="GtkMenu" id="MenuReference"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -2251,11 +2017,6 @@ <property name="can_focus">False</property> <property name="pixbuf">cmd/lc_changebezier.png</property> </object> - <object class="GtkImage" id="changebezierImg2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="pixbuf">cmd/lc_changebezier.png</property> - </object> <object class="GtkImage" id="paragraphstylei"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -2281,7 +2042,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-DropdownBox" id="FileSection"> + <object class="sfxlo-DropdownBox" id="File-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -2435,13 +2196,13 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="FileContainer"> + <object class="sfxlo-PriorityMergedHBox" id="File-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="NewSectio"> + <object class="sfxlo-OptionalBox" id="File-Section-New"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -2560,7 +2321,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="OpenSection"> + <object class="sfxlo-OptionalBox" id="File-Section-Open"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -2670,7 +2431,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SaveSection"> + <object class="sfxlo-OptionalBox" id="File-Section-Save"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -2792,7 +2553,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ExportSection"> + <object class="sfxlo-OptionalBox" id="File-Section-Export"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -2914,7 +2675,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="PrintSection"> + <object class="sfxlo-OptionalBox" id="File-Section-Print"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3036,7 +2797,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="PropertySection"> + <object class="sfxlo-OptionalBox" id="File-Section-Property"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3157,9 +2918,6 @@ <property name="position">5</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -3187,7 +2945,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="PasteBox"> + <object class="GtkBox" id="Home-PasteBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3317,7 +3075,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="MenuSection"> + <object class="sfxlo-DropdownBox" id="Home-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -3403,13 +3161,13 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="HomeContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Home-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="DrawTextSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-DrawText"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3594,7 +3352,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DrawSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-Draw"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3748,7 +3506,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DrawColorSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-DrawColor"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3781,41 +3539,62 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB43"> + <object class="GtkBox" id="box10"> <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="SectionBottom47"> + <object class="GtkBox" id="box11"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Home-XLineStyle"> + <object class="sfxlo-NotebookbarToolBox" id="first6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:XLineStyle</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Draw-XLineStyle2"> + <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="Home-XLineColor"> + <object class="sfxlo-NotebookbarToolBox" id="first10"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="hexpand">True</property> - <property name="action_name">.uno:XLineColor</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-XLineColor2"> + <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">True</property> - <property name="homogeneous">True</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> @@ -3826,24 +3605,21 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB16"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom41"> + <property name="width_request">200</property> <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="GtkMenuToolButton" id="Home-FillStyle"> + <object class="GtkToolButton" id="Draw-FillStyle2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="hexpand">True</property> <property name="action_name">.uno:FillStyle</property> </object> <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="expand">True</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -3886,7 +3662,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ArrangeSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-Arrange"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4106,7 +3882,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Home-InsertSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-Insert"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4223,7 +3999,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="TransformSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-Transform"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4325,9 +4101,6 @@ <property name="position">5</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -4380,13 +4153,13 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="InsertContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Insert-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="SlideSection"> + <object class="sfxlo-OptionalBox" id="Insert-Section-Slide"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4441,7 +4214,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="TableSection"> + <object class="sfxlo-OptionalBox" id="Insert-Section-Table"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4557,7 +4330,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ImageSection"> + <object class="sfxlo-OptionalBox" id="Insert-Section-Image"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4673,7 +4446,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="HyperlinkSection"> + <object class="sfxlo-OptionalBox" id="Insert-Section-Hyperlink"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4793,7 +4566,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FontWorkSection"> + <object class="sfxlo-OptionalBox" id="Insert-Section-FontWork"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4913,7 +4686,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FieldSection"> + <object class="sfxlo-OptionalBox" id="Insert-Section-Field"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -4962,7 +4735,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SymbolSection"> + <object class="sfxlo-OptionalBox" id="Insert-Section-Symbol"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4977,7 +4750,7 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Insert-InsertSymbol"> + <object class="GtkToolButton" id="Insert-CharmapControl"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:CharmapControl</property> @@ -5080,9 +4853,6 @@ <property name="position">6</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -5091,7 +4861,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="InsertMenu"> + <object class="sfxlo-DropdownBox" id="Insert-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -5206,7 +4976,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-DropdownBox" id="PageMenu"> + <object class="sfxlo-DropdownBox" id="Page-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -5298,13 +5068,13 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="PageContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Page-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="PageFormatSection"> + <object class="sfxlo-OptionalBox" id="Page-Section-Format"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5420,7 +5190,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="InsertSlideSection"> + <object class="sfxlo-OptionalBox" id="Page-Section-InsertPage"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5537,7 +5307,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="InsertSlideSection1"> + <object class="sfxlo-OptionalBox" id="Page-Section-ShowPage"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5654,7 +5424,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="NavigationSection"> + <object class="sfxlo-OptionalBox" id="Page-Section-Navigation"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5747,7 +5517,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="MasterSlideSection"> + <object class="sfxlo-OptionalBox" id="Page-Section-MasterSlide"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5864,7 +5634,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="MasterSlideSection1"> + <object class="sfxlo-OptionalBox" id="Page-Section-MasterSlide1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5955,9 +5725,6 @@ <property name="position">5</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -5989,7 +5756,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-DropdownBox" id="ReferenceMenue"> + <object class="sfxlo-DropdownBox" id="Reference-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -6063,13 +5830,13 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="ReviewContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Review-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="LanguageSection"> + <object class="sfxlo-OptionalBox" id="Review-Section-Language"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6197,7 +5964,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="AnnotationSection"> + <object class="sfxlo-OptionalBox" id="Review-Section-Annotation"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6397,9 +6164,6 @@ <property name="position">1</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -6448,7 +6212,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-DropdownBox" id="ViewMenu"> + <object class="sfxlo-DropdownBox" id="View-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -6523,13 +6287,13 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="ViewContainer"> + <object class="sfxlo-PriorityMergedHBox" id="View-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="ViewSection"> + <object class="sfxlo-OptionalBox" id="View-Section-View"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6595,7 +6359,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ZoomSection"> + <object class="sfxlo-OptionalBox" id="View-Section-Zoom"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6777,7 +6541,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="VisibleSection"> + <object class="sfxlo-OptionalBox" id="View-Section-Visible"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6967,7 +6731,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DisplayQualitySection"> + <object class="sfxlo-OptionalBox" id="View-Section-DisplayQuality"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7091,7 +6855,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="NewSection"> + <object class="sfxlo-OptionalBox" id="View-Section-New"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7148,9 +6912,6 @@ <property name="position">4</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -7199,7 +6960,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-DropdownBox" id="TextMenu"> + <object class="sfxlo-DropdownBox" id="Text-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -7285,13 +7046,13 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="TextContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Text-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="GtkBox" id="PasteBox-Text"> + <object class="GtkBox" id="Text-Section-PasteBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7421,7 +7182,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="StyleSection"> + <object class="sfxlo-OptionalBox" id="Text-Section-Style"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7498,7 +7259,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormatSection"> + <object class="sfxlo-OptionalBox" id="Text-Section-Format"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7827,7 +7588,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ParagraphSection"> + <object class="sfxlo-OptionalBox" id="Text-Section-Paragraph"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -8150,7 +7911,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="StyleSection2"> + <object class="sfxlo-OptionalBox" id="Text-Section-Style1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -8341,7 +8102,7 @@ </packing> </child> <child> - <object class="GtkBox" id="TextArrangementSection"> + <object class="GtkBox" id="Text-Section-TextArrangement"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -8523,13 +8284,13 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="TableContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Table-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="TableLayoutSection"> + <object class="sfxlo-OptionalBox" id="Table-Section-Layout"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -8699,7 +8460,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="MergeSection"> + <object class="sfxlo-OptionalBox" id="Table-Section-Merge"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -8820,7 +8581,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ColumnRowSection"> + <object class="sfxlo-OptionalBox" id="Table-Section-ColumnRow"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -8956,7 +8717,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SelectSection"> + <object class="sfxlo-OptionalBox" id="Table-Section-Select"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -9075,7 +8836,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="OptimizeSection"> + <object class="sfxlo-OptionalBox" id="Table-Section-Optimize"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -9284,7 +9045,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="TableSelection"> + <object class="sfxlo-DropdownBox" id="Table-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -9401,19 +9162,19 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="ImageContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Image-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="ColorSection"> + <object class="sfxlo-OptionalBox" id="Image-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="SectionBottom90"> + <object class="sfxlo-NotebookbarToolBox" id="Big"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -9423,16 +9184,16 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Image-ObjectTitleDescription"> + <object class="GtkToolButton" id="Image-NameGroup"> <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:NameGroup</property> </object> <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="expand">False</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -9443,172 +9204,110 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB68"> + <object class="GtkBox" id="SecondGroup"> <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="first15"> + <object class="GtkBox" id="box13"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-Crop"> + <object class="sfxlo-NotebookbarToolBox" id="first11"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Crop</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Image-CompressGraphic1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CompressGraphic</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="second17"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-SaveGraphic"> + <object class="sfxlo-NotebookbarToolBox" id="first"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SaveGraphic</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Image-Crop1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Crop</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="GroupB45"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="first1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Image-CompressGraphic"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:CompressGraphic</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="second1"> + <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="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-ChangePicture"> + <object class="GtkToolButton" id="Image-ToggleObjectRotateMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ChangePicture</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="action_name">.uno:ToggleObjectRotateMode</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> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkBox" id="GroupB50"> - <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="first2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-MirrorHorz"> + <object class="GtkToolButton" id="Image-FlipVertical"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:MirrorHorz</property> + <property name="action_name">.uno:FlipVertical</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">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="Image-MirrorVert"> + <object class="GtkToolButton" id="Image-FlipHorizontal"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:MirrorVert</property> + <property name="action_name">.uno:FlipHorizontal</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -9622,11 +9321,11 @@ <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="GtkSeparator" id="separator122"> + <object class="GtkSeparator" id="Image-Section-InsertCaptionDialog-Separator1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -9637,7 +9336,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">4</property> + <property name="position">2</property> </packing> </child> </object> @@ -9648,28 +9347,27 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ColorSection2"> + <object class="sfxlo-OptionalBox" id="Image-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="GroupB72"> + <object class="GtkBox" id="box3"> <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="GrafModeGroup"> + <object class="sfxlo-NotebookbarToolBox" id="third1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">icons</property> + <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-GrafMode"> + <object class="GtkToolButton" id="Draw-FormatLine1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:GrafMode</property> + <property name="action_name">.uno:FormatLine</property> </object> <packing> <property name="expand">True</property> @@ -9684,21 +9382,58 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB35"> + <object class="sfxlo-NotebookbarToolBox" id="third2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="GraphicFilterToolboxGroup"> + <object class="GtkToolButton" id="Draw-FormatArea1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</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="box6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first41"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Image-GraphicFilterToolbox"> + <object class="GtkMenuToolButton" id="Draw-XLineStyle1"> + <property name="width_request">100</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:GraphicFilterToolbox</property> + <property name="valign">center</property> + <property name="action_name">.uno:XLineStyle</property> </object> <packing> <property name="expand">False</property> @@ -9713,34 +9448,16 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom18"> + <object class="sfxlo-NotebookbarToolBox" id="first1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="hexpand">True</property> - <property name="toolbar_style">icons</property> + <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> - <property name="icon_size">1</property> - <child> - <object class="GtkToolButton" id="Image-FormatLine2"> - <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:FormatLine</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> <child> - <object class="GtkToolButton" id="Image-FormatArea2"> + <object class="GtkToolButton" id="Draw-XLineColor1"> <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:FormatArea</property> + <property name="action_name">.uno:XLineColor</property> </object> <packing> <property name="expand">True</property> @@ -9758,99 +9475,25 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator123"> - <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-6"/> - </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="ColorSection1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="margin_right">5</property> - <property name="vexpand">True</property> - <child> - <object class="GtkBox" id="GroupB75"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-SidebarToolBox" id="colorbox3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkMenuToolButton" id="Image-GrafLuminance"> - <property name="width_request">130</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="margin_right">5</property> - <property name="action_name">.uno:GrafLuminance</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="colorbox4"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom18"> + <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="GtkMenuToolButton" id="Image-GrafTransparence"> - <property name="width_request">130</property> + <object class="GtkToolButton" id="Draw-FillStyle1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="margin_right">5</property> - <property name="action_name">.uno:GrafTransparence</property> + <property name="action_name">.uno:FillStyle</property> </object> <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="expand">True</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -9867,45 +9510,26 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-5"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="ColorSection3"> - <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="GroupB78"> + <object class="GtkBox" id="box9"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="colorbox5"> + <object class="sfxlo-NotebookbarToolBox" id="first5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Image-GrafContrast"> - <property name="width_request">130</property> + <object class="GtkToolButton" id="Draw-LineEndStyle1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:GrafContrast</property> + <property name="action_name">.uno:LineEndStyle</property> </object> <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="expand">True</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -9916,22 +9540,20 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="colorbox6"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom24"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Image-GrafGamma"> - <property name="width_request">130</property> + <object class="GtkToolButton" id="Draw-FillShadow1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:GrafGamma</property> + <property name="action_name">.uno:FillShadow</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -9945,11 +9567,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator90"> + <object class="GtkSeparator" id="separator60"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -9963,18 +9585,15 @@ <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="ArrangeSection3"> + <object class="sfxlo-OptionalBox" id="Image-Section-ObjectAlign"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -10000,43 +9619,153 @@ </packing> </child> <child> - <object class="GtkBox" id="AlignGroup2"> + <object class="GtkBox" id="box5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <property name="valign">end</property> + <property name="margin_right">5</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align5"> + <object class="GtkBox" id="AlignGroup3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> + <property name="orientation">vertical</property> <child> - <object class="GtkToolButton" id="Image-ObjectAlignLeft"> + <object class="sfxlo-NotebookbarToolBox" id="Align5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectAlignLeft</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Image-ObjectAlignLeft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignLeft</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Image-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="Image-ObjectAlignRight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignRight</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkToolButton" id="Image-AlignCenter"> + <object class="sfxlo-NotebookbarToolBox" id="Align6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignCenter</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Image-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="Image-AlignDown"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignDown</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Image-AlignMiddle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignMiddle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-5"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Image-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="grid1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first2"> + <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="Image-ObjectAlignRight"> + <object class="GtkToolButton" id="Image-BringToFront"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectAlignRight</property> + <property name="action_name">.uno:BringToFront</property> </object> <packing> <property name="expand">False</property> @@ -10045,44 +9774,67 @@ </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align6"> + <object class="sfxlo-NotebookbarToolBox" id="second2"> <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="Image-AlignUp"> + <object class="GtkToolButton" id="Image-SendToBack"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignUp</property> + <property name="action_name">.uno:SendToBack</property> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-AlignMiddle"> + <object class="GtkToolButton" id="Image-ObjectForwardOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignMiddle</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="Second7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-AlignDown"> + <object class="GtkToolButton" id="Image-ObjectBackOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignDown</property> + <property name="action_name">.uno:ObjectBackOne</property> </object> <packing> <property name="expand">False</property> @@ -10091,20 +9843,19 @@ </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <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="separator98"> + <object class="GtkSeparator" id="separator123"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10115,11 +9866,51 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-4"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Image-Section-FormatImageFilter"> + <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="GraphicFilterToolboxGroup"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Image-GraphicFilterToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GraphicFilterToolbox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <style> + <class name="priority-3"/> </style> </object> <packing> @@ -10129,31 +9920,34 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ArrangeSection4"> + <object class="sfxlo-OptionalBox" id="Image-Section-ColorSettings1"> <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="SendToFrontGroup5"> + <object class="GtkBox" id="GroupB87"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="BackgroundFront6"> + <object class="sfxlo-SidebarToolBox" id="colorbox3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-BeforeObject1"> + <object class="GtkMenuToolButton" id="Image-GrafLuminance"> + <property name="width_request">130</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BeforeObject</property> + <property name="valign">center</property> + <property name="action_name">.uno:GrafLuminance</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -10164,20 +9958,22 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="BackgroundFront7"> + <object class="sfxlo-SidebarToolBox" id="colorbox4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-BehindObject1"> + <object class="GtkMenuToolButton" id="Image-GrafTransparence"> + <property name="width_request">130</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BehindObject</property> + <property name="valign">center</property> + <property name="action_name">.uno:GrafTransparence</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -10191,40 +9987,49 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-2"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Image-Section-ColorSettings2"> + <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="SendToFrontGroup3"> + <object class="GtkBox" id="GroupB90"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="OneStep3"> + <object class="sfxlo-SidebarToolBox" id="colorbox5"> <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="Image-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="Image-BringToFront"> + <object class="GtkMenuToolButton" id="Image-GrafContrast"> + <property name="width_request">130</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BringToFront</property> + <property name="valign">center</property> + <property name="action_name">.uno:GrafContrast</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -10235,31 +10040,22 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="BackgroundFront3"> + <object class="sfxlo-SidebarToolBox" id="colorbox6"> <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="Image-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="Image-SendToBack"> + <object class="GtkMenuToolButton" id="Image-GrafGamma"> + <property name="width_request">130</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SendToBack</property> + <property name="valign">center</property> + <property name="action_name">.uno:GrafGamma</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -10273,22 +10069,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator141"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> + <property name="position">0</property> </packing> </child> <style> @@ -10298,12 +10079,9 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -10312,7 +10090,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="ImageMenue"> + <object class="sfxlo-DropdownBox" id="Image-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -10326,7 +10104,7 @@ <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="svtlo-ManagedMenuButton" id="Image-GraphicButton:MenuGraphic"> + <object class="svtlo-ManagedMenuButton" id="Image-GraphicButton:MenuImage"> <property name="label" translatable="yes" context="drawnotebookbar|GraphicMenuButton">Image</property> <property name="visible">True</property> <property name="can_focus">False</property> @@ -10352,6 +10130,19 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> + <object class="GtkToolButton" id="Image-SaveGraphic1"> + <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:SaveGraphic</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> <object class="GtkToolButton" id="Image-FormatArea"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -10457,19 +10248,19 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="DrawContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Draw-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="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> @@ -10479,53 +10270,70 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Draw-AdvancedMode"> + <object class="GtkToolButton" id="Draw-NameGroup"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AdvancedMode</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="action_name">.uno:NameGroup</property> </object> <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="expand">False</property> + <property name="homogeneous">False</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="GroupB69"> + <object class="GtkBox" id="GroupB35"> <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="SectionBottom55"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom60"> <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-FlipVertical"> + <object class="GtkToolButton" id="Draw-ToggleObjectBezierMode1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipVertical</property> + <property name="action_name">.uno:AdvancedMode</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="SectionBottom61"> + <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-FlipHorizontal"> + <object class="GtkToolButton" id="Draw-ToggleObjectRotateMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> + <property name="action_name">.uno:ToggleObjectRotateMode</property> </object> <packing> <property name="expand">False</property> @@ -10533,36 +10341,21 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-Mirror"> + <object class="GtkToolButton" id="Draw-FlipHorizontal1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Mirror</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">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom49"> - <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-Shear"> + <object class="GtkToolButton" id="Draw-FlipVertical1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Shear</property> + <property name="action_name">.uno:FlipVertical</property> </object> <packing> <property name="expand">False</property> @@ -10570,10 +10363,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-CrookSlant"> + <object class="GtkToolButton" id="Draw-Shear1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CrookSlant</property> + <property name="action_name">.uno:Shear</property> </object> <packing> <property name="expand">False</property> @@ -10581,10 +10374,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-CrookRotate"> + <object class="GtkToolButton" id="Draw-CrookSlant"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CrookRotate</property> + <property name="action_name">.uno:CrookSlant</property> </object> <packing> <property name="expand">False</property> @@ -10606,7 +10399,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator66"> + <object class="GtkSeparator" id="separator63"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10628,29 +10421,62 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DrawTextSection1"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom24"> + <object class="GtkBox" id="box59"> <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> + <property name="orientation">vertical</property> <child> - <object class="GtkToolButton" id="Draw-Text"> + <object class="sfxlo-NotebookbarToolBox" id="third10"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Text</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FormatLine2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatLine</property> + </object> + <packing> + <property name="expand">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">0</property> + </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-FormatArea2"> + <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> @@ -10661,59 +10487,311 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB26"> + <object class="GtkBox" id="box56"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="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="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first4"> + <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-XLineColor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:XLineColor</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom50"> + <property name="width_request">200</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FillStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillStyle</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </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="box8"> <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="shapes2"> + <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-Line"> + <object class="GtkToolButton" id="Draw-LineEndStyle2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Line</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="SectionBottom54"> + <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-Polygon_Unfilled"> + <object class="GtkToolButton" id="Draw-FillShadow"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Polygon_Unfilled</property> + <property name="action_name">.uno:FillShadow</property> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator68"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-ObjectAlign"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="margin_right">5</property> + <property name="vexpand">True</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Draw-ConvertButton:MenuConvert"> + <property name="label" translatable="yes" context="drawnotebookbar|ConvertMenuButton">Convert</property> + <property name="width_request">70</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:ChangeBezier</property> + <property name="image">changebezierImg</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + <property name="image_position">top</property> + <property name="always_show_image">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="AlignGroup1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="GtkToolButton" id="Draw-Bezier_Unfilled"> + <object class="sfxlo-NotebookbarToolBox" id="Align1"> <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="GtkToolButton" id="Image-ObjectAlignLeft1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignLeft</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Image-AlignCenter1"> + <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="Image-ObjectAlignRight1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignRight</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="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="Align2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ArrowsToolbox</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Image-AlignUp1"> + <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="Image-AlignDown1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignDown</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Image-AlignMiddle1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignMiddle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> @@ -10723,50 +10801,113 @@ <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="vexpand">True</property> + <child> + <object class="GtkGrid" id="grid2"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="shapes4"> + <object class="sfxlo-NotebookbarToolBox" id="first8"> <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.rectangle"> + <object class="GtkToolButton" id="Draw-BringToFront"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BasicShapes.rectangle</property> + <property name="action_name">.uno:BringToFront</property> </object> <packing> - <property name="expand">True</property> + <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="second1"> + <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.ellipse"> + <object class="GtkToolButton" id="Draw-SendToBack"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BasicShapes.ellipse</property> + <property name="action_name">.uno:SendToBack</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first9"> + <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-DrawCaption"> + <object class="GtkToolButton" id="Draw-ObjectForwardOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DrawCaption</property> + <property name="action_name">.uno:ObjectForwardOne</property> </object> <packing> - <property name="expand">True</property> + <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="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-LineToolbox"> + <object class="GtkToolButton" id="Draw-ObjectBackOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LineToolbox</property> + <property name="action_name">.uno:ObjectBackOne</property> </object> <packing> <property name="expand">False</property> @@ -10775,20 +10916,19 @@ </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <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="separator11"> + <object class="GtkSeparator" id="separator67"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10799,78 +10939,117 @@ <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-7"/> + <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> <child> - <object class="sfxlo-OptionalBox" id="DrawSection1"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Bezier"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB34"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom56"> <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="GtkToolButton" id="Draw-ToggleObjectBezierMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ToggleObjectBezierMode</property> + </object> + <packing> + <property name="expand">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> + <child> + <object class="GtkBox" id="BezierGroup"> + <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="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">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-BasicShapes"> + <object class="GtkToolButton" id="Draw-BezierMove"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BasicShapes</property> + <property name="action_name">.uno:BezierMove</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Draw-SymbolShapes"> + <object class="GtkToolButton" id="Draw-BezierInsert"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SymbolShapes</property> + <property name="action_name">.uno:BezierInsert</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Draw-ArrowShapes"> + <object class="GtkToolButton" id="Draw-BezierDelete"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ArrowShapes</property> + <property name="action_name">.uno:BezierDelete</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-BezierConvert"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BezierConvert</property> + </object> + <packing> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Draw-ConnectorToolbox"> + <object class="GtkToolButton" id="Draw-BezierClose"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ConnectorToolbox</property> + <property name="action_name">.uno:BezierClose</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -10882,52 +11061,63 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="shapes6"> + <object class="sfxlo-NotebookbarToolBox" id="BackgroundFront2"> <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"> + <object class="GtkToolButton" id="Draw-BezierCutLine"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:StarShapes</property> + <property name="action_name">.uno:BezierCutLine</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-BezierEdge"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BezierEdge</property> + </object> + <packing> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Draw-CalloutShapes"> + <object class="GtkToolButton" id="Draw-BezierSmooth"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CalloutShapes</property> + <property name="action_name">.uno:BezierSmooth</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Draw-FlowChartShapes"> + <object class="GtkToolButton" id="Draw-BezierSymmetric"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlowChartShapes</property> + <property name="action_name">.uno:BezierSymmetric</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Draw-Objects3DToolbox"> + <object class="GtkToolButton" id="Draw-BezierEliminatePoints"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Objects3DToolbox</property> + <property name="action_name">.uno:BezierEliminatePoints</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -10946,7 +11136,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator24"> + <object class="GtkSeparator" id="separator83"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10957,27 +11147,27 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">4</property> + <property name="position">3</property> </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-4"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">4</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="StyleGroup"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Group"> <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="SectionBottom41"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom51"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -10986,13 +11176,13 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Draw-DesignerDialog"> + <object class="GtkToolButton" id="Draw-FormatGroup"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DesignerDialog</property> + <property name="action_name">.uno:FormatGroup</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -11000,25 +11190,28 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkBox" id="box59"> + <object class="GtkBox" id="GroupB70"> <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="third10"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom52"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">text</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-FormatLine2"> + <object class="GtkToolButton" id="Draw-EnterGroup"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatLine</property> + <property name="action_name">.uno:EnterGroup</property> </object> <packing> <property name="expand">True</property> @@ -11033,16 +11226,18 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="third13"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom53"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">text</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-FormatArea2"> + <object class="GtkToolButton" id="Draw-LeaveGroup"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatArea</property> + <property name="action_name">.uno:LeaveGroup</property> </object> <packing> <property name="expand">True</property> @@ -11060,38 +11255,57 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkBox" id="box56"> + <object class="GtkSeparator" id="separator132"> + <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-2"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-3D"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="GtkBox" id="GroupB73"> <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="first3"> + <object class="sfxlo-NotebookbarToolBox" id="first38"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="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> - <child> - <object class="GtkToolButton" id="Draw-XLineColor"> + <object class="GtkToolButton" id="Draw-ExtrusionToggle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:XLineColor</property> + <property name="action_name">.uno:ExtrusionToggle</property> </object> <packing> <property name="expand">True</property> @@ -11100,29 +11314,61 @@ </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom50"> - <property name="width_request">200</property> + <object class="sfxlo-NotebookbarToolBox" id="second39"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-FillStyle"> + <object class="GtkToolButton" id="Draw-ExtrusionDepthFloater"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FillStyle</property> + <property name="action_name">.uno:ExtrusionDepthFloater</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-ExtrusionDirectionFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ExtrusionDirectionFloater</property> </object> <packing> <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> + <child> + <object class="GtkMenuToolButton" id="Draw-Extrusion3DColor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Extrusion3DColor</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkMenuToolButton" id="Draw-ExtrusionSurfaceFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ExtrusionSurfaceFloater</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -11138,35 +11384,242 @@ </packing> </child> <child> - <object class="GtkBox" id="box4"> + <object class="GtkSeparator" id="separator138"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">3</property> + </packing> + </child> + <style> + <class name="priority-1"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> + </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="Draw-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="GroupB74"> + <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="Draw-DrawButton:MenuDraw"> + <property name="label" translatable="yes" context="drawnotebookbar|DrawMenuButton">D_raw</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="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="SectionBottom48"> + <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="sfxlo-NotebookbarToolBox" id="first5"> + <object class="GtkToolButton" id="Draw-FormatArea"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">icons</property> + <property name="valign">center</property> + <property name="action_name">.uno:FormatArea</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-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="Draw-TransformDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:TransformDialog</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator71"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="pack_type">end</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="position">9</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="DrawLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="drawnotebookbar|DrawLabel">Draw</property> + <style> + <class name="context-Draw"/> + <class name="context-OLE"/> + <class name="context-Frame"/> + <class name="context-DrawLine"/> + </style> + </object> + <packing> + <property name="position">9</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="sfxlo-PriorityHBox" id="MediaBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <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="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="SectionBottom27"> + <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="Media-NameGroup"> + <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:NameGroup</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> + <child> + <object class="GtkBox" id="GroupB26"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="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="GtkMenuToolButton" id="Draw-LineWidth"> + <object class="GtkToolButton" id="Media-AVMediaPlayer"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LineWidth</property> + <property name="action_name">.uno:AVMediaPlayer</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Draw-LineEndStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:LineEndStyle</property> - </object> - <packing> - <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -11178,16 +11631,18 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom54"> + <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">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-FillTransparence"> + <object class="GtkToolButton" id="Media-ToggleObjectRotateMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FillTransparence</property> + <property name="action_name">.uno:ToggleObjectRotateMode</property> </object> <packing> <property name="expand">False</property> @@ -11195,10 +11650,21 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-FillShadow"> + <object class="GtkToolButton" id="Media-FlipVertical"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FillShadow</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="Media-FlipHorizontal"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlipHorizontal</property> </object> <packing> <property name="expand">False</property> @@ -11216,11 +11682,67 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator41"> + <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="GtkSeparator" id="separator68"> + <object class="sfxlo-NotebookbarToolBox" id="first12"> + <property name="width_request">1000</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="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="separator31"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -11231,34 +11753,34 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">4</property> + <property name="position">3</property> </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-3"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ArrangeSection2"> + <object class="sfxlo-OptionalBox" id="Media-Section-ObjectAlign"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="svtlo-ManagedMenuButton" id="Draw-ConvertButton:MenuConvert"> + <object class="svtlo-ManagedMenuButton" id="Image-ConvertButton:MenuConvert2"> <property name="label" translatable="yes" context="drawnotebookbar|ConvertMenuButton">Convert</property> <property name="width_request">70</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="action_name">.uno:ChangeBezier</property> - <property name="image">changebezierImg2</property> + <property name="image">changebezierImg</property> <property name="relief">none</property> <property name="use_underline">True</property> <property name="image_position">top</property> @@ -11271,11 +11793,11 @@ </packing> </child> <child> - <object class="GtkBox" id="box2"> + <object class="GtkBox" id="box12"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkBox" id="AlignGroup1"> + <object class="GtkBox" id="AlignGroup2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -11286,7 +11808,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-ObjectAlignLeft2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignLeft</property> @@ -11297,7 +11819,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-AlignCenter"> + <object class="GtkToolButton" id="Image-AlignCenter2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignCenter</property> @@ -11308,7 +11830,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-ObjectAlignRight"> + <object class="GtkToolButton" id="Image-ObjectAlignRight2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignRight</property> @@ -11332,7 +11854,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-AlignUp2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignUp</property> @@ -11343,10 +11865,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-AlignMiddle"> + <object class="GtkToolButton" id="Image-AlignDown2"> <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> @@ -11354,10 +11876,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-AlignDown"> + <object class="GtkToolButton" id="Image-AlignMiddle2"> <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> @@ -11375,231 +11897,329 @@ <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-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="first14"> + <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="GtkSeparator" id="separator125"> + <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="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="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">1</property> </packing> </child> <child> - <object class="GtkBox" id="SendToFrontGroup1"> + <object class="sfxlo-NotebookbarToolBox" id="first15"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="OneStep1"> + <object class="GtkToolButton" id="Media-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-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="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:ObjectForwardOne</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">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="sfxlo-NotebookbarToolBox" id="BackgroundFront1"> + <object class="GtkToolButton" id="Media-ObjectBackOne"> <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:ObjectBackOne</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">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> + <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="drawnotebookbar|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="GtkSeparator" id="separator129"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom25"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> + <property name="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="padding">5</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> - <style> - <class name="priority-4"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">2</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator38"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="pack_type">end</property> + <property name="position">3</property> + </packing> + </child> + <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="drawnotebookbar|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="BezierGroup1"> + <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="SectionBottom56"> + <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="Draw-ToggleObjectBezierMode"> + <object class="GtkToolButton" id="Object-NameGroup"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectBezierMode</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="action_name">.uno:NameGroup</property> </object> <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="expand">False</property> + <property name="homogeneous">False</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="BezierGroup"> + <object class="GtkBox" id="GroupB43"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom71"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom26"> <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-BezierMove"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BezierMove</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Draw-BezierInsert"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BezierInsert</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Draw-BezierDelete"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BezierDelete</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Draw-BezierConvert"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BezierConvert</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Draw-BezierClose"> + <object class="GtkToolButton" id="Object-ToggleObjectBezierMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BezierClose</property> + <property name="action_name">.uno:AdvancedMode</property> </object> <packing> <property name="expand">False</property> @@ -11614,16 +12234,18 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="BackgroundFront2"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom30"> <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-BezierCutLine"> + <object class="GtkToolButton" id="Object-ToggleObjectRotateMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BezierCutLine</property> + <property name="action_name">.uno:ToggleObjectRotateMode</property> </object> <packing> <property name="expand">False</property> @@ -11631,10 +12253,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-BezierEdge"> + <object class="GtkToolButton" id="Object-FlipHorizontal"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BezierEdge</property> + <property name="action_name">.uno:FlipHorizontal</property> </object> <packing> <property name="expand">False</property> @@ -11642,10 +12264,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-BezierSmooth"> + <object class="GtkToolButton" id="Object-FlipVertical"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BezierSmooth</property> + <property name="action_name">.uno:FlipVertical</property> </object> <packing> <property name="expand">False</property> @@ -11653,10 +12275,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-BezierSymmetric"> + <object class="GtkToolButton" id="Object-Shear"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BezierSymmetric</property> + <property name="action_name">.uno:Shear</property> </object> <packing> <property name="expand">False</property> @@ -11664,10 +12286,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-BezierEliminatePoints"> + <object class="GtkToolButton" id="Object-CrookSlant"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BezierEliminatePoints</property> + <property name="action_name">.uno:CrookSlant</property> </object> <packing> <property name="expand">False</property> @@ -11685,11 +12307,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator83"> + <object class="GtkSeparator" id="separator37"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -11703,40 +12325,168 @@ <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">5</property> + <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="GroupGroup"> + <object class="sfxlo-OptionalBox" id="Object-Section-FormatLineArea"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom51"> + <object class="GtkBox" id="box14"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="toolbar_style">both</property> - <property name="show_arrow">False</property> - <property name="icon_size">3</property> + <property name="orientation">vertical</property> <child> - <object class="GtkToolButton" id="Draw-FormatGroup"> + <object class="sfxlo-NotebookbarToolBox" id="third3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatGroup</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FormatLine3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatLine</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third4"> + <property name="visible">True</property> + <property name="can_focus">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="first16"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Object-XLineStyle"> + <property name="width_request">100</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:XLineStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first19"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-XLineColor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:XLineColor</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom46"> + <property name="width_request">200</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-FillStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillStyle</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> @@ -11747,24 +12497,21 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB70"> + <object class="GtkBox" id="box18"> <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="SectionBottom52"> + <object class="sfxlo-NotebookbarToolBox" id="first20"> <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-EnterGroup"> + <object class="GtkToolButton" id="Object-LineEndStyle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:EnterGroup</property> + <property name="action_name">.uno:LineEndStyle</property> </object> <packing> <property name="expand">True</property> @@ -11779,21 +12526,19 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom53"> + <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-LeaveGroup"> + <object class="GtkToolButton" id="Object-FillShadow"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LeaveGroup</property> + <property name="action_name">.uno:FillShadow</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -11812,7 +12557,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator132"> + <object class="GtkSeparator" id="separator32"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -11826,43 +12571,139 @@ <property name="position">3</property> </packing> </child> - <style> - <class name="priority-2"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">1</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="3dGroup"> + <object class="sfxlo-OptionalBox" id="Object-Section-ObjectAlign"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="margin_right">5</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB73"> + <object class="svtlo-ManagedMenuButton" id="Object-ConvertButton:MenuConvert"> + <property name="label" translatable="yes" context="drawnotebookbar|ConvertMenuButton">Convert</property> + <property name="width_request">70</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:ChangeBezier</property> + <property name="image">changebezierImg</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + <property name="image_position">top</property> + <property name="always_show_image">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box17"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first38"> + <object class="GtkBox" id="AlignGroup4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> + <property name="orientation">vertical</property> <child> - <object class="GtkToolButton" id="Draw-ExtrusionToggle"> + <object class="sfxlo-NotebookbarToolBox" id="Align7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ExtrusionToggle</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-ObjectAlignLeft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignLeft</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-AlignCenter"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignCenter</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-ObjectAlignRight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignRight</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-AlignUp"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignUp</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-AlignDown"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignDown</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-AlignMiddle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignMiddle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> @@ -11872,72 +12713,134 @@ <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="vexpand">True</property> + <child> + <object class="GtkGrid" id="grid3"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="second39"> + <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="Draw-ExtrusionDepthFloater"> + <object class="GtkToolButton" id="Object-BringToFront"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ExtrusionDepthFloater</property> + <property name="action_name">.uno:BringToFront</property> </object> <packing> - <property name="expand">True</property> + <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="second4"> + <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-ExtrusionDirectionFloater"> + <object class="GtkToolButton" id="Object-SendToBack"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ExtrusionDirectionFloater</property> + <property name="action_name">.uno:SendToBack</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first18"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Draw-Extrusion3DColor"> + <object class="GtkToolButton" id="Object-ObjectForwardOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Extrusion3DColor</property> + <property name="action_name">.uno:ObjectForwardOne</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="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="GtkMenuToolButton" id="Draw-ExtrusionSurfaceFloater"> + <object class="GtkToolButton" id="Object-ObjectBackOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ExtrusionSurfaceFloater</property> + <property name="action_name">.uno:ObjectBackOne</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <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">2</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator138"> + <object class="GtkSeparator" id="separator86"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -11948,22 +12851,19 @@ <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-1"/> + <class name="priority-5"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">3</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -11972,22 +12872,22 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="DrawMenue"> + <object class="sfxlo-DropdownBox" id="Object-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB74"> + <object class="GtkBox" id="GroupB71"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="svtlo-ManagedMenuButton" id="Draw-DrawButton:MenuDraw"> - <property name="label" translatable="yes" context="drawnotebookbar|DrawMenuButton">D_raw</property> + <object class="svtlo-ManagedMenuButton" id="Object-ObjectButton:MenuObject"> + <property name="label" translatable="yes" context="drawnotebookbar|ObjectMenuButton">Object</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -12004,7 +12904,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom48"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom49"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -12013,7 +12913,7 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="Draw-FormatArea"> + <object class="GtkToolButton" id="Object-FormatArea"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12025,7 +12925,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-FormatLine"> + <object class="GtkToolButton" id="Object-FormatLine"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12037,7 +12937,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-TransformDialog"> + <object class="GtkToolButton" id="Object-TransformDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12071,7 +12971,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator71"> + <object class="GtkSeparator" id="separator88"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -12087,25 +12987,27 @@ <property name="position">3</property> </packing> </child> + <style> + <class name="Context-Frame"/> + <class name="Context-OLE"/> + </style> </object> <packing> - <property name="position">9</property> + <property name="position">10</property> </packing> </child> <child type="tab"> - <object class="GtkLabel" id="DrawLabel"> + <object class="GtkLabel" id="ObjectLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="drawnotebookbar|DrawLabel">Draw</property> + <property name="label" translatable="yes" context="drawnotebookbar|ObjectLabel">Object</property> <style> - <class name="context-Draw"/> - <class name="context-OLE"/> <class name="context-Frame"/> - <class name="context-DrawLine"/> + <class name="context-OLE"/> </style> </object> <packing> - <property name="position">9</property> + <property name="position">10</property> <property name="tab_fill">False</property> </packing> </child> @@ -12116,7 +13018,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-DropdownBox" id="ToolsMenu"> + <object class="sfxlo-DropdownBox" id="Tools-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -12148,7 +13050,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom25"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom63"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -12190,7 +13092,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator31"> + <object class="GtkSeparator" id="separator11"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -12207,19 +13109,19 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="ToolBoxContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Tools-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="MacroSection"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Macro"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom26"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom64"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12320,7 +13222,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator37"> + <object class="GtkSeparator" id="separator24"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12342,13 +13244,13 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="PresentationToolsSection"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Presentation"> <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="SectionBottom28"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom68"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12430,7 +13332,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator38"> + <object class="GtkSeparator" id="separator25"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12455,13 +13357,13 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom27"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom70"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12488,7 +13390,7 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB53"> + <object class="GtkBox" id="GroupB34"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12554,7 +13456,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator25"> + <object class="GtkSeparator" id="separator66"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12579,20 +13481,20 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection6"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB55"> + <object class="GtkBox" id="GroupB39"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom30"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom72"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">icons</property> @@ -12671,7 +13573,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom57"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom73"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">icons</property> @@ -12757,7 +13659,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator41"> + <object class="GtkSeparator" id="separator70"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12782,7 +13684,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection1"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12795,7 +13697,7 @@ <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom31"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom74"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">icons</property> @@ -12841,7 +13743,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom63"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom75"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">icons</property> @@ -12919,7 +13821,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection2"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12978,7 +13880,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom75"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom76"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">icons</property> @@ -13031,7 +13933,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator32"> + <object class="GtkSeparator" id="separator84"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -13055,9 +13957,6 @@ <property name="position">5</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui index 5ee200c9c856..5308080fd90c 100644 --- a/sd/uiconfig/simpress/ui/notebookbar.ui +++ b/sd/uiconfig/simpress/ui/notebookbar.ui @@ -61,188 +61,181 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="LineD"> + <object class="GtkMenuItem" id="MenuDraw-Line"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Line</property> </object> </child> <child> - <object class="GtkMenuItem" id="Freeline_UnfilledD"> + <object class="GtkMenuItem" id="MenuDraw-Freeline_Unfilled"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Freeline_Unfilled</property> </object> </child> <child> - <object class="GtkMenuItem" id="FreelineD"> + <object class="GtkMenuItem" id="MenuDraw-Freeline"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Freeline</property> </object> </child> <child> - <object class="GtkMenuItem" id="Bezier_UnfilledD"> + <object class="GtkMenuItem" id="MenuDraw-Bezier_Unfilled"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Bezier_Unfilled</property> </object> </child> <child> - <object class="GtkMenuItem" id="BezierFillD"> + <object class="GtkMenuItem" id="MenuDraw-BezierFill"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BezierFill</property> </object> </child> <child> - <object class="GtkMenuItem" id="Polygon_UnfilledD"> + <object class="GtkMenuItem" id="MenuDraw-Polygon_Unfilled"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Polygon_Unfilled</property> </object> </child> <child> - <object class="GtkMenuItem" id="Polygon_Diagonal_UnfilledD"> + <object class="GtkMenuItem" id="MenuDraw-Polygon_Diagonal_Unfilled"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Polygon_Diagonal_Unfilled</property> </object> </child> <child> - <object class="GtkMenuItem" id="Polygon_DiagonalD"> + <object class="GtkMenuItem" id="MenuDraw-Polygon_Diagonal"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Polygon_Diagonal</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator131"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="BasicShapesD"> + <object class="GtkMenuItem" id="MenuDraw-BasicShapes"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BasicShapes</property> </object> </child> <child> - <object class="GtkMenuItem" id="SymbolShapesD"> + <object class="GtkMenuItem" id="MenuDraw-SymbolShapes"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SymbolShapes</property> </object> </child> <child> - <object class="GtkMenuItem" id="ArrowShapesD"> + <object class="GtkMenuItem" id="MenuDraw-ArrowShapes"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ArrowShapes</property> </object> </child> <child> - <object class="GtkMenuItem" id="StarShapesD"> + <object class="GtkMenuItem" id="MenuDraw-StarShapes"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:StarShapes</property> </object> </child> <child> - <object class="GtkMenuItem" id="CalloutShapesD"> + <object class="GtkMenuItem" id="MenuDraw-CalloutShapes"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:CalloutShapes</property> </object> </child> <child> - <object class="GtkMenuItem" id="FlowChartShapesD"> + <object class="GtkMenuItem" id="MenuDraw-FlowChartShapes"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FlowChartShapes</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator134"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator2"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="DrawCaptionD"> + <object class="GtkMenuItem" id="MenuDraw-DrawCaption"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:DrawCaption</property> </object> </child> <child> - <object class="GtkMenuItem" id="VerticalCaptionD"> + <object class="GtkMenuItem" id="MenuDraw-VerticalCaption"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:VerticalCaption</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator135"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="DrawText3"> + <object class="GtkMenuItem" id="MenuDraw-DrawText"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:DrawText</property> </object> </child> <child> - <object class="GtkMenuItem" id="VerticalTextD"> + <object class="GtkMenuItem" id="MenuDraw-VerticalText"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:VerticalText</property> </object> </child> <child> - <object class="GtkMenuItem" id="InsertGraphicD2"> + <object class="GtkMenuItem" id="MenuDraw-FontWork"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertGraphic</property> + <property name="action_name">.uno:FontWork</property> </object> </child> <child> - <object class="GtkMenuItem" id="FontworkGalleryFloaterD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FontworkGalleryFloater</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="Text_MarqueeD"> + <object class="GtkMenuItem" id="MenuDraw-Text_Marquee"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Text_Marquee</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator136"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="ToggleObjectBezierModeD"> + <object class="GtkMenuItem" id="MenuDraw-NameGroup"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectBezierMode</property> + <property name="action_name">.uno:NameGroup</property> </object> </child> <child> - <object class="GtkMenuItem" id="ExtrusionToggleD"> + <object class="GtkMenuItem" id="MenuDraw-ObjectTitleDescription"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ExtrusionToggle</property> + <property name="action_name">.uno:ObjectTitleDescription</property> </object> </child> </object> @@ -323,163 +316,163 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="AddDirectD"> + <object class="GtkMenuItem" id="MenuFile-AddDirect"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AddDirect</property> </object> </child> <child> - <object class="GtkMenuItem" id="RecentFileListD"> + <object class="GtkMenuItem" id="MenuFile-RecentFileList"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:RecentFileList</property> </object> </child> <child> - <object class="GtkMenuItem" id="CloseDocD"> + <object class="GtkMenuItem" id="MenuFile-CloseDoc"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:CloseDoc</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator39"> + <object class="GtkSeparatorMenuItem" id="MenuFile-separator"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="SaveD"> + <object class="GtkMenuItem" id="MenuFile-Save"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Save</property> </object> </child> <child> - <object class="GtkMenuItem" id="SaveAsD"> + <object class="GtkMenuItem" id="MenuFile-SaveAs"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SaveAs</property> </object> </child> <child> - <object class="GtkMenuItem" id="SaveAsRemoteD"> + <object class="GtkMenuItem" id="MenuFile-SaveAsRemote"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SaveAsRemote</property> </object> </child> <child> - <object class="GtkMenuItem" id="NewGlobalDocD"> + <object class="GtkMenuItem" id="MenuFile-NewGlobalDoc"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:NewGlobalDoc</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator61"> + <object class="GtkSeparatorMenuItem" id="MenuFile-separator1"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="ExportToD"> + <object class="GtkMenuItem" id="MenuFile-ExportTo"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ExportTo</property> </object> </child> <child> - <object class="GtkMenuItem" id="ExportToPDFD"> + <object class="GtkMenuItem" id="MenuFile-ExportToPDF"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ExportToPDF</property> </object> </child> <child> - <object class="GtkMenuItem" id="ExportToEPUBD"> + <object class="GtkMenuItem" id="MenuFile-ExportToEPUB"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ExportToEPUB</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator44"> + <object class="GtkSeparatorMenuItem" id="MenuFile-separator2"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="SendMailD"> + <object class="GtkMenuItem" id="MenuFile-SendMail"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SendMail</property> </object> </child> <child> - <object class="GtkMenuItem" id="SendMailDocAsPDFD"> + <object class="GtkMenuItem" id="MenuFile-SendMailDocAsPDF"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SendMailDocAsPDF</property> </object> </child> <child> - <object class="GtkMenuItem" id="SendViaBluetoothD"> + <object class="GtkMenuItem" id="MenuFile-SendViaBluetooth"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SendViaBluetooth</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator48"> + <object class="GtkSeparatorMenuItem" id="MenuFile-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="PrintPreviewD"> + <object class="GtkMenuItem" id="MenuFile-PrintPreview"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:PrintPreview</property> </object> </child> <child> - <object class="GtkMenuItem" id="PrintDefaultD"> + <object class="GtkMenuItem" id="MenuFile-PrintDefault"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:PrintDefault</property> </object> </child> <child> - <object class="GtkMenuItem" id="PrinterSetupD"> + <object class="GtkMenuItem" id="MenuFile-PrinterSetup"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:PrinterSetup</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator50"> + <object class="GtkSeparatorMenuItem" id="MenuFile-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="SignatureD"> + <object class="GtkMenuItem" id="MenuFile-Signature"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Signature</property> </object> </child> <child> - <object class="GtkMenuItem" id="SignPDFD"> + <object class="GtkMenuItem" id="MenuFile-SignPDF"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SignPDF</property> </object> </child> <child> - <object class="GtkMenuItem" id="SetDocumentPropertiesD"> + <object class="GtkMenuItem" id="MenuFile-SetDocumentProperties"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SetDocumentProperties</property> @@ -492,409 +485,13 @@ </object> </child> <child> - <object class="GtkMenuItem" id="QuitD"> + <object class="GtkMenuItem" id="MenuFile-Quit"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Quit</property> </object> </child> </object> - <object class="GtkMenu" id="MenuGraphic"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkMenuItem" id="CropD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Crop</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ExternalEditD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ExternalEdit</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ChangePictureD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ChangePicture</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="CompressGraphicD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:CompressGraphic</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="SaveGraphicD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SaveGraphic</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator67"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ObjectMirrorVerticalD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectMirrorVertical</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ObjectMirrorHorizontalD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectMirrorHorizontal</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator124"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ChangeBezier1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ChangeBezier</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ChangePolygonD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ChangePolygon</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="convert_to_contourD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:convert_to_contour</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ConvertInto3DD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ConvertInto3D</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ConvertInto3DLatheFastD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ConvertInto3DLatheFast</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ConvertIntoBitmapD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ConvertIntoBitmap</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ConvertIntoMetaFileD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ConvertIntoMetaFile</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator128"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ImageMapDialogD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ImageMapDialog</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator142"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="AnimationEffectsD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AnimationEffects</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ObjectTitleDescription1"> - <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="MenuGraphic2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkMenuItem" id="InsertCaptionDialogD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:InsertCaptionDialog</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator60"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="CropD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Crop</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ExternalEditD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ExternalEdit</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ChangePictureD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ChangePicture</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="CompressGraphicD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:CompressGraphic</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="SaveGraphicD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SaveGraphic</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator62"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="RotateLeftD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:RotateLeft</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="RotateRightD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:RotateRight</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="Rotate180D"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Rotate180</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="FlipVerticalD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FlipVertical</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="FlipHorizontalD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator63"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ImageMapDialogD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ImageMapDialog</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator133"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="WrapOffD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:WrapOff</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="WrapOnD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:WrapOn</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="WrapIdealD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:WrapIdeal</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="WrapThroughD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:WrapThrough</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="WrapThroughTransparencyToggleD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:WrapThroughTransparencyToggle</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="WrapContourD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:WrapContour</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ContourDialogD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ContourDialog</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="WrapAnchorOnlyD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:WrapAnchorOnly</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="TextWrapD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:TextWrap</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator140"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="BringToFrontD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BringToFront</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ObjectForwardOneD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ObjectBackOneD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="SendToBackD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SendToBack</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="SetObjectToForegroundD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SetObjectToForeground</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="SetObjectToBackgroundD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SetObjectToBackground</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator137"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="AnchorMenuD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AnchorMenu</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator139"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="GraphicDialogD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:GraphicDialog</property> - </object> - </child> - </object> <object class="GtkMenu" id="MenuHelp"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -964,7 +561,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> - <property name="label" translatable="yes" context="notebookbar|Help">_Check for Updates...</property> + <property name="label" translatable="yes" context="impressnotebookbar|Help">_Check for Updates...</property> </object> </child> <child> @@ -1202,6 +799,85 @@ </object> </child> </object> + <object class="GtkMenu" id="MenuImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="MenuImage-ImageCrop"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Crop</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-ExternalEdit"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ExternalEdit</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-ChangePicture"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ChangePicture</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-CompressGraphic"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CompressGraphic</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-SaveGraphic"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SaveGraphic</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator62"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-ImageMapDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ImageMapDialog</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator139"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-NameGroup"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NameGroup</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-ObjectTitleDescription"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectTitleDescription</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-GraphicDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GraphicDialog</property> + </object> + </child> + </object> <object class="GtkMenu" id="MenuInsert"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1348,6 +1024,82 @@ </object> </child> </object> + <object class="GtkMenu" id="MenuMedia"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="MenuMedia-AVMediaPlayer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AVMediaPlayer</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuMedia-separator1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuMedia-NameGroup"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NameGroup</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuMedia-ObjectTitleDescription"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectTitleDescription</property> + </object> + </child> + </object> + <object class="GtkMenu" id="MenuObject"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="MenuObject-ChainFrames"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ChainFrames</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuObject-UnhainFrames"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:UnhainFrames</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuObject-separator"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuObject-NameGroup"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NameGroup</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuObject-ObjectTitleDescription"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectTitleDescription</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuObject-FrameDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FrameDialog</property> + </object> + </child> + </object> <object class="GtkMenu" id="MenuReference"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -2093,7 +1845,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> - <property name="label" translatable="yes" context="notebookbar|Tools">_Check for Updates...</property> + <property name="label" translatable="yes" context="impressnotebookbar|Tools">_Check for Updates...</property> </object> </child> <child> @@ -2307,11 +2059,6 @@ <property name="can_focus">False</property> <property name="pixbuf">cmd/lc_changebezier.png</property> </object> - <object class="GtkImage" id="changebezierImg2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="pixbuf">cmd/lc_changebezier.png</property> - </object> <object class="GtkImage" id="paragraphstylei"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -2335,7 +2082,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-DropdownBox" id="FileSection"> + <object class="sfxlo-DropdownBox" id="File-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -2419,7 +2166,7 @@ <property name="orientation">vertical</property> <child> <object class="svtlo-ManagedMenuButton" id="File-FileButton:MenuFile"> - <property name="label" translatable="yes" context="notebookbar|FileLabel">_File</property> + <property name="label" translatable="yes" context="impressnotebookbar|FileLabel">_File</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -2438,7 +2185,7 @@ </child> <child> <object class="svtlo-ManagedMenuButton" id="File-HelpButton:MenuHelp"> - <property name="label" translatable="yes" context="notebookbar|HelpMenuButton">_Help</property> + <property name="label" translatable="yes" context="impressnotebookbar|HelpMenuButton">_Help</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -2489,13 +2236,13 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="FileContainer"> + <object class="sfxlo-PriorityMergedHBox" id="File-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="NewSectio"> + <object class="sfxlo-OptionalBox" id="File-Section-New"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -2614,7 +2361,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="OpenSection"> + <object class="sfxlo-OptionalBox" id="File-Section-Open"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -2724,7 +2471,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SaveSection"> + <object class="sfxlo-OptionalBox" id="File-Section-Save"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -2846,7 +2593,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ExportSection"> + <object class="sfxlo-OptionalBox" id="File-Section-Export"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -2968,7 +2715,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="PrintSection"> + <object class="sfxlo-OptionalBox" id="File-Section-Print"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3090,7 +2837,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="PropertySection"> + <object class="sfxlo-OptionalBox" id="File-Section-Property"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3211,9 +2958,6 @@ <property name="position">5</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -3227,7 +2971,7 @@ <object class="GtkLabel" id="FileLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="notebookbar|FileLabel">File</property> + <property name="label" translatable="yes" context="impressnotebookbar|FileLabel">File</property> <property name="use_underline">True</property> </object> <packing> @@ -3241,7 +2985,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="PasteBox"> + <object class="GtkBox" id="Home-PasteBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3371,7 +3115,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="MenuSection"> + <object class="sfxlo-DropdownBox" id="Home-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -3386,7 +3130,7 @@ <property name="orientation">vertical</property> <child> <object class="svtlo-ManagedMenuButton" id="Home-HomeButton:MenuHome"> - <property name="label" translatable="yes" context="notebookbar|HomeMenuButton">_Home</property> + <property name="label" translatable="yes" context="impressnotebookbar|HomeMenuButton">_Home</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -3457,13 +3201,13 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="HomeContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Home-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="SlideSectio"> + <object class="sfxlo-OptionalBox" id="Home-Section-Slide"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3577,7 +3321,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="StyleSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-Style"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3654,7 +3398,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormatSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-Format"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3983,7 +3727,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ParagraphSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-Paragraph"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4306,7 +4050,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DrawSection2"> + <object class="sfxlo-OptionalBox" id="Home-Section-DrawSection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4571,7 +4315,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ArrangeSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-Arrange"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4703,7 +4447,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SlideshowSectionH"> + <object class="sfxlo-OptionalBox" id="Home-Section-Slideshow"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4807,9 +4551,6 @@ <property name="position">6</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -4843,7 +4584,7 @@ <object class="GtkLabel" id="HomeLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="notebookbar|HomeLabel">Home</property> + <property name="label" translatable="yes" context="impressnotebookbar|HomeLabel">Home</property> <property name="use_underline">True</property> <style> <class name="context-default"/> @@ -4861,13 +4602,13 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="InsertContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Insert-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="SlideSection"> + <object class="sfxlo-OptionalBox" id="Insert-Section-Slide"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4933,7 +4674,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="TableSection"> + <object class="sfxlo-OptionalBox" id="Insert-Section-Table"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5049,7 +4790,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ImageSection"> + <object class="sfxlo-OptionalBox" id="Insert-Section-Image"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5165,7 +4906,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="HyperlinkSection"> + <object class="sfxlo-OptionalBox" id="Insert-Section-Hyperlink"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5285,12 +5026,12 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FieldSection"> + <object class="sfxlo-OptionalBox" id="Insert-Section-Field"> <property name="visible">True</property> <property name="can_focus">False</property> <child> <object class="svtlo-ManagedMenuButton" id="Insert-FieldButton:MenuField"> - <property name="label" translatable="yes" context="notebookbar|FieldMenuButton">Fiel_d</property> + <property name="label" translatable="yes" context="impressnotebookbar|FieldMenuButton">Fiel_d</property> <property name="width_request">70</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -5334,7 +5075,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DrawTextSection"> + <object class="sfxlo-OptionalBox" id="Insert-Section-DrawText"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5519,7 +5260,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DrawSection"> + <object class="sfxlo-OptionalBox" id="Insert-Section-Draw"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5673,7 +5414,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SymbolSection"> + <object class="sfxlo-OptionalBox" id="Insert-Section-Symbol"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5688,7 +5429,7 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Insert-InsertSymbol"> + <object class="GtkToolButton" id="Insert-CharmapControl"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:CharmapControl</property> @@ -5791,9 +5532,6 @@ <property name="position">7</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -5802,7 +5540,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="InsertMenu"> + <object class="sfxlo-DropdownBox" id="Insert-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -5817,7 +5555,7 @@ <property name="orientation">vertical</property> <child> <object class="svtlo-ManagedMenuButton" id="Insert-InsertButton:MenuInsert"> - <property name="label" translatable="yes" context="notebookbar|InsertMenuButton">_Insert</property> + <property name="label" translatable="yes" context="impressnotebookbar|InsertMenuButton">_Insert</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -5902,7 +5640,7 @@ <object class="GtkLabel" id="InsertLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="notebookbar|InsertLabel">Insert</property> + <property name="label" translatable="yes" context="impressnotebookbar|InsertLabel">Insert</property> <property name="use_underline">True</property> </object> <packing> @@ -5917,7 +5655,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-DropdownBox" id="SlideMenu"> + <object class="sfxlo-DropdownBox" id="Slide-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -5932,7 +5670,7 @@ <property name="orientation">vertical</property> <child> <object class="svtlo-ManagedMenuButton" id="Slide-SlideButton:MenuSlide"> - <property name="label" translatable="yes" context="notebookbar|SlideMenuButton">S_lide</property> + <property name="label" translatable="yes" context="impressnotebookbar|SlideMenuButton">S_lide</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -6009,13 +5747,13 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="SlideContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Slide-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="PageFormatSection"> + <object class="sfxlo-OptionalBox" id="Slide-Section-PageFormat"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6131,7 +5869,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="InsertSlideSection"> + <object class="sfxlo-OptionalBox" id="Slide-Section-InsertSlide"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6248,7 +5986,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="InsertSlideSection1"> + <object class="sfxlo-OptionalBox" id="Slide-Section-ShowPage"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6365,7 +6103,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="NavigationSection"> + <object class="sfxlo-OptionalBox" id="Slide-Section-Navigation"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6458,7 +6196,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="MasterSlideSection"> + <object class="sfxlo-OptionalBox" id="Slide-Section-MasterSlide"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6575,7 +6313,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="MasterSlideSection1"> + <object class="sfxlo-OptionalBox" id="Slide-Section-MasterSlide1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6685,7 +6423,7 @@ <object class="GtkLabel" id="LayoutLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="notebookbar|LayoutLabel">Slide</property> + <property name="label" translatable="yes" context="impressnotebookbar|LayoutLabel">Slide</property> <property name="use_underline">True</property> </object> <packing> @@ -6698,7 +6436,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-DropdownBox" id="SlideshowMenu"> + <object class="sfxlo-DropdownBox" id="Slideshow-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -6713,7 +6451,7 @@ <property name="orientation">vertical</property> <child> <object class="svtlo-ManagedMenuButton" id="SlideShow-SlideShowButton:MenuSlideShow"> - <property name="label" translatable="yes" context="notebookbar|SlideShowMenuButton">_Slide Show</property> + <property name="label" translatable="yes" context="impressnotebookbar|SlideShowMenuButton">_Slide Show</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -6773,13 +6511,13 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="SlideshowContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Slideshow-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="SlideshowSection"> + <object class="sfxlo-OptionalBox" id="Slideshow-Section-Slideshow"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6907,7 +6645,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="PageSection"> + <object class="sfxlo-OptionalBox" id="Slideshow-Section-Page"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7032,7 +6770,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="MinimizeSlide"> + <object class="sfxlo-OptionalBox" id="Slideshow-Section-Minimize"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7191,7 +6929,7 @@ <object class="GtkLabel" id="SlideShowLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="notebookbar|ReferencesLabel">Slide Show</property> + <property name="label" translatable="yes" context="impressnotebookbar|ReferencesLabel">Slide Show</property> <property name="use_underline">True</property> </object> <packing> @@ -7204,7 +6942,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-DropdownBox" id="ReferenceMenue"> + <object class="sfxlo-DropdownBox" id="Reference-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -7219,7 +6957,7 @@ <property name="orientation">vertical</property> <child> <object class="svtlo-ManagedMenuButton" id="Review-ReviewButton:MenuReview"> - <property name="label" translatable="yes" context="notebookbar|ReviewMenuButton">_Review</property> + <property name="label" translatable="yes" context="impressnotebookbar|ReviewMenuButton">_Review</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -7278,13 +7016,13 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="ReviewContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Review-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="LanguageSection"> + <object class="sfxlo-OptionalBox" id="Review-Section-Language"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7412,7 +7150,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="AnnotationSection"> + <object class="sfxlo-OptionalBox" id="Review-Section-Annotation"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7612,9 +7350,6 @@ <property name="position">1</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -7648,7 +7383,7 @@ <object class="GtkLabel" id="ReviewLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="notebookbar|ReviewLabel">Review</property> + <property name="label" translatable="yes" context="impressnotebookbar|ReviewLabel">Review</property> <property name="use_underline">True</property> </object> <packing> @@ -7661,7 +7396,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-DropdownBox" id="ViewMenu"> + <object class="sfxlo-DropdownBox" id="View-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -7676,7 +7411,7 @@ <property name="orientation">vertical</property> <child> <object class="svtlo-ManagedMenuButton" id="View-ViewButton:MenuView"> - <property name="label" translatable="yes" context="notebookbar|ViewMenuButton">_View</property> + <property name="label" translatable="yes" context="impressnotebookbar|ViewMenuButton">_View</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -7736,13 +7471,13 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="ViewContainer"> + <object class="sfxlo-PriorityMergedHBox" id="View-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="ViewSection"> + <object class="sfxlo-OptionalBox" id="View-Section-View"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7874,7 +7609,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="HeaderSection"> + <object class="sfxlo-OptionalBox" id="View-Section-Header"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7929,7 +7664,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="MasterSection"> + <object class="sfxlo-OptionalBox" id="View-Section-Master"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -8050,7 +7785,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ZoomSection"> + <object class="sfxlo-OptionalBox" id="View-Section-Zoom"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -8170,7 +7905,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="VisibleSection"> + <object class="sfxlo-OptionalBox" id="View-Section-Visible"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -8360,7 +8095,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DisplayQualitySection"> + <object class="sfxlo-OptionalBox" id="View-Section-DisplayQuality"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -8484,7 +8219,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="NewSection"> + <object class="sfxlo-OptionalBox" id="View-Section-New"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -8541,9 +8276,6 @@ <property name="position">6</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -8577,7 +8309,7 @@ <object class="GtkLabel" id="ViewLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="notebookbar|ViewLabel">View</property> + <property name="label" translatable="yes" context="impressnotebookbar|ViewLabel">View</property> <property name="use_underline">True</property> </object> <packing> @@ -8590,13 +8322,13 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="TableContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Table-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="TableLayoutSection"> + <object class="sfxlo-OptionalBox" id="Table-Section-Layout"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -8766,7 +8498,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="MergeSection"> + <object class="sfxlo-OptionalBox" id="Table-Section-Merge"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -8887,7 +8619,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ColumnRowSection"> + <object class="sfxlo-OptionalBox" id="Table-Section-ColumnRow"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -9023,7 +8755,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SelectSection"> + <object class="sfxlo-OptionalBox" id="Table-Section-Select"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -9142,7 +8874,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="OptimizeSection"> + <object class="sfxlo-OptionalBox" id="Table-Section-Optimize"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -9340,9 +9072,6 @@ <property name="position">4</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -9351,7 +9080,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="TableSelection"> + <object class="sfxlo-DropdownBox" id="Table-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -9366,7 +9095,7 @@ <property name="orientation">vertical</property> <child> <object class="svtlo-ManagedMenuButton" id="Table-TableButton:MenuTable"> - <property name="label" translatable="yes" context="notebookbar|TableMenuButton">T_able</property> + <property name="label" translatable="yes" context="impressnotebookbar|TableMenuButton">T_able</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -9450,7 +9179,7 @@ <object class="GtkLabel" id="TableLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="notebookbar|TableLabel">Table</property> + <property name="label" translatable="yes" context="impressnotebookbar|TableLabel">Table</property> <property name="use_underline">True</property> <style> <class name="context-Table"/> @@ -9466,19 +9195,19 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="ImageContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Image-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="ColorSection"> + <object class="sfxlo-OptionalBox" id="Image-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="SectionBottom90"> + <object class="sfxlo-NotebookbarToolBox" id="Big"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -9488,7 +9217,7 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Image-InsertCaptionDialog"> + <object class="GtkToolButton" id="Image-AnimationEffects"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -9496,8 +9225,8 @@ <property name="action_name">.uno:AnimationEffects</property> </object> <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="expand">False</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -9508,50 +9237,110 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB68"> + <object class="GtkBox" id="SecondGroup"> <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="first15"> + <object class="GtkBox" id="box13"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-Crop"> + <object class="sfxlo-NotebookbarToolBox" id="first11"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Crop</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Image-CompressGraphic1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CompressGraphic</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Image-Crop1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Crop</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="second17"> + <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="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-SaveGraphic"> + <object class="GtkToolButton" id="Image-ToggleObjectRotateMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SaveGraphic</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="action_name">.uno:ToggleObjectRotateMode</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Image-FlipVertical"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlipVertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Image-FlipHorizontal"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlipHorizontal</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -9569,49 +9358,76 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB45"> + <object class="GtkSeparator" id="Image-Section-InsertCaptionDialog-Separator1"> + <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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-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="box3"> <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="first1"> + <object class="sfxlo-NotebookbarToolBox" id="third1"> <property name="visible">True</property> <property name="can_focus">False</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="Image-CompressGraphic"> + <object class="GtkToolButton" id="Draw-FormatLine1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CompressGraphic</property> + <property name="action_name">.uno:FormatLine</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="second1"> + <object class="sfxlo-NotebookbarToolBox" id="third2"> <property name="visible">True</property> <property name="can_focus">False</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="Image-ChangePicture"> + <object class="GtkToolButton" id="Draw-FormatArea1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ChangePicture</property> + <property name="action_name">.uno:FormatArea</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -9626,53 +9442,90 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="GroupB50"> + <object class="GtkBox" id="box6"> <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="first2"> + <object class="GtkBox" id="box7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-MirrorHorz"> + <object class="sfxlo-NotebookbarToolBox" id="first1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:MirrorHorz</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Draw-XLineStyle1"> + <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="sfxlo-NotebookbarToolBox" id="first2"> + <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-XLineColor1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:XLineColor</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="second2"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom18"> + <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="Image-MirrorVert"> + <object class="GtkToolButton" id="Draw-FillStyle1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:MirrorVert</property> + <property name="action_name">.uno:FillStyle</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -9687,11 +9540,11 @@ <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="GtkSeparator" id="separator122"> + <object class="GtkSeparator" id="separator60"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -9702,72 +9555,90 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">4</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> + <property name="position">1</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ColorSection2"> + <object class="sfxlo-OptionalBox" id="Image-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="GtkBox" id="GroupB72"> + <object class="svtlo-ManagedMenuButton" id="Image-ConvertButton:MenuConvert"> + <property name="label" translatable="yes" context="impressnotebookbar|ConvertMenuButton">Convert</property> + <property name="width_request">70</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:ChangeBezier</property> + <property name="image">changebezierImg</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + <property name="image_position">top</property> + <property name="always_show_image">True</property> + </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="valign">center</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="GrafModeGroup"> - <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="Image-GrafMode"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:GrafMode</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="GtkBox" id="GroupB35"> + <object class="GtkBox" id="AlignGroup3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="margin_right">5</property> + <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="GraphicFilterToolboxGroup"> + <object class="sfxlo-NotebookbarToolBox" id="Align5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Image-GraphicFilterToolbox"> + <object class="GtkToolButton" id="Image-ObjectAlignLeft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignLeft</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Image-AlignCenter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:GraphicFilterToolbox</property> + <property name="action_name">.uno:AlignCenter</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Image-ObjectAlignRight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignRight</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -9778,37 +9649,41 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom18"> + <object class="sfxlo-NotebookbarToolBox" id="Align6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="hexpand">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> - <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="Image-FormatLine2"> + <object class="GtkToolButton" id="Image-AlignUp"> <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:FormatLine</property> + <property name="action_name">.uno:AlignUp</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="Image-FormatArea2"> + <object class="GtkToolButton" id="Image-AlignDown"> <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:FormatArea</property> + <property name="action_name">.uno:AlignDown</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="Image-AlignMiddle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignMiddle</property> + </object> + <packing> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -9823,198 +9698,137 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator123"> - <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">1</property> </packing> </child> <style> - <class name="priority-6"/> + <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">2</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ColorSection1"> + <object class="sfxlo-OptionalBox" id="Image-Section-Arrange"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_right">5</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB75"> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="colorbox3"> + <object class="sfxlo-NotebookbarToolBox" id="first3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Image-GrafLuminance"> - <property name="width_request">130</property> + <object class="GtkToolButton" id="Image-BringToFront"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="margin_right">5</property> - <property name="action_name">.uno:GrafLuminance</property> + <property name="action_name">.uno:BringToFront</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="colorbox4"> + <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="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Image-GrafTransparence"> - <property name="width_request">130</property> + <object class="GtkToolButton" id="Image-SendToBack"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="margin_right">5</property> - <property name="action_name">.uno:GrafTransparence</property> + <property name="action_name">.uno:SendToBack</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">0</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> - <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="ColorSection3"> - <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="GroupB78"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="colorbox5"> + <object class="sfxlo-NotebookbarToolBox" id="first7"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Image-GrafContrast"> - <property name="width_request">130</property> + <object class="GtkToolButton" id="Image-ObjectForwardOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:GrafContrast</property> + <property name="action_name">.uno:ObjectForwardOne</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="colorbox6"> + <object class="sfxlo-NotebookbarToolBox" id="Second7"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Image-GrafGamma"> - <property name="width_request">130</property> + <object class="GtkToolButton" id="Image-ObjectBackOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:GrafGamma</property> + <property name="action_name">.uno:ObjectBackOne</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <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="separator90"> + <object class="GtkSeparator" id="separator123"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10025,7 +9839,7 @@ <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> @@ -10039,24 +9853,28 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ArrangeSection3"> + <object class="sfxlo-OptionalBox" id="Image-Section-FormatImageFilter"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="svtlo-ManagedMenuButton" id="Image-ConvertButton:MenuConvert"> - <property name="label" translatable="yes" context="notebookbar|ConvertMenuButton">Convert</property> - <property name="width_request">70</property> + <object class="sfxlo-NotebookbarToolBox" id="GraphicFilterToolboxGroup"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:ChangeBezier</property> - <property name="image">changebezierImg</property> - <property name="relief">none</property> - <property name="use_underline">True</property> - <property name="image_position">top</property> - <property name="always_show_image">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Image-GraphicFilterToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GraphicFilterToolbox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -10064,48 +9882,45 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Image-Section-ColorSettings1"> + <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="AlignGroup2"> + <object class="GtkBox" id="GroupB87"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align5"> + <object class="sfxlo-SidebarToolBox" id="colorbox3"> <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="Image-ObjectAlignLeft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectAlignLeft</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Image-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="Image-ObjectAlignRight"> + <object class="GtkMenuToolButton" id="Image-GrafLuminance"> + <property name="width_request">130</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectAlignRight</property> + <property name="valign">center</property> + <property name="action_name">.uno:GrafLuminance</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -10116,42 +9931,22 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align6"> + <object class="sfxlo-SidebarToolBox" id="colorbox4"> <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="Image-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="Image-AlignMiddle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AlignMiddle</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Image-AlignDown"> + <object class="GtkMenuToolButton" id="Image-GrafTransparence"> + <property name="width_request">130</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignDown</property> + <property name="valign">center</property> + <property name="action_name">.uno:GrafTransparence</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -10168,21 +9963,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator98"> - <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-2"/> </style> @@ -10190,46 +9970,39 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="padding">5</property> + <property name="position">5</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ArrangeSection4"> + <object class="sfxlo-OptionalBox" id="Image-Section-ColorSettings2"> <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="SendToFrontGroup3"> + <object class="GtkBox" id="GroupB90"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="OneStep3"> + <object class="sfxlo-SidebarToolBox" id="colorbox5"> <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="Image-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="Image-BringToFront"> + <object class="GtkMenuToolButton" id="Image-GrafContrast"> + <property name="width_request">130</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BringToFront</property> + <property name="valign">center</property> + <property name="action_name">.uno:GrafContrast</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -10240,31 +10013,22 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="BackgroundFront3"> + <object class="sfxlo-SidebarToolBox" id="colorbox6"> <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="Image-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="Image-SendToBack"> + <object class="GtkMenuToolButton" id="Image-GrafGamma"> + <property name="width_request">130</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SendToBack</property> + <property name="valign">center</property> + <property name="action_name">.uno:GrafGamma</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -10281,21 +10045,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator141"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -10303,12 +10052,9 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -10317,7 +10063,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="ImageMenue"> + <object class="sfxlo-DropdownBox" id="Image-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -10331,8 +10077,8 @@ <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="svtlo-ManagedMenuButton" id="Image-GraphicButton:MenuGraphic"> - <property name="label" translatable="yes" context="notebookbar|GraphicMenuButton">_Graphic</property> + <object class="svtlo-ManagedMenuButton" id="Image-GraphicButton:MenuImage"> + <property name="label" translatable="yes" context="impressnotebookbar|GraphicMenuButton">Image</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -10357,6 +10103,19 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> + <object class="GtkToolButton" id="Image-SaveGraphic"> + <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:SaveGraphic</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> <object class="GtkToolButton" id="Image-FormatArea"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -10444,7 +10203,7 @@ <object class="GtkLabel" id="ImageLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="notebookbar|ImageLabel">Image</property> + <property name="label" translatable="yes" context="impressnotebookbar|ImageLabel">Image</property> <property name="use_underline">True</property> <style> <class name="context-Graphic"/> @@ -10460,19 +10219,19 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="DrawContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Draw-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="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> @@ -10498,39 +10257,28 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="GroupB69"> + <object class="GtkBox" id="GroupB35"> <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="SectionBottom71"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom60"> <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"> + <object class="GtkToolButton" id="Draw-ToggleObjectBezierMode1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectRotateMode</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Draw-ToggleObjectBezierMode"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectBezierMode</property> + <property name="action_name">.uno:AdvancedMode</property> </object> <packing> <property name="expand">False</property> @@ -10545,7 +10293,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom49"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom61"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -10553,10 +10301,10 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-FlipVertical"> + <object class="GtkToolButton" id="Draw-ToggleObjectRotateMode1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipVertical</property> + <property name="action_name">.uno:ToggleObjectRotateMode</property> </object> <packing> <property name="expand">False</property> @@ -10564,7 +10312,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-FlipHorizontal"> + <object class="GtkToolButton" id="Draw-FlipHorizontal1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FlipHorizontal</property> @@ -10574,6 +10322,39 @@ <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-Shear1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Shear</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-CrookSlant"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CrookSlant</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -10589,7 +10370,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator66"> + <object class="GtkSeparator" id="separator63"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10611,29 +10392,62 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DrawTextSection1"> + <object class="sfxlo-OptionalBox" id="Draw-Section-FormatLineArea1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom44"> + <object class="GtkBox" id="box59"> <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> + <property name="orientation">vertical</property> <child> - <object class="GtkToolButton" id="Insert-Text1"> + <object class="sfxlo-NotebookbarToolBox" id="third10"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Text</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FormatLine2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatLine</property> + </object> + <packing> + <property name="expand">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">0</property> + </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-FormatArea2"> + <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> @@ -10644,59 +10458,311 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB65"> + <object class="GtkBox" id="box56"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="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="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first5"> + <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-XLineColor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:XLineColor</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom50"> + <property name="width_request">200</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FillStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillStyle</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </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="box8"> <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="shapes2"> + <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="Insert-Line1"> + <object class="GtkToolButton" id="Draw-LineEndStyle2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Line</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="SectionBottom54"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Insert-Polygon_Unfilled1"> + <object class="GtkToolButton" id="Draw-FillShadow"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Polygon_Unfilled</property> + <property name="action_name">.uno:FillShadow</property> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator68"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="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="svtlo-ManagedMenuButton" id="Draw-ConvertButton:MenuConvert"> + <property name="label" translatable="yes" context="impressnotebookbar|ConvertMenuButton">Convert</property> + <property name="width_request">70</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:ChangeBezier</property> + <property name="image">changebezierImg</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + <property name="image_position">top</property> + <property name="always_show_image">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="AlignGroup1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_right">5</property> + <property name="orientation">vertical</property> <child> - <object class="GtkToolButton" id="Insert-Bezier_Unfilled1"> + <object class="sfxlo-NotebookbarToolBox" id="Align1"> <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="GtkToolButton" id="Draw-ObjectAlignLeft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignLeft</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-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="Draw-ObjectAlignRight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignRight</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkToolButton" id="Insert-ArrowsToolbox1"> + <object class="sfxlo-NotebookbarToolBox" id="Align2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ArrowsToolbox</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Image-AlignUp1"> + <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="Image-AlignDown1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignDown</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Image-AlignMiddle1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignMiddle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> @@ -10706,50 +10772,113 @@ <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="vexpand">True</property> + <child> + <object class="GtkGrid" id="grid2"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="shapes4"> + <object class="sfxlo-NotebookbarToolBox" id="first8"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Insert-BasicShapes.rectangle1"> + <object class="GtkToolButton" id="Draw-BringToFront"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BasicShapes.rectangle</property> + <property name="action_name">.uno:BringToFront</property> </object> <packing> - <property name="expand">True</property> + <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="second1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Insert-BasicShapes.ellipse1"> + <object class="GtkToolButton" id="Draw-SendToBack"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BasicShapes.ellipse</property> + <property name="action_name">.uno:SendToBack</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Insert-DrawCaption1"> + <object class="GtkToolButton" id="Draw-ObjectForwardOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DrawCaption</property> + <property name="action_name">.uno:ObjectForwardOne</property> </object> <packing> - <property name="expand">True</property> + <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="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="Insert-LineToolbox1"> + <object class="GtkToolButton" id="Draw-ObjectBackOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LineToolbox</property> + <property name="action_name">.uno:ObjectBackOne</property> </object> <packing> <property name="expand">False</property> @@ -10758,20 +10887,19 @@ </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <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="separator70"> + <object class="GtkSeparator" id="separator67"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10782,76 +10910,117 @@ <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-6"/> + <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> <child> - <object class="sfxlo-OptionalBox" id="DrawSection1"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Bezier"> <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="GroupB71"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom56"> <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="GtkToolButton" id="Draw-ToggleObjectBezierMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ToggleObjectBezierMode</property> + </object> + <packing> + <property name="expand">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> + <child> + <object class="GtkBox" id="BezierGroup"> + <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="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">icons</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Insert-BasicShapes1"> + <object class="GtkToolButton" id="Draw-BezierMove"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BasicShapes</property> + <property name="action_name">.uno:BezierMove</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="Inser-SymbolShapes1"> + <object class="GtkToolButton" id="Draw-BezierInsert"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SymbolShapes</property> + <property name="action_name">.uno:BezierInsert</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="Inser-ArrowShapes1"> + <object class="GtkToolButton" id="Draw-BezierDelete"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ArrowShapes</property> + <property name="action_name">.uno:BezierDelete</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Insert-ConnectorToolbox1"> + <object class="GtkToolButton" id="Draw-BezierConvert"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ConnectorToolbox</property> + <property name="action_name">.uno:BezierConvert</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-BezierClose"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BezierClose</property> + </object> + <packing> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -10863,50 +11032,63 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="shapes7"> + <object class="sfxlo-NotebookbarToolBox" id="BackgroundFront2"> <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="Inser-StarShapes1"> + <object class="GtkToolButton" id="Draw-BezierCutLine"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:StarShapes</property> + <property name="action_name">.uno:BezierCutLine</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="Inser-CalloutShapes1"> + <object class="GtkToolButton" id="Draw-BezierEdge"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CalloutShapes</property> + <property name="action_name">.uno:BezierEdge</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Insert-FlowChartShapes1"> + <object class="GtkToolButton" id="Draw-BezierSmooth"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlowChartShapes</property> + <property name="action_name">.uno:BezierSmooth</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="Inser-Objects3DToolbox1"> + <object class="GtkToolButton" id="Draw-BezierSymmetric"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Objects3DToolbox</property> + <property name="action_name">.uno:BezierSymmetric</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-BezierEliminatePoints"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BezierEliminatePoints</property> + </object> + <packing> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -10925,7 +11107,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator84"> + <object class="GtkSeparator" id="separator66"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10936,41 +11118,71 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">4</property> + <property name="position">3</property> </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-4"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">4</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="StyleGroup"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Group"> <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"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom51"> + <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="GtkToolButton" id="Draw-FormatGroup"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatGroup</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> + <child> + <object class="GtkBox" id="GroupB70"> <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="third10"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom52"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">text</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-FormatLine2"> + <object class="GtkToolButton" id="Draw-EnterGroup"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatLine</property> + <property name="action_name">.uno:EnterGroup</property> </object> <packing> <property name="expand">True</property> @@ -10985,16 +11197,18 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="third13"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom53"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">text</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-FormatArea2"> + <object class="GtkToolButton" id="Draw-LeaveGroup"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatArea</property> + <property name="action_name">.uno:LeaveGroup</property> </object> <packing> <property name="expand">True</property> @@ -11012,49 +11226,92 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkBox" id="box56"> + <object class="GtkSeparator" id="separator132"> + <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-2"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-3D"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="GtkBox" id="GroupB73"> <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="first41"> + <object class="sfxlo-NotebookbarToolBox" id="first38"> <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-LineEndStyle"> + <object class="GtkToolButton" id="Draw-ExtrusionToggle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LineEndStyle</property> + <property name="action_name">.uno:ExtrusionToggle</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="second39"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Draw-XLineStyle"> - <property name="width_request">100</property> + <object class="GtkToolButton" id="Draw-ExtrusionDepthFloater"> <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:ExtrusionDepthFloater</property> </object> <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="expand">True</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Draw-XLineColor"> + <object class="GtkToolButton" id="Draw-ExtrusionDirectionFloater"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:XLineColor</property> + <property name="action_name">.uno:ExtrusionDirectionFloater</property> </object> <packing> <property name="expand">True</property> @@ -11062,18 +11319,286 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="Draw-LineWidth"> - <property name="width_request">100</property> + <object class="GtkMenuToolButton" id="Draw-Extrusion3DColor"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:LineWidth</property> + <property name="action_name">.uno:Extrusion3DColor</property> </object> <packing> <property name="expand">False</property> <property name="homogeneous">False</property> </packing> </child> + <child> + <object class="GtkMenuToolButton" id="Draw-ExtrusionSurfaceFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ExtrusionSurfaceFloater</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator138"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">3</property> + </packing> + </child> + <style> + <class name="priority-1"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> + </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="Draw-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="GroupB74"> + <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="Draw-DrawButton:MenuDraw"> + <property name="label" translatable="yes" context="impressnotebookbar|DrawMenuButton">D_raw</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="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="SectionBottom48"> + <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="Draw-FormatArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:FormatArea</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-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="Draw-TransformDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:TransformDialog</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator71"> + <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-Draw"/> + <class name="context-OLE"/> + <class name="context-Frame"/> + </style> + </object> + <packing> + <property name="position">9</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="DrawLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="impressnotebookbar|DrawLabel">Draw</property> + <style> + <class name="context-Draw"/> + <class name="context-OLE"/> + <class name="context-Frame"/> + </style> + </object> + <packing> + <property name="position">9</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="sfxlo-PriorityHBox" id="MediaBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <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="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="SectionBottom27"> + <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="Media-AnimationEffects"> + <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:AnimationEffects</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> + <child> + <object class="GtkBox" id="GroupB45"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="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="GtkToolButton" id="Media-AVMediaPlayer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AVMediaPlayer</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -11082,20 +11607,21 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom50"> - <property name="width_request">200</property> + <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="Draw-FillStyle"> + <object class="GtkToolButton" id="Media-ToggleObjectRotateMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FillStyle</property> + <property name="action_name">.uno:ToggleObjectRotateMode</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -11110,11 +11636,67 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator68"> + <object class="GtkSeparator" id="separator41"> + <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="first6"> + <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="separator31"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -11129,30 +11711,30 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-3"/> </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="Media-Section-ObjectAlign"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="svtlo-ManagedMenuButton" id="Draw-ConvertButton:MenuConvert"> - <property name="label" translatable="yes" context="notebookbar|ConvertMenuButton">Convert</property> + <object class="svtlo-ManagedMenuButton" id="Media-ConvertButton:MenuConvert"> + <property name="label" translatable="yes" context="impressnotebookbar|ConvertMenuButton">Convert</property> <property name="width_request">70</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="action_name">.uno:ChangeBezier</property> - <property name="image">changebezierImg2</property> + <property name="image">changebezierImg</property> <property name="relief">none</property> <property name="use_underline">True</property> <property name="image_position">top</property> @@ -11165,11 +11747,12 @@ </packing> </child> <child> - <object class="GtkBox" id="box2"> + <object class="GtkBox" id="box12"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_right">5</property> <child> - <object class="GtkBox" id="AlignGroup1"> + <object class="GtkBox" id="AlignGroup2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -11180,7 +11763,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-ObjectAlignLeft"> + <object class="GtkToolButton" id="Media-ObjectAlignLeft"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignLeft</property> @@ -11191,7 +11774,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-AlignCenter"> + <object class="GtkToolButton" id="Media-AlignCenter"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignCenter</property> @@ -11202,7 +11785,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-ObjectAlignRight"> + <object class="GtkToolButton" id="Media-ObjectAlignRight"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignRight</property> @@ -11226,7 +11809,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-AlignUp"> + <object class="GtkToolButton" id="Media-AlignUp"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignUp</property> @@ -11237,10 +11820,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-AlignMiddle"> + <object class="GtkToolButton" id="Media-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> @@ -11248,10 +11831,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-AlignDown"> + <object class="GtkToolButton" id="Media-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> @@ -11269,191 +11852,332 @@ <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-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="GtkSeparator" id="separator125"> + <object class="sfxlo-NotebookbarToolBox" id="first14"> <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="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="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="Media-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-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="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="first15"> + <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-ObjectForwardOne"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectForwardOne</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="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="sfxlo-NotebookbarToolBox" id="BackgroundFront1"> + <object class="GtkToolButton" id="Media-ObjectBackOne"> <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:ObjectBackOne</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">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> + <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="GtkSeparator" id="separator129"> + <object class="svtlo-ManagedMenuButton" id="media:MenuMedia"> + <property name="label" translatable="yes" context="impressnotebookbar|MediaMenuButton">_Media</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="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="SectionBottom25"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> + <property name="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="padding">5</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> - <style> - <class name="priority-3"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">2</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator38"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="pack_type">end</property> + <property name="position">3</property> + </packing> + </child> + <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="impressnotebookbar|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="GroupGroup"> + <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="SectionBottom51"> + <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="Draw-FormatGroup"> + <object class="GtkToolButton" id="Object-AnimationEffects"> <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="vexpand">True</property> + <property name="action_name">.uno:AnimationEffects</property> </object> <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="expand">False</property> + <property name="homogeneous">False</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="GroupB70"> + <object class="GtkBox" id="GroupB55"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom52"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom26"> <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-EnterGroup"> + <object class="GtkToolButton" id="Object-ToggleObjectBezierMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:EnterGroup</property> + <property name="action_name">.uno:AdvancedMode</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -11465,7 +12189,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom53"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom30"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -11473,13 +12197,57 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-LeaveGroup"> + <object class="GtkToolButton" id="Object-ToggleObjectRotateMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LeaveGroup</property> + <property name="action_name">.uno:ToggleObjectRotateMode</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-FlipHorizontal"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlipHorizontal</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-FlipVertical"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlipVertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-Shear"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Shear</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-CrookSlant"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CrookSlant</property> + </object> + <packing> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -11498,7 +12266,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator132"> + <object class="GtkSeparator" id="separator37"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -11512,39 +12280,35 @@ <property name="position">3</property> </packing> </child> - <style> - <class name="priority-2"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="3dGroup"> + <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="GroupB73"> + <object class="GtkBox" id="box14"> <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="first38"> + <object class="sfxlo-NotebookbarToolBox" id="third3"> <property name="visible">True</property> <property name="can_focus">False</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-ExtrusionToggle"> + <object class="GtkToolButton" id="Draw-FormatLine3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ExtrusionToggle</property> + <property name="action_name">.uno:FormatLine</property> </object> <packing> <property name="expand">True</property> @@ -11559,53 +12323,178 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="second39"> + <object class="sfxlo-NotebookbarToolBox" id="third4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">icons</property> + <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-ExtrusionDepthFloater"> + <object class="GtkToolButton" id="Draw-FormatArea3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ExtrusionDepthFloater</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="GtkToolButton" id="Draw-ExtrusionDirectionFloater"> + <object class="sfxlo-NotebookbarToolBox" id="first16"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ExtrusionDirectionFloater</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Object-XLineStyle"> + <property name="width_request">100</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:XLineStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first19"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-XLineColor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:XLineColor</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom46"> + <property name="width_request">200</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-FillStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillStyle</property> </object> <packing> <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box18"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first20"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Draw-Extrusion3DColor"> + <object class="GtkToolButton" id="Object-LineEndStyle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Extrusion3DColor</property> + <property name="action_name">.uno:LineEndStyle</property> </object> <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="expand">True</property> + <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom47"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Draw-ExtrusionSurfaceFloater"> + <object class="GtkToolButton" id="Object-FillShadow"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ExtrusionSurfaceFloater</property> + <property name="action_name">.uno:FillShadow</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -11623,7 +12512,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator138"> + <object class="GtkSeparator" id="separator32"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -11637,14 +12526,297 @@ <property name="position">3</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-ObjectAlign"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Object-ConvertButton:MenuConvert"> + <property name="label" translatable="yes" context="impressnotebookbar|ConvertMenuButton">Convert</property> + <property name="width_request">70</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:ChangeBezier</property> + <property name="image">changebezierImg</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + <property name="image_position">top</property> + <property name="always_show_image">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box17"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="AlignGroup4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_right">5</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-ObjectAlignLeft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignLeft</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-AlignCenter"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignCenter</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-ObjectAlignRight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignRight</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-AlignUp"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignUp</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-AlignDown"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignDown</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-AlignMiddle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignMiddle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> <style> - <class name="priority-1"/> + <class name="priority-6"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">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="vexpand">True</property> + <child> + <object class="GtkGrid" id="grid3"> + <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-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="second4"> + <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-SendToBack"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SendToBack</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first18"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-ObjectForwardOne"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectForwardOne</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="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">0</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator95"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-5"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> </packing> </child> </object> @@ -11655,24 +12827,24 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="DrawMenue"> + <object class="sfxlo-DropdownBox" id="Object-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB74"> + <object class="GtkBox" id="GroupB71"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="svtlo-ManagedMenuButton" id="Draw-DrawButton:MenuDraw"> - <property name="label" translatable="yes" context="notebookbar|DrawMenuButton">D_raw</property> + <object class="svtlo-ManagedMenuButton" id="Object-ObjectButton:MenuObject"> + <property name="label" translatable="yes" context="impressnotebookbar|ObjectMenuButton">Object</property> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="valign">center</property> <property name="vexpand">True</property> @@ -11687,7 +12859,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom48"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom49"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -11696,7 +12868,7 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="Draw-FormatArea"> + <object class="GtkToolButton" id="Object-FormatArea"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -11708,7 +12880,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-FormatLine"> + <object class="GtkToolButton" id="Object-FormatLine"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -11720,7 +12892,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-TransformDialog"> + <object class="GtkToolButton" id="Object-TransformDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -11750,11 +12922,11 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="pack_type">end</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator71"> + <object class="GtkSeparator" id="separator88"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -11771,28 +12943,26 @@ </packing> </child> <style> - <class name="context-Draw"/> - <class name="context-OLE"/> - <class name="context-Frame"/> + <class name="Context-Frame"/> + <class name="Context-OLE"/> </style> </object> <packing> - <property name="position">9</property> + <property name="position">10</property> </packing> </child> <child type="tab"> - <object class="GtkLabel" id="DrawLabel"> + <object class="GtkLabel" id="ObjectLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="notebookbar|DrawLabel">Draw</property> + <property name="label" translatable="yes" context="impressnotebookbar|ObjectLabel">Object</property> <style> - <class name="context-Draw"/> - <class name="context-OLE"/> <class name="context-Frame"/> + <class name="context-OLE"/> </style> </object> <packing> - <property name="position">9</property> + <property name="position">10</property> <property name="tab_fill">False</property> </packing> </child> @@ -11801,7 +12971,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-DropdownBox" id="ToolsMenu"> + <object class="sfxlo-DropdownBox" id="Tools-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -11816,7 +12986,7 @@ <property name="orientation">vertical</property> <child> <object class="svtlo-ManagedMenuButton" id="Tools-ToolsButton:MenuTools"> - <property name="label" translatable="yes" context="notebookbar|ToolsMenuButton">_Tools</property> + <property name="label" translatable="yes" context="impressnotebookbar|ToolsMenuButton">_Tools</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -11833,7 +13003,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom25"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom58"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -11875,7 +13045,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator31"> + <object class="GtkSeparator" id="separator25"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -11892,19 +13062,19 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="ToolBoxContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Tools-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="MacroSection"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Macro"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom26"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom63"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12005,7 +13175,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator37"> + <object class="GtkSeparator" id="separator70"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12027,13 +13197,13 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="PresentationToolsSection"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Presentation"> <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="SectionBottom28"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom64"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12126,7 +13296,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator38"> + <object class="GtkSeparator" id="separator84"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12151,13 +13321,13 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom27"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom68"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12184,7 +13354,7 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB53"> + <object class="GtkBox" id="GroupB50"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12250,7 +13420,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator25"> + <object class="GtkSeparator" id="separator86"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12275,20 +13445,20 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection6"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB55"> + <object class="GtkBox" id="GroupB54"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom30"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom70"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">icons</property> @@ -12367,7 +13537,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom57"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom72"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">icons</property> @@ -12453,7 +13623,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator41"> + <object class="GtkSeparator" id="separator89"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12478,20 +13648,20 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection1"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB54"> + <object class="GtkBox" id="GroupB56"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom31"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom73"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">icons</property> @@ -12537,7 +13707,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom63"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom74"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">icons</property> @@ -12615,13 +13785,13 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection2"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB56"> + <object class="GtkBox" id="GroupB65"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12727,7 +13897,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator32"> + <object class="GtkSeparator" id="separator90"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12751,9 +13921,6 @@ <property name="position">5</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -12770,7 +13937,7 @@ <object class="GtkLabel" id="DevLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="notebookbar|DevLabel">Tools</property> + <property name="label" translatable="yes" context="impressnotebookbar|DevLabel">Tools</property> <property name="use_underline">True</property> </object> <packing> |