diff options
| author | andreas kainz <kainz.a@gmail.com> | 2017-10-13 01:45:29 +0200 |
|---|---|---|
| committer | andreas_kainz <kainz.a@gmail.com> | 2017-10-13 01:46:41 +0200 |
| commit | d029193e8a4172cd2b08db203d6ec091749d15bf (patch) | |
| tree | 0a75856c94dc8d59d60147a79e0ac7b9f849dc31 | |
| parent | 3cbb6e73ecbff5d83be817c0dab680c5d925c6fa (diff) | |
update notebookbar with better dropdown menues
Change-Id: I1af49673e4eab35ea33d8d306773eef41c97807b
Reviewed-on: https://gerrit.libreoffice.org/43356
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
Tested-by: andreas_kainz <kainz.a@gmail.com>
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_compact.ui | 1630 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 56 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 54 |
3 files changed, 1584 insertions, 156 deletions
diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_compact.ui index 2139141761ee..b1c771b3cd21 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui @@ -245,6 +245,331 @@ </object> </child> </object> + <object class="GtkMenu" id="MenuEdit"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="undoi2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Undo</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="redod2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Redo</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="repeati2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Repeat</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator102"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="cutd2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Cut</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="copyd2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Copy</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="pasted2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Paste</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="pastespeciald2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PasteSpecial</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="pasteunformatted2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PasteUnformatted</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator104"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="SelectAlld2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SelectAll</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="SelectionModeDefaultD2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SelectionModeDefault</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="SelectionModeBlockD2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SelectionModeBlock</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="SelectTextModeD2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SelectTextMode</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="ShadowCursorD2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ShadowCursor</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator106"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="FocusToFindbarD2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">vnd.sun.star.findbar:FocusToFindbar</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="SearchDialogD2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SearchDialog</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="GotoPageD2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GotoPage</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator108"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="TrackChangesD2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:TrackChanges</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="ShowTrackedChangesD2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ShowTrackedChanges</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="AcceptTrackedChangesD2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AcceptTrackedChanges</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator110"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="ProtectTraceChangeModeD2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ProtectTraceChangeMode</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="CompareDocumentsD2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CompareDocuments</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MergeDocumentsD2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:MergeDocuments</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator111"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="EditHyperlinkD2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:EditHyperlink</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="EditFootnoteD2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:EditFootnote</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="IndexEntryDialogD2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:IndexEntryDialog</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="AuthoritiesEntryDialogD2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AuthoritiesEntryDialog</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="FieldDialog2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FieldDialog</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="LinkDialogD2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LinkDialog</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="ImageMapDialogD2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ImageMapDialog</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="ObjectMenueD2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectMenue</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="ChangeDatabaseFieldD2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ChangeDatabaseField</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator112"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="SwitchControlDesignModeD2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SwitchControlDesignMode</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="EditDocD2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:EditDoc</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator123"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MacroRecorderD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:MacroRecorder</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="RunMacroD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RunMacro</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="BasicIDEAppearD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BasicIDEAppear</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="ScriptOrganizerD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ScriptOrganizer</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MacroSignatureD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:MacroSignature</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MacroSignature"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:MacroSignature</property> + </object> + </child> + </object> <object class="GtkMenu" id="MenuFile"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -506,6 +831,234 @@ </object> </child> </object> + <object class="GtkMenu" id="MenuFormat"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="GrowD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Grow</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="ShrinkD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Shrink</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator78"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="BoldD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Bold</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="ItalicD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Italic</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="UnderlineD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Underline</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator79"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="ShadowedD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Shadowed</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="OutlineFontD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:OutlineFont</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="StrikeoutD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Strikeout</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="OverlineD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Overline</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator95"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="InsertSymbolD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertSymbol</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="SuperScript1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SuperScript</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="SubScriptD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SubScript</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator97"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="ChangeCaseToUpperD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ChangeCaseToUpper</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="ChangeCaseToLowerD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ChangeCaseToLower</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="ChangeCaseRotateCaseD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ChangeCaseRotateCase</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator98"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="ChangeCaseToSentenceCaseD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ChangeCaseToSentenceCase</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="ChangeCaseToTitleCaseD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ChangeCaseToTitleCase</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="ChangeCaseToToggleCaseD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ChangeCaseToToggleCase</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator155"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="InsertNonBreakingSpaceD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertNonBreakingSpace</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="InsertHardHyphenD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertHardHyphen</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="InsertSoftHyphenD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertSoftHyphen</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="InsertZWSPD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertZWSP</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="InsertZWNBSPD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertZWNBSP</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="InsertLRMD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertLRM</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="InsertRLMD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertRLM</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator156"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="InsertRLMD1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontDialog</property> + </object> + </child> + </object> <object class="GtkMenu" id="MenuGraphic"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1565,6 +2118,60 @@ <property name="action_name">.uno:LineNumberingDialog</property> </object> </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator121"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenubarD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Menubar</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="SidebarB"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Sidebar</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="StatusbarD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:StatusBarVisible</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator122"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="GalleryD1"> + <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="NavigatorD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Navigator</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="ViewDataSourceBrowserD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ViewDataSourceBrowser</property> + </object> + </child> </object> <object class="GtkMenu" id="MenuWrap"> <property name="visible">True</property> @@ -2122,48 +2729,59 @@ </packing> </child> <child> - <object class="GtkBox" id="StylesBox"> + <object class="GtkBox" id="FormatBox"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom7"> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop1"> <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="StyleApply"> + <object class="GtkToolButton" id="CharFontName1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="hexpand">True</property> - <property name="action_name">.uno:StyleApply</property> + <property name="action_name">.uno:CharFontName</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="FormatPaintbrush"> + <object class="GtkToolButton" id="FontHeight1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontHeight</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="FormatPaintbrush1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FormatPaintbrush</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="ResetAttributes"> + <object class="GtkToolButton" id="ResetAttributes1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ResetAttributes</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -2174,7 +2792,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator3"> + <object class="GtkSeparator" id="separator125"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -2186,17 +2804,6 @@ <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="FormatBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="sfxlo-NotebookbarToolBox" id="ExtTop4"> <property name="visible">True</property> @@ -2273,7 +2880,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> @@ -2334,7 +2941,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <child> @@ -2419,7 +3026,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">3</property> </packing> </child> <child> @@ -2508,11 +3115,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">4</property> </packing> </child> <child> - <object class="GtkBox" id="SidebarBox"> + <object class="GtkBox" id="FormatBox1"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -2532,17 +3139,160 @@ <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="svtlo-ManagedMenuButton" id="formatb:MenuFormat"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_full|formatb">F_ormat</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="valign">center</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkBox" id="StylesBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom70"> + <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="Sidebar"> + <object class="GtkToolButton" id="StyleApply"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Sidebar</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:StyleApply</property> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> + <child> + <object class="GtkToolButton" id="TitleParaStyle"> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:TitleParaStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Heading1ParaStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:Heading1ParaStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Heading2ParaStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:Heading2ParaStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Heading3ParaStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:Heading3ParaStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="TextBodyParaStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:TextBodyParaStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="QuoteParaStyle"> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:QuoteParaStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="PreformattedParaStyle"> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:PreformattedParaStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -2551,7 +3301,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator9"> + <object class="GtkSeparator" id="separator124"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -2571,7 +3321,92 @@ </packing> </child> <child> - <placeholder/> + <object class="GtkBox" id="StylesBoxExt"> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom7"> + <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="EmphasisCharStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:EmphasisCharStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="StrongEmphasisCharStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:StrongEmphasisCharStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="QuoteCharStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:QuoteCharStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="SourceCharStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:SourceCharStyle</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="GtkSeparator" id="separator3"> + <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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> </child> <child> <placeholder/> @@ -2608,7 +3443,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -2619,19 +3454,35 @@ </packing> </child> <child> + <object class="svtlo-ManagedMenuButton" id="editb:MenuEdit"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_full|editb">_Edit</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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> <object class="svtlo-ManagedMenuButton" id="menub: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="can_focus">False</property> <property name="receives_default">False</property> - <property name="valign">start</property> + <property name="valign">center</property> <property name="relief">none</property> <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> </object> @@ -3000,7 +3851,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="valign">start</property> <property name="relief">none</property> <property name="use_underline">True</property> </object> @@ -3050,44 +3900,35 @@ <property name="show_arrow">False</property> <child> <object class="GtkMenuToolButton" id="Size"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="is_important">True</property> <property name="action_name">.uno:AttributePageSize</property> - <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> <object class="GtkMenuToolButton" id="Margin"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="is_important">True</property> <property name="action_name">.uno:PageMargin</property> - <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> <object class="GtkMenuToolButton" id="Orientation"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="is_important">True</property> <property name="action_name">.uno:Orientation</property> - <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -3095,13 +3936,11 @@ <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="is_important">True</property> <property name="action_name">.uno:PageColumnType</property> - <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -3142,33 +3981,25 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="InsertBreak"> - <property name="use_action_appearance">False</property> + <object class="GtkToolButton" id="TitlePageDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="is_important">True</property> - <property name="action_name">.uno:InsertBreak</property> - <property name="use_underline">True</property> + <property name="action_name">.uno:TitlePageDialog</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> <child> - <object class="GtkToolButton" id="LineNumberingDialog"> - <property name="use_action_appearance">False</property> + <object class="GtkToolButton" id="Watermark"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="is_important">True</property> - <property name="action_name">.uno:LineNumberingDialog</property> - <property name="use_underline">True</property> + <property name="action_name">.uno:Watermark</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> @@ -3203,63 +4034,84 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="belowspacing"> + <object class="sfxlo-NotebookbarToolBox" id="belowspacing1"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkToolButton" id="LeftParaMargin"> - <property name="use_action_appearance">False</property> + <object class="GtkToolButton" id="LeftParaMargin1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="is_important">True</property> <property name="action_name">.uno:LeftParaMargin</property> - <property name="use_underline">True</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="belowspacing"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkToolButton" id="RightParaMargin"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="is_important">True</property> <property name="action_name">.uno:RightParaMargin</property> - <property name="use_underline">True</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="sfxlo-NotebookbarToolBox" id="belowspacing2"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkToolButton" id="AboveSpacing"> + <object class="GtkToolButton" id="AboveSpacing1"> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="is_important">True</property> <property name="action_name">.uno:AboveSpacing</property> - <property name="use_underline">True</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">2</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="belowspacing3"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkToolButton" id="BelowSpacing"> - <property name="use_action_appearance">False</property> + <object class="GtkToolButton" id="BelowSpacing2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="is_important">True</property> <property name="action_name">.uno:BelowSpacing</property> - <property name="use_underline">True</property> </object> <packing> <property name="expand">True</property> @@ -3270,7 +4122,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <child> @@ -3283,7 +4135,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> </object> @@ -3294,7 +4146,65 @@ </packing> </child> <child> - <placeholder/> + <object class="GtkBox" id="PageLayoutBox2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom69"> + <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="InsertBreak1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="action_name">.uno:InsertBreak</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="LineNumberingDialog1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="action_name">.uno:LineNumberingDialog</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="separator120"> + <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">3</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> </child> <child> <object class="sfxlo-PriorityHBox" id="InsertMenuBox3"> @@ -3344,7 +4254,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="valign">start</property> <property name="relief">none</property> <property name="use_underline">True</property> </object> @@ -3643,7 +4552,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="valign">start</property> <property name="relief">none</property> <property name="use_underline">True</property> </object> @@ -4057,7 +4965,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="valign">start</property> <property name="relief">none</property> <property name="use_underline">True</property> </object> @@ -4294,17 +5201,6 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Zoom1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Zoom</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> <object class="GtkToolButton" id="ZoomOptimal"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -4413,6 +5309,76 @@ </packing> </child> <child> + <object class="GtkBox" id="ToolbarBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom68"> + <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="Menubar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Menubar</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Sidebar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Sidebar</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="StatusBarVisible"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:StatusBarVisible</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="GtkSeparator" id="separator119"> + <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">3</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> <object class="sfxlo-PriorityHBox" id="ViebBox"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -4460,7 +5426,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="valign">start</property> <property name="relief">none</property> <property name="use_underline">True</property> </object> @@ -4474,7 +5439,7 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> </object> @@ -5143,7 +6108,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="valign">start</property> <property name="relief">none</property> <property name="use_underline">True</property> </object> @@ -5674,7 +6638,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="valign">start</property> <property name="relief">none</property> <property name="use_underline">True</property> </object> @@ -6221,7 +7184,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="valign">start</property> <property name="relief">none</property> <property name="use_underline">True</property> </object> @@ -6265,61 +7227,358 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> + <object class="GtkBox" id="DrawTextBox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom66"> + <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="InsertCaptionDialog4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertCaptionDialog</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="GtkSeparator" id="separator117"> + <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">3</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> <child> - <placeholder/> + <object class="GtkBox" id="LineBox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom62"> + <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="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="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom67"> + <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="LineEndStyle2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineEndStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkMenuToolButton" id="XLineStyle1"> + <property name="use_action_appearance">False</property> + <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="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> + <child> + <object class="GtkMenuToolButton" id="LineWidth1"> + <property name="use_action_appearance">False</property> + <property name="width_request">100</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:LineWidth</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">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="GtkSeparator" id="separator114"> + <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">4</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> <child> - <placeholder/> + <object class="GtkBox" id="FillBox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom63"> + <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="FormatArea3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatArea</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom64"> + <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="FillStyle1"> + <property name="width_request">200</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="AddTextBox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AddTextBox</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="GtkSeparator" id="separator115"> + <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">4</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> <child> - <placeholder/> + <object class="GtkBox" id="ArrangeGroup1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom65"> + <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="ObjectForwardOne1"> + <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">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="ObjectBackOne2"> + <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">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="GtkSeparator" id="separator116"> + <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">3</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> </child> <child> - <placeholder/> + <object class="GtkBox" id="GroupBox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="frame:MenuWrap"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_full|wrapb">Wrap</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="relief">none</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator118"> + <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">3</property> + </packing> + </child> + <child> + <object class="svtlo-ManagedMenuButton" id="frame:MenuAlign"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_full|alignb">Align</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="relief">none</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">10</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> </child> <child> <placeholder/> @@ -6328,7 +7587,68 @@ <placeholder/> </child> <child> - <placeholder/> + <object class="sfxlo-PriorityHBox" id="drawb:MenuDraw1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <child> + <object class="GtkSeparator" id="separator113"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom61"> + <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="FrameDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FrameDialog</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="svtlo-ManagedMenuButton" id="frame:MenuDraw"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|insertb">Object</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> </child> </object> <packing> @@ -6339,7 +7659,7 @@ <object class="GtkLabel" id="FrameLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="notebookbar|FrameLabel">Frame / OLE</property> + <property name="label" translatable="yes" context="notebookbar|FrameLabel">Object</property> <style> <class name="context-Frame"/> <class name="context-OLE"/> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui index 76f657ac5978..dc396347ec7f 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.20.0 --> +<!-- Generated with glade 3.18.3 --> <interface domain="sw"> <requires lib="gtk+" version="3.12"/> <requires lib="LibreOffice" version="1.0"/> @@ -3803,6 +3803,60 @@ <property name="action_name">.uno:LineNumberingDialog</property> </object> </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator158"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenubarD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Menubar</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="SidebarB"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Sidebar</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="StatusbarD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:StatusBarVisible</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator159"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="GalleryD1"> + <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="NavigatorD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Navigator</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="ViewDataSourceBrowserD1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ViewDataSourceBrowser</property> + </object> + </child> </object> <object class="GtkMenu" id="MenuWrap"> <property name="visible">True</property> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui index 2de927ffba72..3e0c96a8d2a6 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui @@ -3728,6 +3728,60 @@ <property name="action_name">.uno:LineNumberingDialog</property> </object> </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator158"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenubarD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Menubar</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="SidebarB"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Sidebar</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="StatusbarD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:StatusBarVisible</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator159"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="GalleryD1"> + <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="NavigatorD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Navigator</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="ViewDataSourceBrowserD1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ViewDataSourceBrowser</property> + </object> + </child> </object> <object class="GtkMenu" id="MenuWrap"> <property name="visible">True</property> |