sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui | 6641 ++++++++------ 1 file changed, 4189 insertions(+), 2452 deletions(-)
New commits: commit d6ba6e4d31b872a175146f20cfb625cd520d7dc0 Author: andreas kainz <kain...@gmail.com> AuthorDate: Mon Nov 19 01:17:33 2018 +0100 Commit: andreas_kainz <kain...@gmail.com> CommitDate: Wed Nov 21 10:13:18 2018 +0100 NB impress groupedbar compact big update and sync Change-Id: I8156912bb6158716ef9923b53d8f1ade6c89648b Reviewed-on: https://gerrit.libreoffice.org/63555 Tested-by: Jenkins Reviewed-by: andreas_kainz <kain...@gmail.com> (cherry picked from commit f1a02fdd43615a4016dc1f2cf44e32c001c36549) Reviewed-on: https://gerrit.libreoffice.org/63634 diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui index 786da0641c0e..c5ba816d3332 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.22.1 --> <interface domain="sd"> <requires lib="gtk+" version="3.18"/> <requires lib="LibreOffice" version="1.0"/> @@ -7,46 +7,153 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="ExtrusionToggleD1"> + <object class="GtkMenuItem" id="3D-ExtrusionToggle"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ExtrusionToggle</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator138"> + <object class="GtkSeparatorMenuItem" id="3D-separator1"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="ExtrusionTiltDownD"> + <object class="GtkMenuItem" id="3D-ExtrusionTiltDown"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ExtrusionTiltDown</property> </object> </child> <child> - <object class="GtkMenuItem" id="ExtrusionTiltUpD"> + <object class="GtkMenuItem" id="3D-ExtrusionTiltUp"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ExtrusionTiltUp</property> </object> </child> <child> - <object class="GtkMenuItem" id="ExtrusionTiltLeftD"> + <object class="GtkMenuItem" id="3D-ExtrusionTiltLeft"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ExtrusionTiltLeft</property> </object> </child> <child> - <object class="GtkMenuItem" id="ExtrusionTiltRightD"> + <object class="GtkMenuItem" id="3D-ExtrusionTiltRight"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ExtrusionTiltRight</property> </object> </child> + <child> + <object class="GtkSeparatorMenuItem" id="3D-separator2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="3D-Window3D"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Window3D</property> + </object> + </child> + </object> + <object class="GtkMenu" id="MenuArrange"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <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="WrapLeftD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:WrapLeft</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="WrapRightD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:WrapRight</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="WrapThroughTransparentD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:WrapThroughTransparent</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="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="separator132"> + <property name="visible">True</property> + <property name="can_focus">False</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> </object> <object class="GtkMenu" id="MenuCalculate"> <property name="visible">True</property> @@ -1015,44 +1122,6 @@ </object> </child> </object> - <object class="GtkMenu" id="MenuGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkMenuItem" id="ShowRuler"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ShowRuler</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="GridVisibleD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:GridVisible</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="GridUseD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:GridUse</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="HelplinesMoveD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:HelplinesMove</property> - </object> - </child> - </object> <object class="GtkMenu" id="MenuGroup"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1253,147 +1322,160 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="PhotoAlbumDialogD"> + <object class="GtkMenuItem" id="MenuInsert-PhotoAlbumDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:PhotoAlbumDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="AnimationObjectsD"> + <object class="GtkMenuItem" id="MenuInsert-AnimationObjects"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AnimationObjects</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator80"> + <object class="GtkSeparatorMenuItem" id="MenuInsert-separator1"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="GalleryD"> + <object class="GtkMenuItem" id="MenuInsert-Gallery"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Gallery</property> </object> </child> <child> - <object class="GtkMenuItem" id="TwainSelectD"> + <object class="GtkMenuItem" id="MenuInsert-TwainSelect"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:TwainSelect</property> </object> </child> <child> - <object class="GtkMenuItem" id="InsertAVMediaD"> + <object class="GtkMenuItem" id="MenuInsert-InsertAVMedia"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertAVMedia</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator41"> + <object class="GtkSeparatorMenuItem" id="MenuInsert-separator2"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="InsertObjectD"> + <object class="GtkMenuItem" id="MenuInsert-InsertObject"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertObject</property> </object> </child> <child> - <object class="GtkMenuItem" id="ImportFromFile"> + <object class="GtkMenuItem" id="MenuInsert-ImportFromFile"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ImportFromFile</property> </object> </child> <child> - <object class="GtkMenuItem" id="InsertMathD"> + <object class="GtkMenuItem" id="MenuInsert-InsertMath"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertMath</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator43"> + <object class="GtkSeparatorMenuItem" id="MenuInsert-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="DrawTextD"> + <object class="GtkMenuItem" id="MenuInsert-DrawText"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Text</property> </object> </child> <child> - <object class="GtkMenuItem" id="FontworkGalleryFloaterD"> + <object class="GtkMenuItem" id="MenuInsert-FontworkGalleryFloater"> <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="InsertObjectFloatingFrame"> + <object class="GtkMenuItem" id="MenuInsert-InsertObjectFloatingFrame"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertObjectFloatingFrame</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator46"> + <object class="GtkSeparatorMenuItem" id="MenuInsert-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="HyperlinkDialogD"> + <object class="GtkMenuItem" id="MenuInsert-HyperlinkDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:HyperlinkDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="CapturePointD"> + <object class="GtkMenuItem" id="MenuInsert-CapturePoint"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:CapturePoint</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator76"> + <object class="GtkSeparatorMenuItem" id="MenuInsert-separator5"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="InsertPageFieldD"> + <object class="GtkMenuItem" id="MenuInsert-InsertPageField"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertPageField</property> </object> </child> <child> - <object class="GtkMenuItem" id="InsertPagesFieldD"> + <object class="GtkMenuItem" id="MenuInsert-InsertPagesField"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertPagesField</property> </object> </child> <child> - <object class="GtkMenuItem" id="HeaderAndFooterD"> + <object class="GtkMenuItem" id="MenuInsert-HeaderAndFooter"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:HeaderAndFooter</property> </object> </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuInsert-separator"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuInsert-SelectBackgroundD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SelectBackground</property> + </object> + </child> </object> <object class="GtkMenu" id="MenuMasterPage"> <property name="visible">True</property> @@ -1427,6 +1509,37 @@ </object> </child> </object> + <object class="GtkMenu" id="MenuMedia"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="MenuMedia-AVMediaPlayer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AVMediaPlayer</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuMedia-separator1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuMedia-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="MenuOLE"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1919,7 +2032,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" context="notebookbar_groupedbar_compact|Menu" translatable="yes">_Check for Updates...</property> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|Menu">_Check for Updates...</property> </object> </child> <child> @@ -1947,277 +2060,318 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="InsertSlideD"> + <object class="GtkMenuItem" id="MenuSlide-Presentation"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertSlide</property> + <property name="action_name">.uno:Presentation</property> </object> </child> <child> - <object class="GtkMenuItem" id="DuplicateSlide"> + <object class="GtkMenuItem" id="MenuSlide-PresentationCurrentSlide"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DuplicateSlide</property> + <property name="action_name">.uno:PresentationCurrentSlide</property> </object> </child> <child> - <object class="GtkMenuItem" id="DeleteSlide"> + <object class="GtkSeparatorMenuItem" id="MenuSlide-separator1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DeleteSlide</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator102"> + <object class="GtkMenuItem" id="MenuSlide-RehearseTimings"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:RehearseTimings</property> </object> </child> <child> - <object class="GtkMenuItem" id="ModifyPageD"> + <object class="GtkMenuItem" id="MenuSlide-CustomShowDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ModifyPage</property> + <property name="action_name">.uno:CustomShowDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="SlideSetupD"> + <object class="GtkMenuItem" id="MenuSlide-Remote"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SlideSetup</property> + <property name="action_name">.uno:Remote</property> </object> </child> <child> - <object class="GtkMenuItem" id="SelectBackgroundD"> + <object class="GtkSeparatorMenuItem" id="MenuSlide-separator2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SelectBackground</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator104"> + <object class="GtkMenuItem" id="MenuSlide-PresentationDialog"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:PresentationDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="InsertMasterPageD"> + <object class="GtkSeparatorMenuItem" id="MenuSlide-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertMasterPage</property> </object> </child> <child> - <object class="GtkMenuItem" id="DeleteMasterPageD"> + <object class="GtkMenuItem" id="MenuSlide-InsertSlide"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DeleteMasterPage</property> + <property name="action_name">.uno:InsertSlide</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuSlide-DuplicateSlide"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DuplicateSlide</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuSlide-DeleteSlide"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DeleteSlide</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator103"> + <object class="GtkSeparatorMenuItem" id="MenuSlide-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="PresentationLayoutD"> + <object class="GtkMenuItem" id="MenuSlide-PresentationLayout"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:PresentationLayout</property> </object> </child> <child> - <object class="GtkMenuItem" id="DisplayMasterBackgroundD"> + <object class="GtkMenuItem" id="MenuSlide-InsertMasterPage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertMasterPage</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuSlide-DeleteMasterPage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DeleteMasterPage</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuSlide-DisplayMasterBackground"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:DisplayMasterBackground</property> </object> </child> <child> - <object class="GtkMenuItem" id="DisplayMasterObjectsD"> + <object class="GtkMenuItem" id="MenuSlide-DisplayMasterObjects"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:DisplayMasterObjects</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator157"> + <object class="GtkSeparatorMenuItem" id="MenuSlide-separator5"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="HideSlideD"> + <object class="GtkMenuItem" id="MenuSlide-SummaryPage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:HideSlide</property> + <property name="action_name">.uno:SummaryPage</property> </object> </child> <child> - <object class="GtkMenuItem" id="ShowSlideD"> + <object class="GtkMenuItem" id="MenuSlide-ExpandPage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ShowSlide</property> + <property name="action_name">.uno:ExpandPage</property> </object> </child> <child> - <object class="GtkMenuItem" id="RenameSlideD"> + <object class="GtkSeparatorMenuItem" id="MenuSlide-separator6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:RenameSlide</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator153"> + <object class="GtkMenuItem" id="MenuSlide-ShowSlide"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:ShowSlide</property> </object> </child> <child> - <object class="GtkMenuItem" id="ImportSlideFromFileD"> + <object class="GtkMenuItem" id="MenuSlide-HideSlide"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ImportSlideFromFile</property> + <property name="action_name">.uno:HideSlide</property> </object> </child> <child> - <object class="GtkMenuItem" id="SummaryPageD"> + <object class="GtkMenuItem" id="MenuSlide-MoveSlideUp"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SummaryPage</property> + <property name="action_name">.uno:MoveSlideUp</property> </object> </child> <child> - <object class="GtkMenuItem" id="ExpandPageD"> + <object class="GtkMenuItem" id="MenuSlide-MoveSlideDown"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ExpandPage</property> + <property name="action_name">.uno:MoveSlideDown</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator165"> + <object class="GtkSeparatorMenuItem" id="MenuSlide-separator7"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="MoveSlideUpD"> + <object class="GtkMenuItem" id="MenuSlide-PresentationMinimizer"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:MoveSlideUp</property> + <property name="action_name">.uno:PresentationMinimizer</property> </object> </child> <child> - <object class="GtkMenuItem" id="MoveSlideDownD"> + <object class="GtkMenuItem" id="MenuSlide-SlideSetup"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:MoveSlideDown</property> + <property name="action_name">.uno:SlideSetup</property> </object> </child> </object> - <object class="GtkMenu" id="MenuSlideShow"> + <object class="GtkMenu" id="MenuSnap"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="PresentationD"> + <object class="GtkMenuItem" id="MenuSnap-CapturePoint"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Presentation</property> + <property name="action_name">.uno:CapturePoint</property> </object> </child> <child> - <object class="GtkMenuItem" id="PresentationCurrentSlideD"> + <object class="GtkMenuItem" id="MenuSnap-GlueInsertPoint"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:PresentationCurrentSlide</property> + <property name="action_name">.uno:GlueInsertPoint</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator57"> + <object class="GtkSeparatorMenuItem" id="MenuSnap-separator1"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="RehearseTimingsD"> + <object class="GtkMenuItem" id="MenuSnap-GridVisible"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:RehearseTimings</property> + <property name="action_name">.uno:GridVisible</property> </object> </child> <child> - <object class="GtkMenuItem" id="CustomShowDialogD"> + <object class="GtkMenuItem" id="MenuSnap-GridFront"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CustomShowDialog</property> + <property name="action_name">.uno:GridFront</property> </object> </child> <child> - <object class="GtkMenuItem" id="RemoteD"> + <object class="GtkMenuItem" id="MenuSnap-HelplinesMove"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:HelplinesMove</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuSnap-separator2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Remote</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator106"> + <object class="GtkMenuItem" id="MenuSnap-HelplinesVisible"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:HelplinesVisible</property> </object> </child> <child> - <object class="GtkMenuItem" id="SlideChangeWindowD"> + <object class="GtkMenuItem" id="MenuSnap-HelplinesFront"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SlideChangeWindow</property> + <property name="action_name">.uno:HelplinesFront</property> </object> </child> <child> - <object class="GtkMenuItem" id="CustomAnimationD"> + <object class="GtkSeparatorMenuItem" id="MenuSnap-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CustomAnimation</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator114"> + <object class="GtkMenuItem" id="MenuSnap-GridUse"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:GridUse</property> </object> </child> <child> - <object class="GtkMenuItem" id="OutputQualityColorD2"> + <object class="GtkMenuItem" id="MenuSnap-HelplinesUse"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:OutputQualityColor</property> + <property name="action_name">.uno:HelplinesUse</property> </object> </child> <child> - <object class="GtkMenuItem" id="OutputQualityGrayscaleD2"> + <object class="GtkMenuItem" id="MenuSnap-SnapFrame"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:OutputQualityGrayscale</property> + <property name="action_name">.uno:SnapFrame</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator127"> + <object class="GtkMenuItem" id="MenuSnap-SnapPoints"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:SnapPoints</property> </object> </child> <child> - <object class="GtkMenuItem" id="PresentationMinimizerD2"> + <object class="GtkMenuItem" id="MenuSnap-SnapBorder"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:PresentationMinimizer</property> + <property name="action_name">.uno:SnapBorder</property> </object> </child> <child> - <object class="GtkMenuItem" id="PresentationDialogD"> + <object class="GtkSeparatorMenuItem" id="MenuSnap-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:PresentationDialog</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuSnap-ShowRuler"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ShowRuler</property> </object> </child> </object> @@ -2325,7 +2479,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" context="notebookbar_groupedbar_compact|Tools" translatable="yes">_Check for Updates...</property> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|Tools">_Check for Updates...</property> </object> </child> <child> @@ -2538,7 +2692,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-PriorityHBox" id="DefaultBox"> + <object class="sfxlo-PriorityHBox" id="DefaultContainer"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_left">5</property> @@ -2567,7 +2721,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="SearchDialog"> + <object class="GtkToolButton" id="Tools-SearchDialog"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="action_name">.uno:SearchDialog</property> @@ -2585,16 +2739,16 @@ </packing> </child> <child> - <object class="svtlo-ManagedMenuButton" id="menub:MenuSettings"> + <object class="svtlo-ManagedMenuButton" id="Tools-Menu:MenuSettings"> <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|menub">_Menu</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">False</property> <property name="valign">center</property> <property name="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> @@ -2623,7 +2777,7 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="HelpIndex1"> + <object class="GtkToolButton" id="Tools-HelpIndex"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="action_name">.uno:HelpIndex</property> @@ -2641,14 +2795,14 @@ </packing> </child> <child> - <object class="svtlo-ManagedMenuButton" id="toolsb:MenuTools"> + <object class="svtlo-ManagedMenuButton" id="Tools-Tools:MenuTools"> <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|toolsb">_Tools</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">False</property> <property name="relief">none</property> <property name="use_underline">True</property> - <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -2697,9 +2851,9 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Open"> + <object class="GtkMenuToolButton" id="File-Open"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="action_name">.uno:Open</property> </object> <packing> @@ -2708,9 +2862,9 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="Save"> + <object class="GtkMenuToolButton" id="File-Save"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="action_name">.uno:Save</property> </object> <packing> @@ -2718,6 +2872,17 @@ <property name="homogeneous">True</property> </packing> </child> + <child> + <object class="GtkToolButton" id="File-Print"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="action_name">.uno:Print</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -2730,16 +2895,15 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="fileb:MenuFile"> + <object class="svtlo-ManagedMenuButton" id="File-File:MenuFile"> <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|fileb">_File</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">False</property> - <property name="valign">center</property> - <property name="vexpand">True</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> @@ -2747,33 +2911,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="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="Print"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Print</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -2801,9 +2938,10 @@ <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator1"> + <object class="GtkSeparator" id="separator9"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_bottom">3</property> <property name="orientation">vertical</property> </object> <packing> @@ -2825,10 +2963,9 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Paste1"> + <object class="GtkMenuToolButton" id="Edit-Paste"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="vexpand">False</property> + <property name="can_focus">True</property> <property name="action_name">.uno:Paste</property> </object> <packing> @@ -2837,9 +2974,9 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Undo1"> + <object class="GtkToolButton" id="Edit-Undo"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="action_name">.uno:Undo</property> </object> <packing> @@ -2848,9 +2985,9 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Redo1"> + <object class="GtkToolButton" id="Edit-Redo"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="action_name">.uno:Redo</property> </object> <packing> @@ -2870,16 +3007,15 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="editb:MenuEdit"> + <object class="svtlo-ManagedMenuButton" id="Edit-Edit:MenuEdit"> <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|editb">_Edit</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">False</property> - <property name="valign">center</property> - <property name="vexpand">True</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> @@ -2897,9 +3033,9 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="Cut"> + <object class="GtkToolButton" id="Edit-Cut"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="action_name">.uno:Cut</property> </object> <packing> @@ -2908,9 +3044,9 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Copy"> + <object class="GtkToolButton" id="Edit-Copy"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="action_name">.uno:Copy</property> </object> <packing> @@ -2951,11 +3087,13 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> + <property name="valign">baseline</property> + <property name="margin_bottom">3</property> <property name="orientation">vertical</property> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="padding">5</property> <property name="pack_type">end</property> <property name="position">3</property> @@ -2967,10 +3105,10 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="DefaultContainer"> + <object class="sfxlo-PriorityMergedHBox" id="DefaultContaine"> <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="SectionSlideShow"> + <object class="sfxlo-OptionalBox" id="Default-Section-Slide"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> @@ -2993,55 +3131,54 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box50"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom36"> <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="sfxlo-NotebookbarToolBox" id="SectionBottom3"> + <object class="GtkToolButton" id="Default-Presentation"> <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="Presentation"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Presentation</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> + <property name="action_name">.uno:Presentation</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="homogeneous">False</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom36"> + <object class="GtkToolButton" id="Default-PresentationCurrentSlide"> <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="PresentationCurrentSlide2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:PresentationCurrentSlide</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> + <property name="action_name">.uno:PresentationCurrentSlide</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-InsertPage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertPage</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-AssignLayout"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:AssignLayout</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -3056,15 +3193,15 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="slideshowb:MenuSlideShow"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|reviewb">_Slide Show</property> + <object class="svtlo-ManagedMenuButton" id="Default-Slide:MenuSlide"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|reviewb">S_lide</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">False</property> <property name="halign">start</property> <property name="relief">none</property> <property name="use_underline">True</property> - <property name="focus_on_click">False</property> <property name="always_show_image">True</property> </object> <packing> @@ -3073,34 +3210,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="opacity">0.92000000000000004</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="SlideChangeWindow3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SlideChangeWindow</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> @@ -3123,12 +3232,12 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SectionSlideShow1"> + <object class="sfxlo-OptionalBox" id="Default-Section-Draw"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator11"> + <object class="GtkSeparator" id="separator18"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -3141,25 +3250,47 @@ </packing> </child> <child> - <object class="GtkBox" id="Section4"> + <object class="GtkBox" id="Section6"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box3"> + <object class="GtkBox" id="box44"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom4"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom35"> <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="InsertPage"> + <object class="GtkToolButton" id="Default-Draw-Line"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Line</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-Draw-LineToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineToolbox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-Draw-ArrowsToolbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertPage</property> + <property name="action_name">.uno:ArrowsToolbox</property> </object> <packing> <property name="expand">False</property> @@ -3173,52 +3304,69 @@ <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="GtkBox" id="box8"> - <property name="visible">True</property> - <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="default:MenuSlide"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphstylet">S_lide</property> + <object class="GtkSeparator" id="separator21"> <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> + <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="hexpand">True</property> + <property name="orientation">vertical</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="padding">5</property> + <property name="position">1</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop4"> + <object class="sfxlo-NotebookbarToolBox" id="shapes13"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="opacity">0.92156862745098034</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="ModifyPage2"> + <object class="GtkToolButton" id="Default-BasicShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ModifyPage</property> + <property name="action_name">.uno:BasicShapes</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-SymbolShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SymbolShapes</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-ArrowShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ArrowShapes</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-ConnectorToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ConnectorToolbox</property> + </object> + <packing> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -3229,89 +3377,32 @@ <property name="position">2</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> - </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="SectionInsert"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> - <child> - <object class="GtkSeparator" id="separator6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="Section5"> - <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="SectionBottom6"> + <object class="GtkSeparator" id="separator27"> <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="InsertGraphic3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:InsertGraphic</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="padding">5</property> + <property name="position">3</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom7"> + <object class="sfxlo-NotebookbarToolBox" id="LineA20"> <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="DrawText3"> + <object class="GtkToolButton" id="Default-XLineColor"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Text</property> + <property name="action_name">.uno:XLineColor</property> </object> <packing> <property name="expand">False</property> @@ -3322,7 +3413,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">4</property> </packing> </child> </object> @@ -3333,161 +3424,75 @@ </packing> </child> <child> - <object class="GtkBox" id="box13"> + <object class="GtkBox" id="box51"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="insertText:MenuInsert"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|insertText">_Insert</property> + <object class="svtlo-ManagedMenuButton" id="Default-Draw:MenuDraw"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|draw">D_raw</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">False</property> <property name="halign">start</property> <property name="relief">none</property> <property name="use_underline">True</property> - <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <style> - <class name="priority-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="SectionDraw"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> - <child> - <object class="GtkSeparator" id="separator18"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="Section6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkBox" id="box44"> - <property name="visible">True</property> - <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom35"> + <object class="sfxlo-NotebookbarToolBox" id="shapes14"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="hexpand">True</property> <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="ArrowsToolbox2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ArrowsToolbox</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="LineToolbox1"> + <object class="GtkToolButton" id="Default-StarShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LineToolbox</property> + <property name="action_name">.uno:StarShapes</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator21"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40"> - <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="BasicShapes1"> + <object class="GtkToolButton" id="Default-CalloutShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BasicShapes</property> + <property name="action_name">.uno:CalloutShapes</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="ArrowShapes1"> + <object class="GtkToolButton" id="Default-FlowChartShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ArrowShapes</property> + <property name="action_name">.uno:FlowChartShapes</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="FlowChartShapes1"> + <object class="GtkToolButton" id="Default-Objects3DToolbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlowChartShapes</property> + <property name="action_name">.uno:Objects3DToolbox</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -3495,74 +3500,47 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</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="box51"> - <property name="visible">True</property> - <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="draw:MenuDraw"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|draw">D_raw</property> + <object class="GtkSeparator" id="separator62"> <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> + <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="position">0</property> + <property name="padding">5</property> + <property name="position">2</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop6"> + <object class="sfxlo-NotebookbarToolBox" id="LineB22"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="opacity">0.92156862745098034</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="ToggleObjectBezierMode1"> + <object class="GtkToolButton" id="Default-FillColor"> <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> - <child> - <object class="GtkToolButton" id="CustomAnimation4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:CustomAnimation</property> + <property name="action_name">.uno:FillColor</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> </object> @@ -3580,22 +3558,22 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-5"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits