sw/uiconfig/swriter/popupmenu/notebookbar.xml | 1 sw/uiconfig/swriter/ui/notebookbar.ui | 1257 ++++++++---------- sw/uiconfig/swriter/ui/notebookbar_compact.ui | 1792 +++++++++++++------------- 3 files changed, 1513 insertions(+), 1537 deletions(-)
New commits: commit 211d180af4e5e21f742f6bc9bed82ffaade2cd2a Author: andreas kainz <kain...@gmail.com> AuthorDate: Sun Dec 1 22:00:55 2019 +0100 Commit: andreas_kainz <kain...@gmail.com> CommitDate: Tue Dec 3 12:48:22 2019 +0100 tdf#101513 add customizable option to writer NB tabbed Change-Id: I2a8dcf184b8ca268be2163b90305babd2ee70807 Reviewed-on: https://gerrit.libreoffice.org/84169 Tested-by: Jenkins Reviewed-by: andreas_kainz <kain...@gmail.com> (cherry picked from commit 5073c6d8d7ed199388349af133c2febb2dd1196f) Reviewed-on: https://gerrit.libreoffice.org/84273 diff --git a/sw/uiconfig/swriter/popupmenu/notebookbar.xml b/sw/uiconfig/swriter/popupmenu/notebookbar.xml index 31952654b196..d036046b35fa 100644 --- a/sw/uiconfig/swriter/popupmenu/notebookbar.xml +++ b/sw/uiconfig/swriter/popupmenu/notebookbar.xml @@ -14,6 +14,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:ToolbarMode"/> <menu:menuitem menu:id=".uno:AvailableToolbars"/> + <menu:menuitem menu:id=".uno:ConfigureDialog"/> <menu:menuitem menu:id=".uno:OptionsTreeDialog"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:HelpIndex"/> diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui index e729122a9344..07c9bbbe27f5 100644 --- a/sw/uiconfig/swriter/ui/notebookbar.ui +++ b/sw/uiconfig/swriter/ui/notebookbar.ui @@ -4,7 +4,7 @@ <requires lib="gtk+" version="3.18"/> <requires lib="LibreOffice" version="1.0"/> <!-- interface-local-resource-path ../../../icon-themes/colibre/cmd/ --> - <object class="GtkMenu" id="MenuAddons"> + <object class="GtkMenu" id="Menu Addons"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -28,7 +28,7 @@ </object> </child> </object> - <object class="GtkMenu" id="MenuDraw"> + <object class="GtkMenu" id="Menu Draw"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -93,7 +93,7 @@ </object> </child> </object> - <object class="GtkMenu" id="MenuFile"> + <object class="GtkMenu" id="Menu File"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -118,7 +118,7 @@ </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuFile-separator"> + <object class="GtkSeparatorMenuItem" id="MenuFile-separator1"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -138,21 +138,48 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuFile-SaveAsRemote"> + <object class="GtkMenuItem" id="MenuFile-SaveACopy"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SaveAsRemote</property> + <property name="action_name">.uno:SaveACopy</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuFile-NewGlobalDoc"> + <object class="GtkMenuItem" id="MenuFile-SaveAll"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:NewGlobalDoc</property> + <property name="action_name">.uno:SaveAll</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuFile-separator1"> + <object class="GtkSeparatorMenuItem" id="MenuFile-separator3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuFile-CheckOut"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CheckOut</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuFile-CancelCheckOut"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CancelCheckOut</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuFile-CheckIn"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CheckIn</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuFile-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -179,7 +206,7 @@ </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuFile-separator2"> + <object class="GtkSeparatorMenuItem" id="MenuFile-separator5"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -206,7 +233,7 @@ </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuFile-separator3"> + <object class="GtkSeparatorMenuItem" id="MenuFile-separator6"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -219,10 +246,10 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuFile-PrintDefault"> + <object class="GtkMenuItem" id="MenuFile-Print"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:PrintDefault</property> + <property name="action_name">.uno:Print</property> </object> </child> <child> @@ -233,7 +260,7 @@ </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuFile-separator4"> + <object class="GtkSeparatorMenuItem" id="MenuFile-separator7"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -273,7 +300,7 @@ </object> </child> </object> - <object class="GtkMenu" id="MenuForm"> + <object class="GtkMenu" id="Menu Form"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -433,7 +460,7 @@ </object> </child> </object> - <object class="GtkMenu" id="MenuHelp"> + <object class="GtkMenu" id="Menu Help"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -458,6 +485,13 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuHelp-TipOfTheDay"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:TipOfTheDay</property> + </object> + </child> + <child> <object class="GtkSeparatorMenuItem" id="MenuHelp-separator"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -537,7 +571,7 @@ </object> </child> </object> - <object class="GtkMenu" id="MenuHome"> + <object class="GtkMenu" id="Menu Home"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -854,7 +888,7 @@ </object> </child> </object> - <object class="GtkMenu" id="MenuImage"> + <object class="GtkMenu" id="Menu Image"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -953,7 +987,7 @@ </object> </child> </object> - <object class="GtkMenu" id="MenuInsert"> + <object class="GtkMenu" id="Menu Insert"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -964,6 +998,12 @@ </object> </child> <child> + <object class="GtkSeparatorMenuItem" id="separator4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuInsert-InsertBreak"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1086,7 +1126,7 @@ </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator4"> + <object class="GtkSeparatorMenuItem" id="separator1"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -1106,7 +1146,7 @@ </object> </child> </object> - <object class="GtkMenu" id="MenuMedia"> + <object class="GtkMenu" id="Menu Media"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -1150,7 +1190,7 @@ </object> </child> </object> - <object class="GtkMenu" id="MenuObject"> + <object class="GtkMenu" id="Menu Object"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -1214,7 +1254,7 @@ </object> </child> </object> - <object class="GtkMenu" id="MenuPage"> + <object class="GtkMenu" id="Menu Page"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -1292,7 +1332,7 @@ </object> </child> </object> - <object class="GtkMenu" id="MenuPrint"> + <object class="GtkMenu" id="Menu Print"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -1378,7 +1418,7 @@ </object> </child> </object> - <object class="GtkMenu" id="MenuReference"> + <object class="GtkMenu" id="Menu References"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -1476,7 +1516,7 @@ </object> </child> </object> - <object class="GtkMenu" id="MenuReview"> + <object class="GtkMenu" id="Menu Review"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -1643,7 +1683,7 @@ </object> </child> </object> - <object class="GtkMenu" id="MenuTable"> + <object class="GtkMenu" id="Menu Table"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -1836,7 +1876,7 @@ </object> </child> </object> - <object class="GtkMenu" id="MenuTools"> + <object class="GtkMenu" id="Menu Tools"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -1955,7 +1995,7 @@ </object> </child> </object> - <object class="GtkMenu" id="MenuView"> + <object class="GtkMenu" id="Menu View"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -2127,11 +2167,11 @@ <property name="can_focus">True</property> <property name="hexpand">True</property> <child> - <object class="sfxlo-PriorityHBox" id="FileBox"> + <object class="sfxlo-PriorityHBox" id="File Tab"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="File-Container"> + <object class="sfxlo-PriorityMergedHBox" id="File"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -2929,23 +2969,6 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="pack_type">end</property> - <property name="position">1</property> - </packing> - </child> - <child> <object class="sfxlo-DropdownBox" id="File-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -3028,7 +3051,7 @@ <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="svtlo-ManagedMenuButton" id="File-FileButton:MenuFile"> + <object class="svtlo-ManagedMenuButton" id="File-FileButton:Menu File"> <property name="label" translatable="yes" context="WriterNotebookbar|FileMenuButton">_File</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -3048,7 +3071,7 @@ </packing> </child> <child> - <object class="svtlo-ManagedMenuButton" id="File-HelpButton:MenuHelp"> + <object class="svtlo-ManagedMenuButton" id="File-HelpButton:Menu Help"> <property name="label" translatable="yes" context="WriterNotebookbar|HelpMenuButton">_Help</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -3079,6 +3102,23 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="pack_type">end</property> <property name="position">2</property> </packing> </child> @@ -3096,19 +3136,19 @@ </packing> </child> <child> - <object class="sfxlo-PriorityHBox" id="HomeBox"> + <object class="sfxlo-PriorityHBox" id="Home Tab"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="Home-PasteBox"> + <object class="sfxlo-PriorityMergedHBox" id="Home"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="FileSection7"> + <object class="sfxlo-OptionalBox" id="Home-Section-Clipboard"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3201,104 +3241,16 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-8"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-DropdownBox" id="Home-Menu"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <child> - <object class="GtkBox" id="PasteBox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> - <child> - <object class="svtlo-ManagedMenuButton" id="Home-HomeButton:MenuHome"> - <property name="label" translatable="yes" context="WriterNotebookbar|HomeMenuButton">_Home</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">False</property> - <property name="halign">end</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="relief">none</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom10"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">end</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <property name="icon_size">1</property> - <child> - <object class="GtkToolButton" id="Home-FocusToFindbar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">vnd.sun.star.findbar:FocusToFindbar</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="sfxlo-PriorityMergedHBox" id="Home-Container"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> <child> <object class="sfxlo-OptionalBox" id="Home-Section-Style"> <property name="visible">True</property> @@ -3388,7 +3340,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> @@ -3680,7 +3632,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> @@ -3889,7 +3841,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -4078,7 +4030,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -4174,7 +4126,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -4366,7 +4318,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child> @@ -4472,7 +4424,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <child> @@ -4589,7 +4541,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">8</property> </packing> </child> <child> @@ -4704,92 +4656,42 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">9</property> </packing> </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator9"> + <object class="sfxlo-DropdownBox" id="Home-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="pack_type">end</property> - <property name="position">3</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="HomeLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="WriterNotebookbar|HomeLabel">~Home</property> - <property name="use_underline">True</property> - <style> - <class name="context-default"/> - <class name="context-any"/> - <class name="context-Text"/> - <class name="context-DrawText"/> - </style> - </object> - <packing> - <property name="position">1</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <object class="sfxlo-PriorityHBox" id="InsertBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="sfxlo-PriorityMergedHBox" id="Insert-Container"> - <property name="visible">True</property> - <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="Insert-Section-Pagebreak"> + <object class="GtkBox" id="PasteBox1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> + <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom70"> + <object class="svtlo-ManagedMenuButton" id="Home-HomeButton:Menu Home"> + <property name="label" translatable="yes" context="WriterNotebookbar|HomeMenuButton">_Home</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">False</property> + <property name="halign">end</property> <property name="valign">center</property> <property name="vexpand">True</property> - <property name="toolbar_style">both</property> - <property name="show_arrow">False</property> - <property name="icon_size">3</property> - <child> - <object class="GtkToolButton" id="Insert-InsertPagebreak"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:InsertPagebreak</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="relief">none</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -4797,8 +4699,136 @@ <property name="position">0</property> </packing> </child> - </object> - <packing> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom10"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <property name="icon_size">1</property> + <child> + <object class="GtkToolButton" id="Home-FocusToFindbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">vnd.sun.star.findbar:FocusToFindbar</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="pack_type">end</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="HomeLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="WriterNotebookbar|HomeLabel">~Home</property> + <property name="use_underline">True</property> + <style> + <class name="context-default"/> + <class name="context-any"/> + <class name="context-Text"/> + <class name="context-DrawText"/> + </style> + </object> + <packing> + <property name="position">1</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="sfxlo-PriorityHBox" id="Insert Tab"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-PriorityMergedHBox" id="Insert"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-OptionalBox" id="Insert-Section-Pagebreak"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom70"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="toolbar_style">both</property> + <property name="show_arrow">False</property> + <property name="icon_size">3</property> + <child> + <object class="GtkToolButton" id="Insert-InsertPagebreak"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertPagebreak</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> @@ -5897,7 +5927,7 @@ <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="svtlo-ManagedMenuButton" id="Insert-InsertButton:MenuInsert"> + <object class="svtlo-ManagedMenuButton" id="Insert-InsertButton:Menu Insert"> <property name="label" translatable="yes" context="WriterNotebookbar|InsertMenuButton">_Insert</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -5977,7 +6007,7 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="pack_type">end</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> @@ -5994,7 +6024,7 @@ <property name="fill">True</property> <property name="padding">5</property> <property name="pack_type">end</property> - <property name="position">6</property> + <property name="position">2</property> </packing> </child> </object> @@ -6015,106 +6045,13 @@ </packing> </child> <child> - <object class="sfxlo-PriorityHBox" id="LayoutBox"> + <object class="sfxlo-PriorityHBox" id="Layout Tab"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-DropdownBox" id="Layout-Menu"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <child> - <object class="GtkBox" id="GroupB24"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> - <child> - <object class="svtlo-ManagedMenuButton" id="Layout-PageButton:MenuPage"> - <property name="label" translatable="yes" context="WriterNotebookbar|LayoutMenuButton">_Layout</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">False</property> - <property name="halign">end</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="relief">none</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom15"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">end</property> - <property name="hexpand">True</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <property name="icon_size">1</property> - <child> - <object class="GtkToolButton" id="Layout-PageDialog"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:PageDialog</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator18"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="pack_type">end</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="sfxlo-PriorityMergedHBox" id="Layout-Container"> + <object class="sfxlo-PriorityMergedHBox" id="Layout"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7174,53 +7111,33 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> - </object> - <packing> - <property name="position">3</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="LayoutLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="WriterNotebookbar|LayoutLabel">~Layout</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="position">3</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <object class="sfxlo-PriorityHBox" id="ReferencesBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> <child> - <object class="sfxlo-DropdownBox" id="Reference-Menu"> + <object class="sfxlo-DropdownBox" id="Layout-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB34"> + <object class="GtkBox" id="GroupB24"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="svtlo-ManagedMenuButton" id="References-ReferencesButton:MenuReference"> - <property name="label" translatable="yes" context="WriterNotebookbar|ReferencesMenuButton">Reference_s</property> + <object class="svtlo-ManagedMenuButton" id="Layout-PageButton:Menu Page"> + <property name="label" translatable="yes" context="WriterNotebookbar|LayoutMenuButton">_Layout</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="focus_on_click">False</property> <property name="receives_default">False</property> <property name="halign">end</property> <property name="valign">center</property> + <property name="vexpand">True</property> <property name="relief">none</property> <property name="use_underline">True</property> </object> @@ -7231,7 +7148,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom8"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom15"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="halign">end</property> @@ -7240,14 +7157,14 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="References-UpdateAll"> + <object class="GtkToolButton" id="Layout-PageDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="action_name">.uno:UpdateAll</property> + <property name="action_name">.uno:PageDialog</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -7270,11 +7187,11 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="pack_type">end</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator14"> + <object class="GtkSeparator" id="separator18"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -7287,11 +7204,32 @@ <property name="fill">True</property> <property name="padding">5</property> <property name="pack_type">end</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> + </object> + <packing> + <property name="position">3</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="LayoutLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="WriterNotebookbar|LayoutLabel">~Layout</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="position">3</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="sfxlo-PriorityHBox" id="References Tab"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="Reference-Container"> + <object class="sfxlo-PriorityMergedHBox" id="References"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7990,6 +7928,98 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-DropdownBox" id="References-Menu"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="GtkBox" id="GroupB34"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="svtlo-ManagedMenuButton" id="References-ReferencesButton:Menu References"> + <property name="label" translatable="yes" context="WriterNotebookbar|ReferencesMenuButton">Reference_s</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">False</property> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom8"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">end</property> + <property name="hexpand">True</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <property name="icon_size">1</property> + <child> + <object class="GtkToolButton" id="References-UpdateAll"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:UpdateAll</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator14"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="pack_type">end</property> <property name="position">2</property> </packing> </child> @@ -8011,11 +8041,11 @@ </packing> </child> <child> - <object class="sfxlo-PriorityHBox" id="ReviewBox"> + <object class="sfxlo-PriorityHBox" id="Review Tab"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="Review-Container"> + <object class="sfxlo-PriorityMergedHBox" id="Review"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -8860,7 +8890,7 @@ <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="svtlo-ManagedMenuButton" id="Review-ReviewButton:MenuReview"> + <object class="svtlo-ManagedMenuButton" id="Review-ReviewButton:Menu Review"> <property name="label" translatable="yes" context="WriterNotebookbar|ReviewMenuButton">_Review</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -8935,7 +8965,7 @@ <property name="fill">True</property> <property name="padding">5</property> <property name="pack_type">end</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> </object> @@ -8956,11 +8986,11 @@ </packing> </child> <child> - <object class="sfxlo-PriorityHBox" id="ViewBox"> + <object class="sfxlo-PriorityHBox" id="View Tab"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="View-Container"> + <object class="sfxlo-PriorityMergedHBox" id="View"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -9816,7 +9846,7 @@ <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="svtlo-ManagedMenuButton" id="View-ViewButton:MenuView"> + <object class="svtlo-ManagedMenuButton" id="View-ViewButton:Menu View"> <property name="label" translatable="yes" context="WriterNotebookbar|ViewMenuButton">_View</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -9874,7 +9904,7 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="pack_type">end</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> <child> @@ -9891,7 +9921,7 @@ <property name="fill">True</property> <property name="padding">5</property> <property name="pack_type">end</property> - <property name="position">5</property> + <property name="position">2</property> </packing> </child> </object> @@ -9912,11 +9942,11 @@ </packing> </child> <child> - <object class="sfxlo-PriorityHBox" id="TableBox"> + <object class="sfxlo-PriorityHBox" id="Table Tab"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="Table-Container"> + <object class="sfxlo-PriorityMergedHBox" id="Table"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -10302,24 +10332,11 @@ <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="SectionBottom85"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Table-EntireRow1"> + <object class="GtkToolButton" id="Table-SelectTable2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:EntireRow</property> + <property name="action_name">.uno:SelectTable</property> </object> <packing> <property name="expand">True</property> @@ -10330,68 +10347,26 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <style> - <class name="priority-9"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Table-Section-Select2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <child> - <object class="GtkBox" id="GroupB100"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom139"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom85"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Table-SelectTable2"> + <object class="GtkToolButton" id="Table-EntireRow1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SelectTable</property> + <property name="action_name">.uno:EntireRow</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="SectionBottom140"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Table-DeleteTable2"> <property name="visible">True</property> @@ -10414,17 +10389,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <style> - <class name="priority-8"/> + <class name="priority-9"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">5</property> </packing> </child> <child> @@ -11119,7 +11094,7 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> @@ -11137,7 +11112,7 @@ <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="svtlo-ManagedMenuButton" id="Table-TableButton:MenuTable"> + <object class="svtlo-ManagedMenuButton" id="Table-TableButton:Menu Table"> <property name="label" translatable="yes" context="WriterNotebookbar|TableMenuButton">_Table</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -11194,7 +11169,7 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="pack_type">end</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> @@ -11211,7 +11186,7 @@ <property name="fill">True</property> <property name="padding">5</property> <property name="pack_type">end</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> </object> @@ -11235,11 +11210,11 @@ </packing> </child> <child> - <object class="sfxlo-PriorityHBox" id="ImageBox"> + <object class="sfxlo-PriorityHBox" id="Image Tab"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="Image-Container"> + <object class="sfxlo-PriorityMergedHBox" id="Image"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -11592,7 +11567,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom50"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> @@ -12400,7 +12375,7 @@ <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="svtlo-ManagedMenuButton" id="Image-GraphicButton:MenuImage"> + <object class="svtlo-ManagedMenuButton" id="Image-GraphicButton:Menu Image"> <property name="label" translatable="yes" context="WriterNotebookbar|ImageMenuButton">Ima_ge</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -12513,11 +12488,11 @@ </packing> </child> <child> - <object class="sfxlo-PriorityHBox" id="DrawBox"> + <object class="sfxlo-PriorityHBox" id="Draw Tab"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="Draw-Container"> + <object class="sfxlo-PriorityMergedHBox" id="Draw"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12562,13 +12537,12 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom71"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="vexpand">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> @@ -12845,7 +12819,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom60"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> @@ -13864,7 +13838,7 @@ <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="svtlo-ManagedMenuButton" id="Draw-DrawButton:MenuDraw"> + <object class="svtlo-ManagedMenuButton" id="Draw-DrawButton:Menu Draw"> <property name="label" translatable="yes" context="WriterNotebookbar|DrawMenuButton">_Draw</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -13946,7 +13920,7 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="pack_type">end</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> @@ -13963,7 +13937,7 @@ <property name="fill">True</property> <property name="padding">5</property> <property name="pack_type">end</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> </object> @@ -13990,11 +13964,11 @@ </packing> </child> <child> - <object class="sfxlo-PriorityHBox" id="ObjectBox"> + <object class="sfxlo-PriorityHBox" id="Object Tab"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="Object-Container"> + <object class="sfxlo-PriorityMergedHBox" id="Object"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -14275,7 +14249,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom117"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> @@ -14868,7 +14842,7 @@ <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="svtlo-ManagedMenuButton" id="Object-ObjectButton:MenuObject"> + <object class="svtlo-ManagedMenuButton" id="Object-ObjectButton:Menu Object"> <property name="label" translatable="yes" context="WriterNotebookbar|ObjectMenuButton">_Object</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -14926,7 +14900,7 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="pack_type">end</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> @@ -14943,7 +14917,7 @@ <property name="fill">True</property> <property name="padding">5</property> <property name="pack_type">end</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> </object> @@ -14968,11 +14942,11 @@ </packing> </child> <child> - <object class="sfxlo-PriorityHBox" id="MediaBox"> + <object class="sfxlo-PriorityHBox" id="Media Tab"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="Media-Container"> + <object class="sfxlo-PriorityMergedHBox" id="Media"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -15759,7 +15733,7 @@ <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="svtlo-ManagedMenuButton" id="media:MenuMedia"> + <object class="svtlo-ManagedMenuButton" id="media:Menu Media"> <property name="label" translatable="yes" context="WriterNotebookbar|MediaMenuButton">_Media</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -15838,7 +15812,7 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="pack_type">end</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> @@ -15855,7 +15829,7 @@ <property name="fill">True</property> <property name="padding">5</property> <property name="pack_type">end</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> </object> @@ -15879,11 +15853,11 @@ </packing> </child> <child> - <object class="sfxlo-PriorityHBox" id="PrintBox"> + <object class="sfxlo-PriorityHBox" id="Print Tab"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="Print-Container"> + <object class="sfxlo-PriorityMergedHBox" id="Print"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -16060,7 +16034,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator1"> + <object class="GtkSeparator" id="separator7"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -16297,9 +16271,6 @@ <property name="position">4</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -16322,7 +16293,7 @@ <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="svtlo-ManagedMenuButton" id="print:MenuPrint"> + <object class="svtlo-ManagedMenuButton" id="print:Menu Print"> <property name="label" translatable="yes" context="WriterNotebookbar|PrintMenuButton">_Print</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -16377,7 +16348,7 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="pack_type">end</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> @@ -16394,7 +16365,7 @@ <property name="fill">True</property> <property name="padding">5</property> <property name="pack_type">end</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> </object> @@ -16409,7 +16380,7 @@ <property name="label" translatable="yes" context="WriterNotebookbar|PrintLabel">~Print</property> <property name="use_underline">True</property> <style> - <class name="context-Printpreview"/> + <class name="context-PrintPreview"/> </style> </object> <packing> @@ -16418,133 +16389,41 @@ </packing> </child> <child> - <object class="sfxlo-PriorityHBox" id="FormBox"> + <object class="sfxlo-PriorityHBox" id="Form Tab"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-DropdownBox" id="Form-Menu"> + <object class="sfxlo-PriorityMergedHBox" id="Form"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">end</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="Form-Section"> + <object class="sfxlo-OptionalBox" id="Form-Section-Form"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> - <property name="orientation">vertical</property> <child> - <object class="svtlo-ManagedMenuButton" id="Form-FormButton:MenuForm"> - <property name="label" translatable="yes" context="WriterNotebookbar|FormMenuButton">Fo_rm</property> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom89"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">False</property> - <property name="halign">end</property> <property name="valign">center</property> <property name="vexpand">True</property> - <property name="relief">none</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom97"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">end</property> - <property name="hexpand">True</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <property name="icon_size">1</property> - <child> - <object class="GtkToolButton" id="FormMenu-FormProperties"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FormProperties</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator25"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="pack_type">end</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="sfxlo-PriorityMergedHBox" id="Form-Container"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Form"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom89"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="toolbar_style">both</property> - <property name="show_arrow">False</property> - <property name="icon_size">3</property> - <child> - <object class="GtkToolButton" id="Form-SwitchControlDesignMode1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SwitchControlDesignMode</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="toolbar_style">both</property> + <property name="show_arrow">False</property> + <property name="icon_size">3</property> + <child> + <object class="GtkToolButton" id="Form-SwitchControlDesignMode1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SwitchControlDesignMode</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -17180,7 +17059,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator7"> + <object class="GtkSeparator" id="separator11"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -17314,50 +17193,26 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> - </object> - <packing> - <property name="position">13</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="FormLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="WriterNotebookbar|FormLabel">Fo~rm</property> - <property name="use_underline">True</property> - <style> - <class name="context-Form"/> - </style> - </object> - <packing> - <property name="position">13</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <object class="sfxlo-PriorityHBox" id="ExtensionBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> <child> - <object class="sfxlo-DropdownBox" id="Extension-Menu"> + <object class="sfxlo-DropdownBox" id="Form-Menu"> ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits