officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 2 sw/uiconfig/swriter/ui/notebookbar.ui | 7103 ++++++---- sw/uiconfig/swriter/ui/notebookbar_compact.ui | 3900 +++-- sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 777 - sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 941 + sw/uiconfig/swriter/ui/notebookbar_single.ui | 272 6 files changed, 8549 insertions(+), 4446 deletions(-)
New commits: commit d6e8e41c22023bc15cc4c9659b33c1cc3d6edb75 Author: andreas kainz <kain...@gmail.com> AuthorDate: Sun May 5 01:33:16 2019 +0200 Commit: andreas_kainz <kain...@gmail.com> CommitDate: Mon May 6 00:41:04 2019 +0200 Writer Notebookbar Layout syncronisation Change-Id: Ibe8fb5114e624482292928d14ad8cc89b711f5a8 Reviewed-on: https://gerrit.libreoffice.org/71814 Tested-by: Jenkins Reviewed-by: andreas_kainz <kain...@gmail.com> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 2e0500a621d1..7dfefa1bc10a 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -3635,7 +3635,7 @@ </node> <node oor:name=".uno:AutoFormat" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">AutoFormat Table Styles</value> + <value xml:lang="en-US">Table Styles</value> </prop> <prop oor:name="ContextLabel" oor:type="xs:string"> <value xml:lang="en-US">Auto~Format Styles...</value> diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui index 709631129bfe..cba0ed11b43d 100644 --- a/sw/uiconfig/swriter/ui/notebookbar.ui +++ b/sw/uiconfig/swriter/ui/notebookbar.ui @@ -1130,6 +1130,19 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> + <object class="GtkMenuItem" id="MenuObject-ObjectMenue"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectMenue</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuObject-separator1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuObject-ChainFrames"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1164,6 +1177,12 @@ </object> </child> <child> + <object class="GtkSeparatorMenuItem" id="MenuObject-separator2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuObject-FrameDialog"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -2065,7 +2084,7 @@ </object> </child> </object> - <object class="GtkImage" id="RecentFilesImg"> + <object class="GtkImage" id="RecentFilesImg1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="pixbuf">cmd/sc_recentfilelist.png</property> @@ -2281,20 +2300,33 @@ <property name="position">0</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="File-Section-New1"> + <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="GroupB1"> + <object class="GtkBox" id="GroupB2"> <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="LineA1"> + <object class="sfxlo-NotebookbarToolBox" id="LineA3"> <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> - <object class="GtkToolButton" id="File-NewDoc"> + <object class="GtkToolButton" id="File-NewDoc1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:NewDoc</property> @@ -2313,13 +2345,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB1"> + <object class="sfxlo-NotebookbarToolBox" id="LineB2"> <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> - <object class="GtkToolButton" id="File-SaveAsTemplate"> + <object class="GtkToolButton" id="File-SaveAsTemplate1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SaveAsTemplate</property> @@ -2344,8 +2376,24 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-6"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="File-Section-Open"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator91"> + <object class="GtkSeparator" id="separator92"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -2356,22 +2404,9 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="File-Section-Open"> - <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="SectionBottom59"> <property name="visible">True</property> @@ -2397,23 +2432,36 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="File-Section-Open1"> + <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="GroupB2"> + <object class="GtkBox" id="GroupB3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="orientation">vertical</property> <child> - <object class="svtlo-ManagedMenuButton" id="File-RecentFileList"> + <object class="svtlo-ManagedMenuButton" id="File-RecentFileList1"> <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="action_name">.uno:RecentFileList</property> - <property name="image">RecentFilesImg</property> + <property name="image">RecentFilesImg1</property> <property name="use_underline">True</property> </object> <packing> @@ -2423,13 +2471,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB2"> + <object class="sfxlo-NotebookbarToolBox" id="LineB3"> <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> - <object class="GtkToolButton" id="File-OpenRemote"> + <object class="GtkToolButton" id="File-OpenRemote1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:OpenRemote</property> @@ -2451,29 +2499,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator92"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> <property name="position">2</property> </packing> </child> + <style> + <class name="priority-5"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <child> @@ -2483,6 +2519,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator13"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom4"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -2507,23 +2558,36 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="File-Section-Save1"> + <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="GroupB3"> + <object class="GtkBox" id="GroupB4"> <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="LineA3"> + <object class="sfxlo-NotebookbarToolBox" id="LineA2"> <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> - <object class="GtkToolButton" id="File-SaveAs"> + <object class="GtkToolButton" id="File-SaveAs1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SaveAs</property> @@ -2542,13 +2606,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB3"> + <object class="sfxlo-NotebookbarToolBox" id="LineB4"> <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> - <object class="GtkToolButton" id="File-SaveAsRemote"> + <object class="GtkToolButton" id="File-SaveAsRemote1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SaveAsRemote</property> @@ -2570,21 +2634,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator13"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> <property name="position">2</property> </packing> </child> @@ -2595,7 +2644,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">5</property> </packing> </child> <child> @@ -2605,6 +2654,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator93"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom66"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -2629,23 +2693,36 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="File-Section-Export1"> + <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="GroupB4"> + <object class="GtkBox" id="GroupB5"> <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="LineA2"> + <object class="sfxlo-NotebookbarToolBox" id="LineA4"> <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> - <object class="GtkToolButton" id="File-ExportDirectToPDF"> + <object class="GtkToolButton" id="File-ExportDirectToPDF1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ExportDirectToPDF</property> @@ -2664,13 +2741,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB4"> + <object class="sfxlo-NotebookbarToolBox" id="LineB5"> <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> - <object class="GtkToolButton" id="File-ExportDirectToEPUB"> + <object class="GtkToolButton" id="File-ExportDirectToEPUB1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ExportDirectToEPUB</property> @@ -2692,21 +2769,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator93"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> <property name="position">2</property> </packing> </child> @@ -2717,7 +2779,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">7</property> </packing> </child> <child> @@ -2727,6 +2789,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom2"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -2751,23 +2828,36 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">8</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="File-Section-Print1"> + <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="GroupB5"> + <object class="GtkBox" id="GroupB6"> <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="LineA4"> + <object class="sfxlo-NotebookbarToolBox" id="LineA5"> <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> - <object class="GtkToolButton" id="File-PrintDefault"> + <object class="GtkToolButton" id="File-PrintDefault1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:PrintDefault</property> @@ -2786,13 +2876,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB5"> + <object class="sfxlo-NotebookbarToolBox" id="LineB6"> <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> - <object class="GtkToolButton" id="File-PrintPreview"> + <object class="GtkToolButton" id="File-PrintPreview1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:PrintPreview</property> @@ -2814,21 +2904,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> <property name="position">2</property> </packing> </child> @@ -2839,7 +2914,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">9</property> </packing> </child> <child> @@ -2849,6 +2924,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator91"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom6"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -2873,23 +2963,36 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">10</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="File-Section-Property1"> + <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="GroupB6"> + <object class="GtkBox" id="GroupB21"> <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="LineA5"> + <object class="sfxlo-NotebookbarToolBox" id="LineA9"> <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> - <object class="GtkToolButton" id="File-Signature"> + <object class="GtkToolButton" id="File-Signature1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Signature</property> @@ -2908,13 +3011,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB6"> + <object class="sfxlo-NotebookbarToolBox" id="LineB10"> <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> - <object class="GtkToolButton" id="File-SignPDF"> + <object class="GtkToolButton" id="File-SignPDF1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SignPDF</property> @@ -2936,7 +3039,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <style> @@ -2946,7 +3049,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">11</property> </packing> </child> </object> @@ -3076,21 +3179,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator104"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -3142,7 +3230,9 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom10"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="halign">center</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> @@ -3194,6 +3284,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator104"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="GtkBox" id="GroupB13"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -3254,6 +3359,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-8"/> + </style> </object> <packing> <property name="expand">False</property> @@ -3268,260 +3376,102 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="FileSection8"> + <object class="GtkSeparator" id="separator8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="GroupB10"> <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="GtkBox" id="GroupB10"> + <object class="GtkBox" id="box76"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box76"> + <object class="sfxlo-NotebookbarToolBox" id="font"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="font"> + <object class="GtkToolButton" id="Home-CharFontName"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="hexpand">True</property> - <child> - <object class="GtkToolButton" id="Home-CharFontName"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="action_name">.uno:CharFontName</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="action_name">.uno:CharFontName</property> </object> <packing> <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="fontheight"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="margin_left">5</property> - <child> - <object class="GtkToolButton" id="Home-FontHeight"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FontHeight</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="ExtTop6"> - <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="Home-Grow"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Grow</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-Shrink"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Shrink</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">2</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="GroupB11"> + <object class="sfxlo-NotebookbarToolBox" id="fontheight"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop4"> - <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="Home-Bold"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Bold</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-Italic"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Italic</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-UnderlineSimple"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Underline</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-Strikeout"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Strikeout</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop5"> + <object class="GtkToolButton" id="Home-FontHeight"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">end</property> - <property name="margin_left">5</property> - <property name="hexpand">True</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Home-SubScript"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SubScript</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-SuperScript"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SuperScript</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontHeight</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="expand">True</property> + <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop6"> + <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="GtkSeparator" id="separator78"> + <object class="GtkToolButton" id="Home-Grow"> <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="hexpand">True</property> - <property name="orientation">vertical</property> + <property name="action_name">.uno:Grow</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop2"> + <object class="GtkToolButton" id="Home-Shrink"> <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="GtkMenuToolButton" id="Home-BackColor"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BackColor</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkMenuToolButton" id="Home-Color"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Color</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> + <property name="can_focus">False</property> + <property name="action_name">.uno:Shrink</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -3539,65 +3489,21 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> - </packing> - </child> - <style> - <class name="priority-6"/> - </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">1</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Home-Section-Paragraph"> - <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="GroupB14"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkBox" id="GroupB16"> + <object class="GtkBox" id="GroupB11"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom91"> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop4"> <property name="visible">True</property> - <property name="can_focus">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="Home-DefaultBullet"> + <object class="GtkToolButton" id="Home-Bold"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DefaultBullet</property> + <property name="action_name">.uno:Bold</property> </object> <packing> <property name="expand">False</property> @@ -3605,10 +3511,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Home-DefaultNumbering"> + <object class="GtkToolButton" id="Home-Italic"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DefaultNumbering</property> + <property name="action_name">.uno:Italic</property> </object> <packing> <property name="expand">False</property> @@ -3616,10 +3522,21 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Home-SetOutline"> + <object class="GtkToolButton" id="Home-UnderlineSimple"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SetOutline</property> + <property name="action_name">.uno:Underline</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Home-Strikeout"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Strikeout</property> </object> <packing> <property name="expand">False</property> @@ -3634,46 +3551,18 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator7"> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom9"> - <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">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Home-IncrementIndent"> - <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:IncrementIndent</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-DecrementIndent"> + <object class="GtkToolButton" id="Home-SubScript"> <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:DecrementIndent</property> + <property name="action_name">.uno:SubScript</property> </object> <packing> <property name="expand">False</property> @@ -3681,10 +3570,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Home-ControlCodes"> + <object class="GtkToolButton" id="Home-SuperScript"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ControlCodes</property> + <property name="action_name">.uno:SuperScript</property> </object> <packing> <property name="expand">False</property> @@ -3695,20 +3584,147 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom89"> + <object class="GtkSeparator" id="separator78"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">icons</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="hexpand">True</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop2"> + <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="Home-ParaLeftToRight"> + <object class="GtkMenuToolButton" id="Home-BackColor"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ParaLeftToRight</property> + <property name="action_name">.uno:BackColor</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkMenuToolButton" id="Home-Color"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Color</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">3</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">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Home-Section-Paragraph"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="GtkSeparator" id="separator102"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="GroupB14"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="GroupB16"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom91"> + <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="Home-DefaultBullet"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DefaultBullet</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Home-DefaultNumbering"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DefaultNumbering</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Home-SetOutline"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SetOutline</property> </object> <packing> <property name="expand">False</property> @@ -3719,7 +3735,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">0</property> </packing> </child> </object> @@ -3799,8 +3815,150 @@ <property name="position">0</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-7"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Home-Section-Paragraph1"> + <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="GroupB19"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="GroupB93"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="GtkSeparator" id="separator68"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom81"> + <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="Home-IncrementIndent1"> + <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:IncrementIndent</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Home-DecrementIndent1"> + <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:DecrementIndent</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Home-ControlCodes1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ControlCodes</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">3</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom93"> + <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="Home-ParaLeftToRight1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ParaLeftToRight</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">4</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="GroupB94"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator97"> + <object class="GtkSeparator" id="separator72"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -3816,13 +3974,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom3"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom125"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Home-LineSpacing"> + <object class="GtkMenuToolButton" id="Home-LineSpacing1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits