diff options
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 2 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar.ui | 6727 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_compact.ui | 3056 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 777 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 851 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_single.ui | 272 |
6 files changed, 7894 insertions, 3791 deletions
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,299 +3376,281 @@ <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> + <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="fontheight"> + <property name="visible">True</property> + <property name="can_focus">False</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">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="fontheight"> + <object class="GtkToolButton" id="Home-Grow"> <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> + <property name="can_focus">False</property> + <property name="action_name">.uno:Grow</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop6"> + <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="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> + <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">2</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="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="GtkBox" id="GroupB11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="GtkBox" id="GroupB11"> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop4"> + <object class="GtkToolButton" id="Home-Bold"> <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> + <property name="can_focus">False</property> + <property name="action_name">.uno:Bold</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop5"> + <object class="GtkToolButton" id="Home-Italic"> <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:Italic</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator78"> + <object class="GtkToolButton" id="Home-UnderlineSimple"> <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: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"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="hexpand">True</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="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="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-SuperScript"> <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:SuperScript</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> <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator78"> + <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> + </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="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> + </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">0</property> - </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> + <property name="position">1</property> </packing> </child> </object> @@ -3577,6 +3667,21 @@ <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> @@ -3633,34 +3738,31 @@ <property name="position">0</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="GroupB15"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator7"> - <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"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom13"> <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-IncrementIndent"> + <object class="GtkToolButton" id="Home-LeftPara"> <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> + <property name="action_name">.uno:LeftPara</property> </object> <packing> <property name="expand">False</property> @@ -3668,12 +3770,12 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Home-DecrementIndent"> + <object class="GtkToolButton" id="Home-CenterPara"> <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:CenterPara</property> </object> <packing> <property name="expand">False</property> @@ -3681,34 +3783,25 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Home-ControlCodes"> + <object class="GtkToolButton" id="Home-RightPara"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ControlCodes</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:RightPara</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="SectionBottom89"> - <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-ParaLeftToRight"> + <object class="GtkToolButton" id="Home-JustifyPara"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ParaLeftToRight</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:JustifyPara</property> </object> <packing> <property name="expand">False</property> @@ -3719,34 +3812,78 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</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> + <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="GroupB15"> + <object class="GtkBox" id="GroupB93"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom13"> + <object class="GtkSeparator" id="separator68"> <property name="visible">True</property> - <property name="can_focus">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-LeftPara"> + <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:LeftPara</property> + <property name="action_name">.uno:IncrementIndent</property> </object> <packing> <property name="expand">False</property> @@ -3754,12 +3891,12 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Home-CenterPara"> + <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:CenterPara</property> + <property name="action_name">.uno:DecrementIndent</property> </object> <packing> <property name="expand">False</property> @@ -3767,25 +3904,34 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Home-RightPara"> + <object class="GtkToolButton" id="Home-ControlCodes1"> <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:RightPara</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-JustifyPara"> + <object class="GtkToolButton" id="Home-ParaLeftToRight1"> <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:JustifyPara</property> + <property name="action_name">.uno:ParaLeftToRight</property> </object> <packing> <property name="expand">False</property> @@ -3796,11 +3942,23 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</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> @@ -3834,7 +3992,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Home-BackgroundColor"> + <object class="GtkToolButton" id="Home-BackgroundColor1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">center</property> @@ -3854,13 +4012,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom77"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom130"> <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-ParaRightToLeft"> + <object class="GtkToolButton" id="Home-ParaRightToLeft1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ParaRightToLeft</property> @@ -3891,8 +4049,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">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Home-Section-Style2"> + <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"> + <object class="GtkSeparator" id="separator10"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -3903,70 +4077,109 @@ <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> + <child> + <object class="GtkBox" id="GroupB17"> + <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="SectionBottom5"> + <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-DesignerDialog"> + <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:DesignerDialog</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="SectionBottom102"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Home-StandardStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:StyleApply?Style:string=Standard&FamilyName:string=ParagraphStyles</property> + <property name="icon_name">cmd/sc_defaultcharstyle.png</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">1</property> </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-5"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">4</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Home-Section-Style2"> + <object class="sfxlo-OptionalBox" id="Home-Section-Style3"> <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="GroupB17"> + <object class="GtkBox" id="GroupB80"> <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="GroupB19"> + <object class="GtkBox" id="GroupB85"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom5"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom127"> <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-DesignerDialog"> - <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:DesignerDialog</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="SectionBottom101"> - <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-StyleApply"> + <object class="GtkToolButton" id="Home-StyleApply1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">center</property> @@ -3985,45 +4198,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom81"> - <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-StyleUpdateByExample"> - <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:StyleUpdateByExample</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-EditStyle"> - <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:EditStyle</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> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -4032,38 +4206,13 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="StyleParagraphSection1"> + <object class="sfxlo-OptionalBox" id="StyleParagraphSection2"> <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="SectionBottom102"> - <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-StandardStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:StyleApply?Style:string=Standard&FamilyName:string=ParagraphStyles</property> - <property name="icon_name">cmd/sc_defaultcharstyle.png</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="GtkSeparator" id="separator106"> + <object class="GtkSeparator" id="separator69"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -4078,15 +4227,17 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom93"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom134"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</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">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Home-TitleStyle"> + <object class="GtkToolButton" id="Home-TitleStyle1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:StyleApply?Style:string=Title&FamilyName:string=ParagraphStyles</property> @@ -4098,7 +4249,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Home-H1Style"> + <object class="GtkToolButton" id="Home-H1Style2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:StyleApply?Style:string=Heading 1&FamilyName:string=ParagraphStyles</property> @@ -4110,7 +4261,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Home-H2Style"> + <object class="GtkToolButton" id="Home-H2Style2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:StyleApply?Style:string=Heading 2&FamilyName:string=ParagraphStyles</property> @@ -4122,7 +4273,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Home-H3Style"> + <object class="GtkToolButton" id="Home-H3Style2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:StyleApply?Style:string=Heading 3&FamilyName:string=ParagraphStyles</property> @@ -4134,7 +4285,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Home-H4Style"> + <object class="GtkToolButton" id="Home-H4Style2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:StyleApply?Style:string=Heading 4&FamilyName:string=ParagraphStyles</property> @@ -4147,13 +4298,13 @@ </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">4</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator20"> + <object class="GtkSeparator" id="separator70"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -4169,43 +4320,6 @@ <property name="position">5</property> </packing> </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom7"> - <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-EmphasisCharStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:StyleApply?Style:string=Emphasis&FamilyName:string=CharacterStyles</property> - <property name="icon_name">cmd/sc_emphasischarstyle.png</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-StrongEmphasisCharStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:StyleApply?Style:string=Strong Emphasis&FamilyName:string=CharacterStyles</property> - <property name="icon_name">cmd/sc_strongemphasischarstyle.png</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">6</property> - </packing> - </child> <style> <class name="priority-3"/> </style> @@ -4220,21 +4334,112 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-4"/> + </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="Home-Section-Style4"> + <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="separator10"> + <object class="GtkBox" id="GroupB86"> <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="valign">center</property> <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom138"> + <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-StyleUpdateByExample2"> + <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:StyleUpdateByExample</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Home-EditStyle2"> + <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:EditStyle</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="SectionBottom141"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Home-EmphasisCharStyle2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:StyleApply?Style:string=Emphasis&FamilyName:string=CharacterStyles</property> + <property name="icon_name">cmd/sc_emphasischarstyle.png</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Home-StrongEmphasisCharStyle2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:StyleApply?Style:string=Strong Emphasis&FamilyName:string=CharacterStyles</property> + <property name="icon_name">cmd/sc_strongemphasischarstyle.png</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="padding">5</property> <property name="position">1</property> </packing> </child> @@ -4245,7 +4450,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">6</property> </packing> </child> <child> @@ -4255,6 +4460,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator107"> + <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="GroupB20"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -4337,21 +4557,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator107"> - <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> @@ -4362,7 +4567,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">7</property> </packing> </child> <child> @@ -4372,6 +4577,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator67"> + <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="GroupB83"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -4452,7 +4672,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <style> @@ -4462,7 +4682,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">8</property> </packing> </child> </object> @@ -4556,20 +4776,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="Insert-Section-Pagebreak1"> + <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="GroupB21"> + <object class="GtkBox" id="GroupB29"> <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="LineA9"> + <object class="sfxlo-NotebookbarToolBox" id="LineA15"> <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="Insert-TitlePageDialog"> + <object class="GtkToolButton" id="Insert-TitlePageDialog1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:TitlePageDialog</property> @@ -4587,13 +4820,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB10"> + <object class="sfxlo-NotebookbarToolBox" id="LineB16"> <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="Insert-InsertSection"> + <object class="GtkToolButton" id="Insert-InsertSection1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertSection</property> @@ -4617,8 +4850,24 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-12"/> + </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="Insert-Section-Table"> + <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="separator11"> + <object class="GtkSeparator" id="separator15"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -4629,22 +4878,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="Insert-Section-Table"> - <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="SectionBottom12"> <property name="visible">True</property> @@ -4669,23 +4905,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="Insert-Section-Table1"> + <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="GroupB29"> + <object class="GtkBox" id="GroupB23"> <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="LineA15"> + <object class="sfxlo-NotebookbarToolBox" id="LineA11"> <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="Insert-InsertObjectChart"> + <object class="GtkToolButton" id="Insert-InsertObjectChart1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertObjectChart</property> @@ -4703,13 +4952,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB16"> + <object class="sfxlo-NotebookbarToolBox" id="LineB12"> <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="Insert-InsertObject"> + <object class="GtkToolButton" id="Insert-InsertObject1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertObject</property> @@ -4730,29 +4979,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator15"> - <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-11"/> + </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> @@ -4762,6 +4999,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator36"> + <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="SectionBottom65"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -4785,23 +5037,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="Insert-Section-Image1"> + <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="GroupB23"> + <object class="GtkBox" id="GroupB22"> <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="LineA11"> + <object class="sfxlo-NotebookbarToolBox" id="LineA10"> <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="Insert-Gallery"> + <object class="GtkToolButton" id="Insert-Gallery1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Gallery</property> @@ -4819,13 +5084,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB12"> + <object class="sfxlo-NotebookbarToolBox" id="LineB11"> <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="Insert-InsertAVMedia"> + <object class="GtkToolButton" id="Insert-InsertAVMedia1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertAVMedia</property> @@ -4846,29 +5111,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator36"> - <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-10"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">5</property> </packing> </child> <child> @@ -4878,6 +5131,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator16"> + <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="SectionBottom14"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -4901,23 +5169,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="Insert-Section-Bookmark1"> + <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="GroupB22"> + <object class="GtkBox" id="GroupB27"> <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="LineA10"> + <object class="sfxlo-NotebookbarToolBox" id="LineA13"> <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="Insert-InsertBookmark"> + <object class="GtkToolButton" id="Insert-InsertBookmark1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertBookmark</property> @@ -4935,13 +5216,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB11"> + <object class="sfxlo-NotebookbarToolBox" id="LineB14"> <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="Insert-InsertReferenceField"> + <object class="GtkToolButton" id="Insert-InsertReferenceField1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertReferenceField</property> @@ -4962,32 +5243,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator16"> - <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-7"/> + <class name="priority-8"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">7</property> </packing> </child> <child> @@ -4997,6 +5263,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator17"> + <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="SectionBottom11"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -5020,32 +5301,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator17"> - <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> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-7"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">8</property> </packing> </child> <child> @@ -5055,6 +5321,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator64"> + <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="SectionBottom90"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -5089,17 +5370,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-6"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">9</property> </packing> </child> <child> @@ -5109,6 +5390,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator28"> + <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="GroupB25"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -5235,29 +5531,14 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator28"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> <style> - <class name="priority-4"/> + <class name="priority-5"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">10</property> </packing> </child> <child> @@ -5267,6 +5548,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator95"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="GtkBox" id="GroupB75"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -5367,29 +5663,14 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator95"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">4</property> - </packing> - </child> <style> - <class name="priority-3"/> + <class name="priority-4"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">11</property> </packing> </child> <child> @@ -5399,6 +5680,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator12"> + <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="SectionBottom78"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -5422,32 +5718,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator12"> - <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> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-3"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">12</property> </packing> </child> <child> @@ -5457,6 +5738,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator63"> + <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="SectionBottom105"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -5480,23 +5776,39 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-2"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">13</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Insert-Section-Symbol1"> + <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="GroupB27"> + <object class="GtkBox" id="GroupB76"> <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="LineA13"> + <object class="sfxlo-NotebookbarToolBox" id="LineA12"> <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="Insert-InsertObjectStarMath"> + <object class="GtkToolButton" id="Insert-InsertObjectStarMath1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertObjectStarMath</property> @@ -5514,13 +5826,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB14"> + <object class="sfxlo-NotebookbarToolBox" id="LineB13"> <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="Insert-EmojiControl"> + <object class="GtkToolButton" id="Insert-EmojiControl1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:EmojiControl</property> @@ -5551,7 +5863,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">14</property> </packing> </child> </object> @@ -5803,6 +6115,35 @@ <property name="homogeneous">False</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Layout-Section-File2"> + <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="SectionBottom122"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="toolbar_style">both</property> + <property name="show_arrow">False</property> + <property name="icon_size">3</property> <child> <object class="GtkMenuToolButton" id="Layout-Orientation"> <property name="visible">True</property> @@ -5814,6 +6155,35 @@ <property name="homogeneous">False</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Layout-Section-File3"> + <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="SectionBottom123"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="toolbar_style">both</property> + <property name="show_arrow">False</property> + <property name="icon_size">3</property> <child> <object class="GtkMenuToolButton" id="Layout-Size"> <property name="visible">True</property> @@ -5825,6 +6195,35 @@ <property name="homogeneous">False</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Layout-Section-File4"> + <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="SectionBottom124"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="toolbar_style">both</property> + <property name="show_arrow">False</property> + <property name="icon_size">3</property> <child> <object class="GtkMenuToolButton" id="Layout-Columns"> <property name="visible">True</property> @@ -5843,20 +6242,36 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-11"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Layout-Section-File5"> + <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="GroupB28"> + <object class="GtkBox" id="GroupB30"> <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="LineA12"> + <object class="sfxlo-NotebookbarToolBox" id="LineA16"> <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="Layout-InsertPagebreak"> + <object class="GtkToolButton" id="Layout-InsertPagebreak1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertPagebreak</property> @@ -5874,13 +6289,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB13"> + <object class="sfxlo-NotebookbarToolBox" id="LineB17"> <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="Layout-InsertBreak"> + <object class="GtkToolButton" id="Layout-InsertBreak1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> @@ -5905,8 +6320,24 @@ <property name="position">2</property> </packing> </child> + <style> + <class name="priority-10"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Layout-Section-ParaMargin"> + <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="separator19"> + <object class="GtkSeparator" id="separator111"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -5917,22 +6348,9 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">3</property> + <property name="position">0</property> </packing> </child> - </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="Layout-Section-ParaMargin"> - <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="GroupB31"> <property name="visible">True</property> @@ -5990,21 +6408,37 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</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="Layout-Section-ParaMargin1"> + <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="GroupB30"> + <object class="GtkBox" id="GroupB45"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="belowspacing10"> + <object class="sfxlo-NotebookbarToolBox" id="belowspacing12"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Layout-AboveSpacing"> + <object class="GtkToolButton" id="Layout-AboveSpacing1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AboveSpacing</property> @@ -6022,11 +6456,11 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="belowspacing15"> + <object class="sfxlo-NotebookbarToolBox" id="belowspacing13"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkToolButton" id="Layout-BelowSpacing"> + <object class="GtkToolButton" id="Layout-BelowSpacing1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BelowSpacing</property> @@ -6050,29 +6484,14 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator111"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> <style> - <class name="priority-5"/> + <class name="priority-8"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">6</property> </packing> </child> <child> @@ -6082,6 +6501,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator21"> + <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="GroupB33"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -6139,25 +6573,41 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-7"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Layout-Section-Backgrounds1"> + <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="GroupB32"> + <object class="GtkBox" id="GroupB35"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin2"> + <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin3"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Layout-Hyphenate"> + <object class="GtkToolButton" id="Layout-Hyphenate1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Hyphenate</property> @@ -6175,15 +6625,15 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="belowspacing1"> + <object class="sfxlo-NotebookbarToolBox" id="belowspacing2"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Layout-LineNumberingDialog"> + <object class="GtkToolButton" id="Layout-LineNumberingDialog1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> @@ -6205,32 +6655,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator21"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-6"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">8</property> </packing> </child> <child> @@ -6240,6 +6675,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator116"> + <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="GroupB57"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -6297,32 +6747,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator116"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-5"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">9</property> </packing> </child> <child> @@ -6332,6 +6767,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator98"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="GtkBox" id="GroupB79"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -6433,32 +6883,94 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-4"/> + </style> + </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="Layout-Section-Wrap1"> + <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="separator98"> + <object class="GtkBox" id="GroupB68"> <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="valign">center</property> <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Wrap15"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Layout-ContourDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ContourDialog</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="Wrap16"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Layout-TextWrap"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:TextWrap</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="padding">5</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-3"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">11</property> </packing> </child> <child> @@ -6468,11 +6980,27 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkGrid" id="grid3"> + <object class="GtkSeparator" id="separator19"> + <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="GroupB32"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first12"> + <object class="sfxlo-NotebookbarToolBox" id="belowspacing14"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">icons</property> @@ -6490,12 +7018,13 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="second4"> + <object class="sfxlo-NotebookbarToolBox" id="belowspacing15"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">icons</property> @@ -6513,12 +7042,41 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <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> + <style> + <class name="priority-2"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">12</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Layout-Section-Arrange1"> + <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="GroupB28"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first13"> + <object class="sfxlo-NotebookbarToolBox" id="belowspacing1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> @@ -6536,12 +7094,13 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Second2"> + <object class="sfxlo-NotebookbarToolBox" id="belowspacing10"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> @@ -6559,15 +7118,16 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">2</property> </packing> </child> <style> @@ -6577,7 +7137,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">13</property> </packing> </child> </object> @@ -6740,21 +7300,34 @@ <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Reference-Section-Index1"> + <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="GroupB35"> + <object class="GtkBox" id="GroupB36"> <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="LineA16"> + <object class="sfxlo-NotebookbarToolBox" id="LineA17"> <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="References-InsertIndexesEntry"> + <object class="GtkToolButton" id="References-InsertIndexesEntry1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertIndexesEntry</property> @@ -6772,13 +7345,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB17"> + <object class="sfxlo-NotebookbarToolBox" id="LineB18"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="References-UpdateAllIndexes"> + <object class="GtkToolButton" id="References-UpdateAllIndexes1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:UpdateCurIndex</property> @@ -6802,8 +7375,24 @@ <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> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Reference-Section-Reference"> + <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="separator23"> + <object class="GtkSeparator" id="separator33"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -6814,22 +7403,9 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">3</property> + <property name="position">0</property> </packing> </child> - </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="Reference-Section-Reference"> - <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="SectionBottom18"> <property name="visible">True</property> @@ -6854,26 +7430,39 @@ <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="Reference-Section-Reference1"> + <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="GroupB36"> + <object class="GtkBox" id="GroupB38"> <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="LeftParaMargin3"> + <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin4"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="References-InsertEndnote"> + <object class="GtkToolButton" id="References-InsertEndnote1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertEndnote</property> @@ -6891,15 +7480,15 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="belowspacing2"> + <object class="sfxlo-NotebookbarToolBox" id="belowspacing3"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="References-FootnoteDialog"> + <object class="GtkToolButton" id="References-FootnoteDialog1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FootnoteDialog</property> @@ -6920,11 +7509,27 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> + <style> + <class name="priority-4"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Reference-Section-Caption"> + <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="separator33"> + <object class="GtkSeparator" id="separator34"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -6935,22 +7540,9 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">3</property> + <property name="position">0</property> </packing> </child> - </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="Reference-Section-Caption"> - <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="SectionBottom19"> <property name="visible">True</property> @@ -6975,24 +7567,37 @@ <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="Reference-Section-Caption1"> + <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="GroupB38"> + <object class="GtkBox" id="GroupB44"> <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="LineB18"> + <object class="sfxlo-NotebookbarToolBox" id="LineB23"> <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="References-InsertBookmark"> + <object class="GtkToolButton" id="References-InsertBookmark1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertBookmark</property> @@ -7010,13 +7615,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineA17"> + <object class="sfxlo-NotebookbarToolBox" id="LineA22"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="References-InsertCaptionDialog"> + <object class="GtkToolButton" id="References-InsertCaptionDialog1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertCaptionDialog</property> @@ -7037,11 +7642,27 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Reference-Section-Field"> + <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="separator34"> + <object class="GtkSeparator" id="separator61"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -7052,7 +7673,142 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">3</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom121"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="toolbar_style">both</property> + <property name="show_arrow">False</property> + <property name="icon_size">3</property> + <child> + <object class="GtkMenuToolButton" id="References-InsertFieldCtrl"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertFieldCtrl</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Reference-Section-Field1"> + <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="GroupB39"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="LineB19"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="References-InsertField1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertField</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="LineA18"> + <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="References-InsertPageNumberField1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertPageNumberField</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="References-InsertPageCountField1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertPageCountField</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="References-InsertDateField1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertDateField</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="References-InsertTitleField1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertTitleField</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> <style> @@ -7062,7 +7818,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">7</property> </packing> </child> <child> @@ -7072,6 +7828,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator23"> + <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="SectionBottom16"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -7098,21 +7869,37 @@ <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">8</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Reference-Section-Bibliothek1"> + <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="GroupB39"> + <object class="GtkBox" id="GroupB40"> <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="LineA18"> + <object class="sfxlo-NotebookbarToolBox" id="LineA19"> <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="References-BibliographyComponent"> + <object class="GtkToolButton" id="References-BibliographyComponent1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BibliographyComponent</property> @@ -7130,13 +7917,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB19"> + <object class="sfxlo-NotebookbarToolBox" id="LineB20"> <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="References-ViewDataSourceBrowser"> + <object class="GtkToolButton" id="References-ViewDataSourceBrowser1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ViewDataSourceBrowser</property> @@ -7167,7 +7954,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">9</property> </packing> </child> </object> @@ -7249,21 +8036,34 @@ <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Review-Section-Language1"> + <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="GroupB40"> + <object class="GtkBox" id="GroupB41"> <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="LineA19"> + <object class="sfxlo-NotebookbarToolBox" id="LineA20"> <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="Review-SpellOnline"> + <object class="GtkToolButton" id="Review-SpellOnline1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SpellOnline</property> @@ -7281,13 +8081,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB20"> + <object class="sfxlo-NotebookbarToolBox" id="LineB21"> <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="Review-WordCountDialog"> + <object class="GtkToolButton" id="Review-WordCountDialog1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WordCountDialog</property> @@ -7308,11 +8108,27 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> + <style> + <class name="priority-10"/> + </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="Review-Section-Annotation"> + <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="separator99"> + <object class="GtkSeparator" id="separator109"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -7323,22 +8139,9 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">3</property> + <property name="position">0</property> </packing> </child> - </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="Review-Section-Annotation"> - <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="SectionBottom69"> <property name="visible">True</property> @@ -7363,26 +8166,39 @@ <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="Review-Section-Annotation1"> + <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="GroupB41"> + <object class="GtkBox" id="GroupB42"> <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="LeftParaMargin4"> + <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin9"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Review-ReplyComment"> + <object class="GtkToolButton" id="Review-ReplyComment1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ReplyComment</property> @@ -7400,15 +8216,15 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="belowspacing3"> + <object class="sfxlo-NotebookbarToolBox" id="belowspacing9"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Review-DeleteComment"> + <object class="GtkToolButton" id="Review-DeleteComment1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:DeleteComment</property> @@ -7429,32 +8245,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator109"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> + <property name="position">0</property> </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-8"/> </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> @@ -7464,6 +8265,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator112"> + <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="SectionBottom72"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -7498,24 +8314,37 @@ <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="Review-Section-TrackChanges1"> + <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="GroupB42"> + <object class="GtkBox" id="GroupB43"> <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="LineA20"> + <object class="sfxlo-NotebookbarToolBox" id="LineA21"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Review-NextTrackedChange"> + <object class="GtkToolButton" id="Review-NextTrackedChange1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:NextTrackedChange</property> @@ -7533,13 +8362,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB21"> + <object class="sfxlo-NotebookbarToolBox" id="LineB22"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Review-PreviousTrackedChange"> + <object class="GtkToolButton" id="Review-PreviousTrackedChange1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:PreviousTrackedChange</property> @@ -7560,24 +8389,40 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> + <style> + <class name="priority-6"/> + </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="Review-Section-TrackChanges2"> + <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="GroupB44"> + <object class="GtkBox" id="GroupB84"> <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="LineB23"> + <object class="sfxlo-NotebookbarToolBox" id="LineB38"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Review-AcceptTrackedChange"> + <object class="GtkToolButton" id="Review-AcceptTrackedChange2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AcceptTrackedChange</property> @@ -7595,13 +8440,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineA22"> + <object class="sfxlo-NotebookbarToolBox" id="LineA38"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Review-RejectTrackedChange"> + <object class="GtkToolButton" id="Review-RejectTrackedChange2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:RejectTrackedChange</property> @@ -7622,24 +8467,40 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> + <style> + <class name="priority-5"/> + </style> + </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="Review-Section-TrackChanges3"> + <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="GroupB45"> + <object class="GtkBox" id="GroupB95"> <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="LineB24"> + <object class="sfxlo-NotebookbarToolBox" id="LineB42"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Review-AcceptAllTrackedChanges"> + <object class="GtkToolButton" id="Review-AcceptAllTrackedChanges3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AcceptAllTrackedChanges</property> @@ -7657,13 +8518,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineA23"> + <object class="sfxlo-NotebookbarToolBox" id="LineA42"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Review-RejectAllTrackedChanges"> + <object class="GtkToolButton" id="Review-RejectAllTrackedChanges3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:RejectAllTrackedChanges</property> @@ -7684,32 +8545,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator112"> - <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">4</property> + <property name="position">0</property> </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-4"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">7</property> </packing> </child> <child> @@ -7719,6 +8565,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator24"> + <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="SectionBottom82"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -7742,24 +8603,40 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> + </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="Review-Section-Document1"> + <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="GroupB43"> + <object class="GtkBox" id="GroupB72"> <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="LineA21"> + <object class="sfxlo-NotebookbarToolBox" id="LineA33"> <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="Review-CompareDocuments"> + <object class="GtkToolButton" id="Review-CompareDocuments1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:CompareDocuments</property> @@ -7777,13 +8654,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB22"> + <object class="sfxlo-NotebookbarToolBox" id="LineB33"> <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="Review-MergeDocuments"> + <object class="GtkToolButton" id="Review-MergeDocuments1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:MergeDocuments</property> @@ -7804,21 +8681,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator24"> - <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> @@ -7829,7 +8691,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">9</property> </packing> </child> <child> @@ -7839,6 +8701,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator62"> + <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="SectionBottom94"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -7872,7 +8749,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">10</property> </packing> </child> </object> @@ -8013,6 +8890,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> + <property name="margin_left">5</property> <property name="vexpand">True</property> <property name="toolbar_style">both</property> <property name="show_arrow">False</property> @@ -8035,17 +8913,30 @@ <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="View-Section-View1"> + <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="SectionBottom74"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom126"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="toolbar_style">both</property> <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="View-BrowseView"> + <object class="GtkToolButton" id="View-BrowseView1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BrowseView</property> @@ -8062,18 +8953,33 @@ <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">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="View-Section-View2"> + <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="SectionBottom21"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom133"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_left">5</property> <property name="vexpand">True</property> <property name="toolbar_style">both</property> <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="View-PrintPreview"> + <object class="GtkToolButton" id="View-PrintPreview2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:PrintPreview</property> @@ -8090,21 +8996,34 @@ <property name="position">2</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="View-Section-View3"> + <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="GroupB47"> + <object class="GtkBox" id="GroupB51"> <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="LineA24"> + <object class="sfxlo-NotebookbarToolBox" id="LineA28"> <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="View-ControlCodes"> + <object class="GtkToolButton" id="View-ControlCodes3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ControlCodes</property> @@ -8122,13 +9041,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB25"> + <object class="sfxlo-NotebookbarToolBox" id="LineB29"> <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="View-HideWhitespace"> + <object class="GtkToolButton" id="View-HideWhitespace3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:HideWhitespace</property> @@ -8152,8 +9071,24 @@ <property name="position">3</property> </packing> </child> + <style> + <class name="priority-6"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="View-Section-Zoom"> + <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="separator27"> + <object class="GtkSeparator" id="separator120"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -8164,22 +9099,9 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">4</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="View-Section-Zoom"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom24"> <property name="visible">True</property> @@ -8204,24 +9126,37 @@ <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="View-Section-Zoom1"> + <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="GroupB51"> + <object class="GtkBox" id="GroupB46"> <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="LineA28"> + <object class="sfxlo-NotebookbarToolBox" id="LineA1"> <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="View-Zoom100Percent"> + <object class="GtkToolButton" id="View-Zoom100Percent1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Zoom100Percent</property> @@ -8239,13 +9174,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB29"> + <object class="sfxlo-NotebookbarToolBox" id="LineB1"> <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="View-ZoomPage"> + <object class="GtkToolButton" id="View-ZoomPage1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ZoomPage</property> @@ -8266,24 +9201,40 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</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">5</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="View-Section-Zoom2"> + <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="GroupB50"> + <object class="GtkBox" id="GroupB81"> <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="LineA26"> + <object class="sfxlo-NotebookbarToolBox" id="LineA35"> <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="View-FullScreen"> + <object class="GtkToolButton" id="View-FullScreen2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FullScreen</property> @@ -8301,13 +9252,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB27"> + <object class="sfxlo-NotebookbarToolBox" id="LineB34"> <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="View-ZoomPageWidth"> + <object class="GtkToolButton" id="View-ZoomPageWidth2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ZoomPageWidth</property> @@ -8328,32 +9279,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator120"> - <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">4</property> + <property name="position">3</property> </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-4"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">6</property> </packing> </child> <child> @@ -8363,6 +9299,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator29"> + <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="SectionBottom22"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -8386,26 +9337,39 @@ <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">7</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="View-Section-Visible1"> + <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="GroupB48"> + <object class="GtkBox" id="GroupB1"> <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="LeftParaMargin5"> + <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin2"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="View-Ruler"> + <object class="GtkToolButton" id="View-Ruler1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Ruler</property> @@ -8423,15 +9387,15 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="belowspacing4"> + <object class="sfxlo-NotebookbarToolBox" id="belowspacing16"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="View-GridVisible"> + <object class="GtkToolButton" id="View-GridVisible1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:GridVisible</property> @@ -8452,26 +9416,42 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> + </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="View-Section-Visible2"> + <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="GroupB46"> + <object class="GtkBox" id="GroupB92"> <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="LeftParaMargin6"> + <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin13"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="View-Menubar"> + <object class="GtkToolButton" id="View-Menubar2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Menubar</property> @@ -8489,15 +9469,15 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="belowspacing6"> + <object class="sfxlo-NotebookbarToolBox" id="belowspacing19"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="View-Navigator"> + <object class="GtkToolButton" id="View-Navigator2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Navigator</property> @@ -8518,21 +9498,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator29"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> <property name="position">3</property> </packing> </child> @@ -8543,7 +9508,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">9</property> </packing> </child> <child> @@ -8553,6 +9518,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator27"> + <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="SectionBottom23"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -8576,7 +9556,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <style> @@ -8586,7 +9566,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">10</property> </packing> </child> </object> @@ -8752,20 +9732,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="Table-Section-Layout1"> + <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="GroupB60"> + <object class="GtkBox" id="GroupB61"> <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="SectionBottom38"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom39"> <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="Table-InsertColumnsBefore"> + <object class="GtkToolButton" id="Table-InsertColumnsBefore1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertColumnsBefore</property> @@ -8776,7 +9769,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-InsertColumnsAfter"> + <object class="GtkToolButton" id="Table-InsertColumnsAfter1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertColumnsAfter</property> @@ -8787,7 +9780,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-DeleteColumns"> + <object class="GtkToolButton" id="Table-DeleteColumns1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:DeleteColumns</property> @@ -8805,13 +9798,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom41"> <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="Table-InsertRowsBefore"> + <object class="GtkToolButton" id="Table-InsertRowsBefore1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertRowsBefore</property> @@ -8822,7 +9815,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-InsertRowsAfter"> + <object class="GtkToolButton" id="Table-InsertRowsAfter1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertRowsAfter</property> @@ -8833,7 +9826,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-DeleteRows"> + <object class="GtkToolButton" id="Table-DeleteRows1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:DeleteRows</property> @@ -8857,215 +9850,21 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator119"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Table-Section-FormatLineArea"> + <object class="sfxlo-OptionalBox" id="Table-Section-Merge"> <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="box1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="third1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">text</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Table-BorderDialog"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BorderDialog</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="third6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="toolbar_style">text</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Table-FormatArea"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FormatArea</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box17"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkBox" id="box18"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="first20"> - <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="Table-SetBorderStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SetBorderStyle</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkMenuToolButton" id="Table-LineStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:LineStyle</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom63"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkMenuToolButton" id="Table-FrameLineColor"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FrameLineColor</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box19"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom73"> - <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> - <child> - <object class="GtkMenuToolButton" id="Table-BackgroundColor"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BackgroundColor</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator5"> + <object class="GtkSeparator" id="separator45"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -9076,22 +9875,9 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">4</property> + <property name="position">0</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Table-Section-Merge"> - <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="SectionBottom37"> <property name="visible">True</property> @@ -9118,23 +9904,36 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</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="Table-Section-Merge1"> + <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="GroupB61"> + <object class="GtkBox" id="GroupB62"> <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="LineA31"> + <object class="sfxlo-NotebookbarToolBox" id="LineA25"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Table-SplitCell"> + <object class="GtkToolButton" id="Table-SplitCell1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SplitCell</property> @@ -9152,13 +9951,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB32"> + <object class="sfxlo-NotebookbarToolBox" id="LineB26"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Table-SplitTable"> + <object class="GtkToolButton" id="Table-SplitTable1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SplitTable</property> @@ -9182,8 +9981,24 @@ <property name="position">2</property> </packing> </child> + <style> + <class name="priority-11"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-Select"> + <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="separator45"> + <object class="GtkSeparator" id="separator51"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -9194,22 +10009,9 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">3</property> + <property name="position">0</property> </packing> </child> - </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="Table-Section-Select"> - <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="SectionBottom43"> <property name="visible">True</property> @@ -9234,23 +10036,39 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-10"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-Select1"> + <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="GroupB62"> + <object class="GtkBox" id="GroupB66"> <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="SectionBottom36"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom84"> <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="Table-EntireColumn"> + <object class="GtkToolButton" id="Table-EntireColumn1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:EntireColumn</property> @@ -9268,13 +10086,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom39"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom85"> <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="Table-EntireRow"> + <object class="GtkToolButton" id="Table-EntireRow1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:EntireRow</property> @@ -9295,23 +10113,39 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</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="GroupB65"> + <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="SectionBottom68"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom139"> <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="Table-SelectTable"> + <object class="GtkToolButton" id="Table-SelectTable2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SelectTable</property> @@ -9329,13 +10163,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom64"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom140"> <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="Table-DeleteTable"> + <object class="GtkToolButton" id="Table-DeleteTable2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:DeleteTable</property> @@ -9356,11 +10190,27 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> + <style> + <class name="priority-8"/> + </style> + </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="Table-Section-Style"> + <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="separator51"> + <object class="GtkSeparator" id="separator121"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -9371,17 +10221,165 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">3</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="LineA29"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both</property> + <property name="show_arrow">False</property> + <property name="icon_size">3</property> + <child> + <object class="GtkToolButton" id="Table-AutoFormat"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:AutoFormat</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">7</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-FormatLineArea3"> + <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="box22"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box24"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Object-SetBorderStyle3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:SetBorderStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-LineStyle3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineStyle</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom38"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-FrameLineColor3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FrameLineColor</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom36"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="hexpand">True</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Table-BackgroundColor1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BackgroundColor</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-7"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">8</property> </packing> </child> <child> @@ -9391,6 +10389,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator57"> + <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="SectionBottom76"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -9414,23 +10427,39 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-6"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">9</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-Optimize1"> + <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="GroupB66"> + <object class="GtkBox" id="GroupB63"> <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="SectionBottom84"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom44"> <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="Table-CellVertTop"> + <object class="GtkToolButton" id="Table-CellVertTop1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">center</property> @@ -9443,7 +10472,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-CellVertCenter"> + <object class="GtkToolButton" id="Table-CellVertCenter1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">center</property> @@ -9456,7 +10485,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-CellVertBottom"> + <object class="GtkToolButton" id="Table-CellVertBottom1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">center</property> @@ -9469,7 +10498,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-ParaRightToLeft"> + <object class="GtkToolButton" id="Table-ParaRightToLeft1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ParaRightToLeft</property> @@ -9487,13 +10516,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom85"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom101"> <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="Table-LeftPara"> + <object class="GtkToolButton" id="Table-LeftPara1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">center</property> @@ -9506,7 +10535,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-CenterPara"> + <object class="GtkToolButton" id="Table-CenterPara1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">center</property> @@ -9519,7 +10548,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-RightPara"> + <object class="GtkToolButton" id="Table-RightPara1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">center</property> @@ -9532,7 +10561,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-JustifyPara"> + <object class="GtkToolButton" id="Table-JustifyPara1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">center</property> @@ -9555,68 +10584,27 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator57"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-5"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">10</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Table-Section-Style"> + <object class="sfxlo-OptionalBox" id="Table-Section-Calc"> <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="LineA29"> - <property name="visible">True</property> - <property name="can_focus">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="Table-AutoFormat"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:AutoFormat</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator121"> + <object class="GtkSeparator" id="separator53"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -9627,25 +10615,9 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> - <style> - <class name="priority-3"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Table-Section-Calc"> - <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="SectionBottom35"> <property name="visible">True</property> @@ -9672,23 +10644,39 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> + <style> + <class name="priority-4"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">12</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-Calc1"> + <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="GroupB63"> + <object class="GtkBox" id="GroupB64"> <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="LineA30"> + <object class="sfxlo-NotebookbarToolBox" id="LineA24"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Table-InsertFormula"> + <object class="GtkToolButton" id="Table-InsertFormula1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertFormula</property> @@ -9706,13 +10694,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB31"> + <object class="sfxlo-NotebookbarToolBox" id="LineB25"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Table-AutoSum"> + <object class="GtkToolButton" id="Table-AutoSum1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AutoSum</property> @@ -9736,29 +10724,14 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator53"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> <style> - <class name="priority-2"/> + <class name="priority-3"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">13</property> </packing> </child> <child> @@ -9768,6 +10741,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator119"> + <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="SectionBottom42"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -9791,23 +10779,39 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-2"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">14</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-FormatCalc1"> + <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="GroupB64"> + <object class="GtkBox" id="GroupB97"> <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="SectionBottom41"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom109"> <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="Table-NumberFormatCurrency"> + <object class="GtkToolButton" id="Table-NumberFormatCurrency1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:NumberFormatCurrency</property> @@ -9818,7 +10822,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-NumberFormatDecimal"> + <object class="GtkToolButton" id="Table-NumberFormatDecimal1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:NumberFormatDecimal</property> @@ -9836,13 +10840,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom44"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom110"> <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="Table-NumberFormatPercent"> + <object class="GtkToolButton" id="Table-NumberFormatPercent1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:NumberFormatPercent</property> @@ -9853,7 +10857,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-NumberFormatDate"> + <object class="GtkToolButton" id="Table-NumberFormatDate1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:NumberFormatDate</property> @@ -9874,7 +10878,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> @@ -9884,7 +10888,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">15</property> </packing> </child> </object> @@ -10122,6 +11126,7 @@ <object class="sfxlo-NotebookbarToolBox" id="second3"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="margin_right">5</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -10184,21 +11189,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkSeparator" id="Image-Section-InsertCaptionDialog-Separator1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -10207,180 +11197,14 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Image-Section-FormatLineArea"> + <object class="sfxlo-OptionalBox" id="Image-Section-Anchor"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="margin_right">5</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="box6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="third2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">text</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Image-BorderDialog"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BorderDialog</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="third3"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">text</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Image-FormatArea"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FormatArea</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkBox" id="box9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="first10"> - <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="Image-SetBorderStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:SetBorderStyle</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Image-LineStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:LineStyle</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom55"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Image-FrameLineColor"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FrameLineColor</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom56"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Image-FillStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FillStyle</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator69"> + <object class="GtkSeparator" id="separator50"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10391,34 +11215,20 @@ <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">1</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Image-Section-Anchor"> - <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="SectionBottom45"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="toolbar_style">both</property> <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkMenuToolButton" id="Image-AnchorMenu"> + <object class="GtkMenuToolButton" id="Object-Anchor1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -10434,21 +11244,21 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-8"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Image-Section-Wrap"> + <object class="sfxlo-OptionalBox" id="Image-Section-Wrap1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -10459,13 +11269,13 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap5"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap1"> <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="Image-WrapOff"> + <object class="GtkToolButton" id="Object-WrapOff2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapOff</property> @@ -10476,7 +11286,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-WrapOn"> + <object class="GtkToolButton" id="Object-WrapOn2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapOn</property> @@ -10487,7 +11297,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-WrapIdeal"> + <object class="GtkToolButton" id="Object-WrapIdeal2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapIdeal</property> @@ -10505,13 +11315,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap6"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap2"> <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="Image-WrapLeft"> + <object class="GtkToolButton" id="Object-WrapLeft2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapLeft</property> @@ -10522,7 +11332,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-WrapThrough"> + <object class="GtkToolButton" id="Object-WrapThrough2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapThrough</property> @@ -10533,7 +11343,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-WrapRight"> + <object class="GtkToolButton" id="Object-WrapRight2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapRight</property> @@ -10554,22 +11364,38 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-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="Image-Section-Wrap2"> + <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="WrapGroup4"> + <object class="GtkBox" id="WrapGroup3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap1"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap5"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-ContourDialog"> + <object class="GtkToolButton" id="Object-ContourDialog1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ContourDialog</property> @@ -10587,13 +11413,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap2"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap6"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-TextWrap"> + <object class="GtkToolButton" id="Object-TextWrap1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:TextWrap</property> @@ -10614,11 +11440,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-6"/> </style> </object> <packing> @@ -10632,10 +11458,24 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_right">5</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="box5"> + <object class="GtkSeparator" id="separator52"> + <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="box3"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -10646,11 +11486,11 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="Align5"> <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="Image-ObjectAlignLeft"> + <object class="GtkToolButton" id="Object-ObjectAlignLeft1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignLeft</property> @@ -10661,7 +11501,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-AlignCenter"> + <object class="GtkToolButton" id="Object-AlignCenter1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignCenter</property> @@ -10672,7 +11512,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-ObjectAlignRight"> + <object class="GtkToolButton" id="Object-ObjectAlignRight1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignRight</property> @@ -10692,11 +11532,11 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="Align6"> <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="Image-AlignUp"> + <object class="GtkToolButton" id="Object-AlignUp1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignUp</property> @@ -10707,7 +11547,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-AlignMiddle"> + <object class="GtkToolButton" id="Object-AlignMiddle1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignMiddle</property> @@ -10718,7 +11558,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-AlignDown"> + <object class="GtkToolButton" id="Object-AlignDown1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignDown</property> @@ -10750,7 +11590,7 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-5"/> </style> </object> <packing> @@ -10766,17 +11606,32 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator54"> + <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="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first2"> + <object class="sfxlo-NotebookbarToolBox" id="first1"> <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="Image-BringToFront"> + <object class="GtkToolButton" id="Object-BringToFront1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BringToFront</property> @@ -10795,11 +11650,11 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="second2"> <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="Image-SendToBack"> + <object class="GtkToolButton" id="Object-SendToBack1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SendToBack</property> @@ -10816,13 +11671,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="first7"> + <object class="sfxlo-NotebookbarToolBox" id="first2"> <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="Image-ObjectForwardOne"> + <object class="GtkToolButton" id="Object-ObjectForwardOne1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectForwardOne</property> @@ -10839,13 +11694,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Second7"> + <object class="sfxlo-NotebookbarToolBox" id="Second5"> <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="Image-ObjectBackOne"> + <object class="GtkToolButton" id="Object-ObjectBackOne1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectBackOne</property> @@ -10865,11 +11720,27 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-4"/> + </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="Image-Section-FormatLineArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator123"> + <object class="GtkSeparator" id="separator55"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10883,14 +11754,194 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkBox" id="box5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-FormatArea1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatArea</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-BorderDialog1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BorderDialog</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> <style> - <class name="priority-1"/> + <class name="priority-9"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Image-Section-FormatLineArea1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="GtkBox" id="box6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom50"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-FillStyle2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Object-SetBorderStyle2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:SetBorderStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-LineStyle2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineStyle</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom55"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-FrameLineColor2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FrameLineColor</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </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">7</property> </packing> </child> <child> @@ -10900,6 +11951,19 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator56"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="sfxlo-NotebookbarToolBox" id="GraphicFilterToolboxGroup"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -10920,17 +11984,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-3"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">8</property> </packing> </child> <child> @@ -11007,14 +12071,14 @@ </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-2"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">7</property> + <property name="position">9</property> </packing> </child> <child> @@ -11089,15 +12153,24 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-1"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">10</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">True</property> @@ -11314,8 +12387,7 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom49"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="vexpand">True</property> + <property name="margin_right">5</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -11376,21 +12448,6 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator66"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -11399,171 +12456,14 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Draw-Section-FormatLineArea"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Anchor"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="margin_right">5</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="box59"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="third10"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">text</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Draw-FormatLine"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FormatLine</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="third13"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">text</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Draw-FormatArea"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FormatArea</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box56"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkBox" id="box3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="first41"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkMenuToolButton" id="Draw-XLineStyle"> - <property name="width_request">100</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:XLineStyle</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="first1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Draw-XLineColor"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:XLineColor</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom50"> - <property name="width_request">200</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Draw-FillStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FillStyle</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator68"> + <object class="GtkSeparator" id="separator66"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -11574,23 +12474,9 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">3</property> + <property name="position">0</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Draw-Section-Anchor"> - <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="SectionBottom58"> <property name="visible">True</property> @@ -11617,7 +12503,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <style> @@ -11627,7 +12513,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> @@ -11807,7 +12693,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <child> @@ -11815,9 +12701,23 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_right">5</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator48"> + <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="box12"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -11939,7 +12839,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">3</property> </packing> </child> <child> @@ -11949,6 +12849,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator49"> + <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="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -12048,11 +12963,27 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-4"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-FormatLineArea2"> + <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="separator67"> + <object class="GtkSeparator" id="separator37"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12066,8 +12997,68 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkBox" id="box10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FormatArea1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatArea</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FormatLine1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatLine</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> <style> - <class name="priority-3"/> + <class name="priority-8"/> </style> </object> <packing> @@ -12077,12 +13068,158 @@ </packing> </child> <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-FormatLineArea3"> + <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="box15"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom60"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FillStyle2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box16"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first16"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Draw-XLineStyle1"> + <property name="width_request">100</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:XLineStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-LineWidth"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineWidth</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom61"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-LineEndStyle1"> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineEndStyle</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-XLineColor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:XLineColor</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">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">True</property> + <property name="position">6</property> + </packing> + </child> + <child> <object class="sfxlo-OptionalBox" id="Draw-Section-Group"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator132"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom51"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -12106,7 +13243,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> @@ -12174,21 +13311,6 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator132"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> <style> <class name="priority-3"/> </style> @@ -12196,7 +13318,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">8</property> </packing> </child> <child> @@ -12206,6 +13328,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator30"> + <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="GroupB73"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -12296,21 +13433,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator30"> - <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> @@ -12321,7 +13443,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">9</property> </packing> </child> <child> @@ -12331,6 +13453,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator44"> + <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="SectionBottom98"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -12451,7 +13588,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">10</property> </packing> </child> </object> @@ -12657,8 +13794,6 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom54"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> @@ -12683,8 +13818,6 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom57"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> @@ -12712,21 +13845,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator37"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -12735,180 +13853,14 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Object-Section-FormatLineArea"> + <object class="sfxlo-OptionalBox" id="Object-Section-Anchor"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="margin_right">5</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="box14"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="third4"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">text</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Object-BorderDialog"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BorderDialog</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="third5"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">text</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Object-FormatArea"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FormatArea</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box15"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkBox" id="box16"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="first16"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkMenuToolButton" id="Object-SetBorderStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:SetBorderStyle</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Object-LineStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:LineStyle</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom60"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Object-FrameLineColor"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FrameLineColor</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom61"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Object-FillStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FillStyle</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator32"> + <object class="GtkSeparator" id="separator42"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12919,23 +13871,9 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">4</property> + <property name="position">0</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Object-Section-Anchor"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom30"> <property name="visible">True</property> @@ -12962,38 +13900,38 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-5"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Object-Section-Wrap"> + <object class="sfxlo-OptionalBox" id="Object-Section-Wrap1"> <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="WrapGroup3"> + <object class="GtkBox" id="WrapGroup9"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap9"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap19"> <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="Object-WrapOff"> + <object class="GtkToolButton" id="Object-WrapOff1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapOff</property> @@ -13004,7 +13942,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-WrapOn"> + <object class="GtkToolButton" id="Object-WrapOn1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapOn</property> @@ -13015,7 +13953,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-WrapIdeal"> + <object class="GtkToolButton" id="Object-WrapIdeal1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapIdeal</property> @@ -13033,13 +13971,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap10"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap20"> <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="Object-WrapLeft"> + <object class="GtkToolButton" id="Object-WrapLeft1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapLeft</property> @@ -13050,7 +13988,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-WrapThrough"> + <object class="GtkToolButton" id="Object-WrapThrough1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapThrough</property> @@ -13061,7 +13999,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-WrapRight"> + <object class="GtkToolButton" id="Object-WrapRight1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapRight</property> @@ -13082,9 +14020,25 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-4"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-Wrap2"> + <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="WrapGroup6"> <property name="visible">True</property> @@ -13142,7 +14096,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> @@ -13152,7 +14106,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">3</property> </packing> </child> <child> @@ -13160,9 +14114,23 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_right">5</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator46"> + <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="box8"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -13284,7 +14252,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">4</property> </packing> </child> <child> @@ -13294,6 +14262,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator47"> + <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="GtkGrid" id="grid5"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -13393,7 +14376,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <style> @@ -13403,9 +14386,223 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-FormatLineArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="GtkSeparator" id="separator32"> + <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="GtkBox" id="box14"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third5"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-FormatArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatArea</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third4"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-BorderDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BorderDialog</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <style> + <class name="priority-6"/> + </style> + </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="Object-Section-FormatLineArea1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="GtkBox" id="box20"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom117"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-FillStyle1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box21"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first23"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Object-SetBorderStyle1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:SetBorderStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-LineStyle1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineStyle</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom120"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-FrameLineColor1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FrameLineColor</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <style> + <class name="priority-7"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> </object> <packing> <property name="expand">True</property> @@ -13583,8 +14780,6 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom28"> <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> @@ -13609,8 +14804,7 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom31"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> + <property name="margin_right">5</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -13671,21 +14865,6 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator41"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -13694,54 +14873,11 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Media-Section-AVMediaToolbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="first5"> - <property name="width_request">1000</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Media-AVMediaToolBox"> - <property name="width_request">800</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="action_name">.uno:AVMediaToolBox</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <style> - <class name="priority-5"/> - </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="Media-Section-Anchor"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="margin_right">5</property> <property name="vexpand">True</property> <child> <object class="GtkSeparator" id="separator31"> @@ -13761,14 +14897,14 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom47"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="toolbar_style">both</property> <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkMenuToolButton" id="Media-Anchor"> + <object class="GtkMenuToolButton" id="Object-Anchor2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -13788,17 +14924,17 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-5"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Media-Section-Wrap"> + <object class="sfxlo-OptionalBox" id="Media-Section-Wrap1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -13811,11 +14947,11 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="Wrap3"> <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="Media-WrapOff"> + <object class="GtkToolButton" id="Object-WrapOff3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapOff</property> @@ -13826,7 +14962,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-WrapOn"> + <object class="GtkToolButton" id="Object-WrapOn3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapOn</property> @@ -13837,7 +14973,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-WrapIdeal"> + <object class="GtkToolButton" id="Object-WrapIdeal3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapIdeal</property> @@ -13857,11 +14993,11 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="Wrap4"> <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="Media-WrapLeft"> + <object class="GtkToolButton" id="Object-WrapLeft3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapLeft</property> @@ -13872,7 +15008,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-WrapThrough"> + <object class="GtkToolButton" id="Object-WrapThrough3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapThrough</property> @@ -13883,7 +15019,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-WrapRight"> + <object class="GtkToolButton" id="Object-WrapRight3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapRight</property> @@ -13904,22 +15040,38 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-4"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Media-Section-Wrap2"> + <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="WrapGroup7"> + <object class="GtkBox" id="WrapGroup4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap15"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap9"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-ContourDialog"> + <object class="GtkToolButton" id="Object-ContourDialog2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ContourDialog</property> @@ -13937,13 +15089,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap16"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap10"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-TextWrap"> + <object class="GtkToolButton" id="Object-TextWrap2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:TextWrap</property> @@ -13964,7 +15116,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> @@ -13982,9 +15134,23 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_right">5</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator58"> + <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="box2"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -13996,11 +15162,11 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="Align3"> <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="Media-ObjectAlignLeft"> + <object class="GtkToolButton" id="Object-ObjectAlignLeft2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignLeft</property> @@ -14011,7 +15177,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-AlignCenter"> + <object class="GtkToolButton" id="Object-AlignCenter2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignCenter</property> @@ -14022,7 +15188,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-ObjectAlignRight"> + <object class="GtkToolButton" id="Object-ObjectAlignRight2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignRight</property> @@ -14042,11 +15208,11 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="Align4"> <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="Media-AlignUp"> + <object class="GtkToolButton" id="Object-AlignUp2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignUp</property> @@ -14057,7 +15223,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-AlignMiddle"> + <object class="GtkToolButton" id="Object-AlignMiddle2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignMiddle</property> @@ -14068,7 +15234,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-AlignDown"> + <object class="GtkToolButton" id="Object-AlignDown2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignDown</property> @@ -14116,17 +15282,32 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator60"> + <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="GtkGrid" id="grid4"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first14"> + <object class="sfxlo-NotebookbarToolBox" id="first10"> <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="Media-BringToFront"> + <object class="GtkToolButton" id="Object-BringToFront2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BringToFront</property> @@ -14145,11 +15326,11 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="second5"> <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="Media-SendToBack"> + <object class="GtkToolButton" id="Object-SendToBack2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SendToBack</property> @@ -14166,13 +15347,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="first15"> + <object class="sfxlo-NotebookbarToolBox" id="first14"> <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="Media-ObjectForwardOne"> + <object class="GtkToolButton" id="Object-ObjectForwardOne2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectForwardOne</property> @@ -14191,11 +15372,11 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="Second3"> <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="Media-ObjectBackOne"> + <object class="GtkToolButton" id="Object-ObjectBackOne2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectBackOne</property> @@ -14215,7 +15396,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <style> @@ -14228,6 +15409,102 @@ <property name="position">5</property> </packing> </child> + <child> + <object class="sfxlo-OptionalBox" id="Media-Section-AVMediaToolBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="GtkSeparator" id="separator41"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom132"> + <property name="width_request">148</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Media-AVMediaToolBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AVMediaToolBox</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="SectionBottom56"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Media-AVMediaPlayer1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AVMediaPlayer</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">True</property> @@ -14366,6 +15643,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> + <property name="margin_left">5</property> <property name="vexpand">True</property> <property name="resize_mode">immediate</property> <property name="toolbar_style">both</property> @@ -14388,17 +15666,30 @@ <property name="position">0</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Print-Section-ShowPageGroup1"> + <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="first21"> + <object class="sfxlo-NotebookbarToolBox" id="first12"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="resize_mode">immediate</property> <property name="toolbar_style">both</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Print-ShowMultiplePages"> + <object class="GtkMenuToolButton" id="Print-ShowMultiplePages1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -14417,22 +15708,38 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-2"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Print-Section-ShowPageGroup2"> + <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="box11"> + <object class="GtkBox" id="box23"> <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="first4"> + <object class="sfxlo-NotebookbarToolBox" id="first25"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="resize_mode">immediate</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Print-ShowTwoPages"> + <object class="GtkToolButton" id="Print-ShowTwoPages2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ShowTwoPages</property> @@ -14450,14 +15757,14 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="second9"> + <object class="sfxlo-NotebookbarToolBox" id="second8"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="resize_mode">immediate</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Print-ShowBookview"> + <object class="GtkToolButton" id="Print-ShowBookview2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ShowBookview</property> @@ -14481,21 +15788,6 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator74"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -14503,7 +15795,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">0</property> + <property name="position">2</property> </packing> </child> <child> @@ -14513,6 +15805,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="GtkBox" id="box4"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -14639,11 +15946,27 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Print-Section-Print"> + <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="separator1"> + <object class="GtkSeparator" id="separator73"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -14654,22 +15977,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">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Print-Section-Print"> - <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="first3"> <property name="visible">True</property> @@ -14695,7 +16005,7 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="padding">5</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> @@ -14722,16 +16032,19 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">2</property> + <property name="position">4</property> </packing> </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">True</property> @@ -14952,15 +16265,15 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Form1"> + <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="SectionBottom109"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom89"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> <property name="margin_left">5</property> <property name="vexpand">True</property> @@ -14968,7 +16281,7 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Form-SwitchControlDesignMode"> + <object class="GtkToolButton" id="Form-SwitchControlDesignMode1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SwitchControlDesignMode</property> @@ -14985,6 +16298,19 @@ <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="Form-Section-Form1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="GtkBox" id="GroupB52"> <property name="visible">True</property> @@ -15051,6 +16377,22 @@ <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="Form-Section-Form2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="GtkSeparator" id="separator39"> <property name="visible">True</property> @@ -15063,22 +16405,9 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">3</property> + <property name="position">0</property> </packing> </child> - </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="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="GtkBox" id="GroupB59"> <property name="visible">True</property> @@ -15138,21 +16467,18 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> - <style> - <class name="priority-5"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Form4"> + <object class="sfxlo-OptionalBox" id="Form-Section-Form3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -15220,22 +16546,37 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-5"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Form5"> + <object class="sfxlo-OptionalBox" id="Form-Section-Form4"> <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="separator35"> + <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="GroupB82"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -15294,41 +16635,41 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator35"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-7"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Form2"> + <object class="sfxlo-OptionalBox" id="Form-Section-Form5"> <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="separator20"> + <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="GroupB54"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -15336,13 +16677,13 @@ <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom110"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom3"> <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="Form-Label"> + <object class="GtkToolButton" id="Tools-Label1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Label</property> @@ -15353,7 +16694,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Form-Edit"> + <object class="GtkToolButton" id="Tools-Edit1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Edit</property> @@ -15364,7 +16705,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Form-CheckBox"> + <object class="GtkToolButton" id="Tools-CheckBox1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:CheckBox</property> @@ -15374,8 +16715,21 @@ <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="SectionBottom7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Form-RadioButton"> + <object class="GtkToolButton" id="Tools-RadioButton2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:RadioButton</property> @@ -15386,7 +16740,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Form-ListBox"> + <object class="GtkToolButton" id="Tools-ListBox2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ListBox</property> @@ -15397,7 +16751,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Form-ComboBox"> + <object class="GtkToolButton" id="Tools-ComboBox2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ComboBox</property> @@ -15411,20 +16765,65 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</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> + <style> + <class name="priority-3"/> + </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="Tools-Section-Form6"> + <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="separator40"> + <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="GroupB96"> + <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="SectionBottom111"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom9"> <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="Form-FormattedField"> + <object class="GtkToolButton" id="Tools-NumericField2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormattedField</property> + <property name="action_name">.uno:NumericField</property> </object> <packing> <property name="expand">False</property> @@ -15432,10 +16831,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Form-DateField"> + <object class="GtkToolButton" id="Tools-CurrencyField2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DateField</property> + <property name="action_name">.uno:CurrencyField</property> </object> <packing> <property name="expand">False</property> @@ -15443,21 +16842,34 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Form-TimeField"> + <object class="GtkToolButton" id="Tools-PatternField2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:TimeField</property> + <property name="action_name">.uno:PatternField</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="SectionBottom77"> + <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="Form-NumericField"> + <object class="GtkToolButton" id="Tools-FormattedField1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:NumericField</property> + <property name="action_name">.uno:FormattedField</property> </object> <packing> <property name="expand">False</property> @@ -15465,10 +16877,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Form-CurrencyField"> + <object class="GtkToolButton" id="Tools-DateField1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CurrencyField</property> + <property name="action_name">.uno:DateField</property> </object> <packing> <property name="expand">False</property> @@ -15476,10 +16888,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Form-PatternField"> + <object class="GtkToolButton" id="Tools-TimeField1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:PatternField</property> + <property name="action_name">.uno:TimeField</property> </object> <packing> <property name="expand">False</property> @@ -15497,21 +16909,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator40"> - <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> @@ -15522,16 +16919,31 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">6</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Form3"> + <object class="sfxlo-OptionalBox" id="Form-Section-Form7"> <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="separator7"> + <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="GroupB56"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -15634,7 +17046,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <style> @@ -15644,7 +17056,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">7</property> </packing> </child> </object> @@ -15810,21 +17222,34 @@ <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Tools-Section-Macro1"> + <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="GroupB77"> + <object class="GtkBox" id="GroupB50"> <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="LineA25"> + <object class="sfxlo-NotebookbarToolBox" id="LineA23"> <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="Tools-BasicIDEAppear"> + <object class="GtkToolButton" id="Tools-BasicIDEAppear1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BasicIDEAppear</property> @@ -15842,12 +17267,12 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB26"> + <object class="sfxlo-NotebookbarToolBox" id="LineB24"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <child> - <object class="GtkToolButton" id="Tools-MacroDialog"> + <object class="GtkToolButton" id="Tools-MacroDialog1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:MacroDialog</property> @@ -15871,8 +17296,24 @@ <property name="position">2</property> </packing> </child> + <style> + <class name="priority-7"/> + </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="Tools-Section-MailMerge"> + <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="separator115"> + <object class="GtkSeparator" id="separator140"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -15883,22 +17324,9 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">3</property> + <property name="position">0</property> </packing> </child> - </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="Tools-Section-MailMerge"> - <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="SectionBottom95"> <property name="visible">True</property> @@ -15923,26 +17351,39 @@ <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="Tools-Section-MailMerge1"> + <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="GroupB85"> + <object class="GtkBox" id="GroupB48"> <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="LeftParaMargin7"> + <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin6"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Tools-InsertEnvelope"> + <object class="GtkToolButton" id="Tools-InsertEnvelope1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertEnvelope</property> @@ -15960,15 +17401,15 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="belowspacing7"> + <object class="sfxlo-NotebookbarToolBox" id="belowspacing6"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Tools-SendMail"> + <object class="GtkToolButton" id="Tools-SendMail1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SendMail</property> @@ -15989,32 +17430,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator140"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-6"/> </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> @@ -16024,6 +17450,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator141"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom96"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -16047,26 +17488,39 @@ <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="Tools-Section-Form1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB86"> + <object class="GtkBox" id="GroupB47"> <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="LeftParaMargin8"> + <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin5"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Tools-UseWizards"> + <object class="GtkToolButton" id="Tools-UseWizards1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:UseWizards</property> @@ -16084,15 +17538,15 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="belowspacing8"> + <object class="sfxlo-NotebookbarToolBox" id="belowspacing4"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Tools-GroupBox"> + <object class="GtkToolButton" id="Tools-GroupBox1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:GroupBox</property> @@ -16113,41 +17567,41 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator141"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-5"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">5</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Tools-Section-Form1"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator142"> + <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="GroupB88"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -16193,8 +17647,21 @@ <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="SectionBottom21"> + <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="Tools-RadioButton"> + <object class="GtkToolButton" id="Tools-RadioButton1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:RadioButton</property> @@ -16205,7 +17672,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Tools-ListBox"> + <object class="GtkToolButton" id="Tools-ListBox1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ListBox</property> @@ -16216,7 +17683,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Tools-ComboBox"> + <object class="GtkToolButton" id="Tools-ComboBox1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ComboBox</property> @@ -16230,20 +17697,65 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</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> + <style> + <class name="priority-4"/> + </style> + </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="Tools-Section-Form3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="GtkSeparator" id="separator65"> + <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="GroupB77"> + <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="SectionBottom100"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom74"> <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="Tools-FormattedField"> + <object class="GtkToolButton" id="Tools-NumericField1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormattedField</property> + <property name="action_name">.uno:NumericField</property> </object> <packing> <property name="expand">False</property> @@ -16251,10 +17763,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Tools-DateField"> + <object class="GtkToolButton" id="Tools-CurrencyField1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DateField</property> + <property name="action_name">.uno:CurrencyField</property> </object> <packing> <property name="expand">False</property> @@ -16262,21 +17774,34 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Tools-TimeField"> + <object class="GtkToolButton" id="Tools-PatternField1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:TimeField</property> + <property name="action_name">.uno:PatternField</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="SectionBottom100"> + <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="Tools-NumericField"> + <object class="GtkToolButton" id="Tools-FormattedField"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:NumericField</property> + <property name="action_name">.uno:FormattedField</property> </object> <packing> <property name="expand">False</property> @@ -16284,10 +17809,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Tools-CurrencyField"> + <object class="GtkToolButton" id="Tools-DateField"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CurrencyField</property> + <property name="action_name">.uno:DateField</property> </object> <packing> <property name="expand">False</property> @@ -16295,10 +17820,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Tools-PatternField"> + <object class="GtkToolButton" id="Tools-TimeField"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:PatternField</property> + <property name="action_name">.uno:TimeField</property> </object> <packing> <property name="expand">False</property> @@ -16316,21 +17841,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator142"> - <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> @@ -16341,16 +17851,31 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">7</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Tools-Section-Form2"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form4"> <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="separator144"> + <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="GroupB89"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -16453,21 +17978,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator144"> - <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> @@ -16478,16 +17988,31 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">8</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Tools-Section-Form3"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form5"> <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="separator11"> + <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="GroupB91"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -16590,7 +18115,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <style> @@ -16600,7 +18125,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">9</property> </packing> </child> </object> diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_compact.ui index e74ae2f75182..aa04d899a528 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui @@ -1114,6 +1114,70 @@ </object> </child> </object> + <object class="GtkMenu" id="MenuObject"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="MenuObject-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> + <property name="action_name">.uno:ChainFrames</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuObject-UnhainFrames"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:UnhainFrames</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuObject-separator"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuObject-NameGroup"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NameGroup</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuObject-ObjectTitleDescription"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectTitleDescription</property> + </object> + </child> + <child> + <object class="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> + <property name="action_name">.uno:FrameDialog</property> + </object> + </child> + </object> <object class="GtkMenu" id="MenuPage"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -8377,7 +8441,7 @@ </packing> </child> <child> - <object class="sfxlo-PriorityHBox" id="ImageBox"> + <object class="sfxlo-PriorityHBox" id="GraphicBox"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -8400,39 +8464,52 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="ImageContainer"> + <object class="sfxlo-PriorityMergedHBox" id="GraphicContainer"> <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="ColorSelection"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Label"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom46"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> + <property name="margin_top">4</property> + <property name="margin_bottom">4</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Image-GraphicFilterToolbox"> + <object class="GtkToolButton" id="Object-InsertCaptionDialog3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:GraphicFilterToolbox</property> + <property name="action_name">.uno:InsertCaptionDialog</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="SectionBottom78"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Image-GrafMode"> + <object class="GtkToolButton" id="Object-NameGroup2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:GrafMode</property> + <property name="action_name">.uno:NameGroup</property> </object> <packing> <property name="expand">False</property> @@ -8443,11 +8520,60 @@ <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">0</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Styles"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom47"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Graphic-StyleApply2"> + <property name="can_focus">False</property> + <property name="action_name">.uno:StyleApply</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> + <style> + <class name="priority-11"/> + </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="Graphic-Section-Anchor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator182"> + <object class="GtkSeparator" id="separator65"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -8458,34 +8584,57 @@ <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> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Anchor1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Graphic-AnchorMenu1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AnchorMenu</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> + <style> + <class name="priority-10"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">2</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="GraphSelection"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Wrap1"> <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="SectionBottom48"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap10"> <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="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Image-GrafLuminance"> + <object class="GtkToolButton" id="Graphic-WrapOff"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:GrafLuminance</property> + <property name="action_name">.uno:WrapOff</property> </object> <packing> <property name="expand">False</property> @@ -8493,11 +8642,10 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="Image-GrafContrast"> + <object class="GtkToolButton" id="Graphic-WrapOn"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:GrafContrast</property> + <property name="action_name">.uno:WrapOn</property> </object> <packing> <property name="expand">False</property> @@ -8505,11 +8653,10 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="Image-GrafTransparence"> + <object class="GtkToolButton" id="Graphic-WrapIdeal"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:GrafTransparence</property> + <property name="action_name">.uno:WrapIdeal</property> </object> <packing> <property name="expand">False</property> @@ -8520,63 +8667,61 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator183"> - <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> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-9"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ImageEditSelection"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Wrap2"> <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="SectionBottom47"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap11"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</property> + <property name="can_focus">False</property> + <property name="margin_left">5</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-CompressGraphic"> + <object class="GtkToolButton" id="Graphic-WrapLeft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CompressGraphic</property> + <property name="action_name">.uno:WrapLeft</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Image-ChangePicture"> + <object class="GtkToolButton" id="Graphic-WrapThrough"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ChangePicture</property> + <property name="action_name">.uno:WrapThrough</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Graphic-WrapRight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:WrapRight</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -8586,48 +8731,86 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-8"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Graphic-Section-WrapDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator65"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap12"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Graphic-TextWrap1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="visible_horizontal">False</property> + <property name="action_name">.uno:TextWrap</property> + <property name="icon_name">sfx2/res/symphony/open_more.png</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> <style> - <class name="priority-8"/> + <class name="priority-7"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">5</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ColorSelection1"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Align1"> <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="SectionBottom79"> + <object class="GtkSeparator" id="separator66"> <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="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="Align7"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Image-SetBorderStyle"> + <object class="GtkToolButton" id="Graphic-ObjectAlignLeft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LineStyle</property> + <property name="action_name">.uno:ObjectAlignLeft</property> </object> <packing> <property name="expand">False</property> @@ -8635,10 +8818,21 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="Image-BackgroundColor"> + <object class="GtkToolButton" id="Graphic-AlignCenter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FrameLineColor</property> + <property name="action_name">.uno:AlignCenter</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Graphic-ObjectAlignRight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignRight</property> </object> <packing> <property name="expand">False</property> @@ -8649,127 +8843,157 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator67"> - <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> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-6"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">6</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="WrapSelection"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Align2"> <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="SectionBottom78"> + <object class="sfxlo-NotebookbarToolBox" id="Align8"> <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">icons</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Image-AnchorMenu"> + <object class="GtkToolButton" id="Graphic-AlignUp"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="action_name">.uno:AnchorMenu</property> + <property name="action_name">.uno:AlignUp</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Graphic-AlignMiddle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignMiddle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Graphic-AlignDown"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignDown</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-5"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Arrange1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="svtlo-ManagedMenuButton" id="Image-WrapButton:MenuWrap"> - <property name="label" translatable="yes" context="notebookbar_compact|WrapMenuButton">Wrap</property> + <object class="GtkSeparator" id="separator67"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="relief">none</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="padding">5</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator181"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom48"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Graphic-BringToFront"> + <property name="can_focus">False</property> + <property name="action_name">.uno:BringToFront</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Graphic-ObjectForwardOne"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectForwardOne</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-4"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">8</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ArrangeSelection"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Arrange2"> <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="SectionBottom74"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom49"> <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="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-BringToFront"> + <object class="GtkToolButton" id="Graphic-ObjectBackOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BringToFront</property> + <property name="action_name">.uno:ObjectBackOne</property> </object> <packing> <property name="expand">False</property> @@ -8777,10 +9001,9 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-AlignCenter"> - <property name="visible">True</property> + <object class="GtkToolButton" id="Graphic-SendToBack1"> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> + <property name="action_name">.uno:SendToBack</property> </object> <packing> <property name="expand">False</property> @@ -8791,136 +9014,148 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator69"> - <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> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-3"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">9</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="AlignSelection"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Crop"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="vexpand">True</property> <child> - <object class="svtlo-ManagedMenuButton" id="Image-AlignButton:MenuAlign"> - <property name="label" translatable="yes" context="notebookbar_compact|AlignMenuButton">A_lign</property> + <object class="GtkSeparator" id="separator68"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">False</property> - <property name="valign">center</property> - <property name="relief">none</property> - <property name="use_underline">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="position">1</property> + <property name="padding">5</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator68"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Graphic-Crop"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Crop</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> - <style> - <class name="priority-4"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">10</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ConfigSelection"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-SaveReplace"> <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="SectionBottom49"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom17"> <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="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-FlipVertical"> + <object class="GtkToolButton" id="Graphic-ChangePicture"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipVertical</property> + <property name="action_name">.uno:ChangePicture</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Image-FlipHorizontal"> + <object class="GtkToolButton" id="Graphic-CompressGraphic"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> + <property name="action_name">.uno:CompressGraphic</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Image-RotateLeft"> + <object class="GtkToolButton" id="Graphic-SaveGraphic"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:RotateLeft</property> + <property name="action_name">.uno:SaveGraphic</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">11</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Graphic-Section-GraphicDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Graphic"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-RotateRight"> + <object class="GtkToolButton" id="Graphic-GraphicDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:RotateRight</property> + <property name="visible_horizontal">False</property> + <property name="action_name">.uno:GraphicDialog</property> + <property name="icon_name">sfx2/res/symphony/open_more.png</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -8930,8 +9165,20 @@ <property name="position">0</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">12</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Graphic-Section-GraphicFilterToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator66"> + <object class="GtkSeparator" id="separator69"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -8942,40 +9189,63 @@ <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> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom50"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Graphic-GraphicFilterToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GraphicFilterToolbox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</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-3"/> + <class name="priority-16"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">13</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="CropSection"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-ColorSettings"> <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="SectionBottom73"> <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="Image-Crop"> + <object class="GtkToolButton" id="Graphic-ColorSettings"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Crop</property> + <property name="action_name">.uno:ColorSettings</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -8985,52 +9255,73 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-15"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">14</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Graphic-Section-GrafMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator201"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Graphic-GrafMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GrafMode</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-14"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">15</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="CaptureSection"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-GrafTransparence"> <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="SectionBottom50"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom74"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-InsertCaptionDialog"> + <object class="GtkMenuToolButton" id="Graphic-GrafTransparence"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertCaptionDialog</property> + <property name="action_name">.uno:GrafTransparence</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -9040,8 +9331,23 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-13"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">16</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Rotate"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator200"> + <object class="GtkSeparator" id="separator126"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -9052,17 +9358,94 @@ <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> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom12"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Graphic-ToggleObjectRotateMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ToggleObjectRotateMode</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Graphic-RotateRight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RotateRight</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> - <style> - <class name="priority-1"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">17</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Flip"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Graphic-FlipVertical"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlipVertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Graphic-FlipHorizontal"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlipHorizontal</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </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">18</property> </packing> </child> </object> @@ -9073,7 +9456,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="ImageSelection"> + <object class="sfxlo-DropdownBox" id="GraphicSelection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -9164,44 +9547,173 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="DrawElementSection"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Label"> <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="SectionBottom58"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom52"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> + <property name="margin_top">4</property> + <property name="margin_bottom">4</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-InsertCaptionDialog1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertCaptionDialog</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">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="SectionBottom60"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-ArrowsToolbox"> + <object class="GtkToolButton" id="Dra-ToggleObjectBezierMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ArrowsToolbox</property> + <property name="action_name">.uno:ToggleObjectBezierMode</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Styles"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom53"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-StyleApply3"> + <property name="can_focus">False</property> + <property name="action_name">.uno:StyleApply</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> + <style> + <class name="priority-11"/> + </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="Draw-Section-Anchor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="GtkSeparator" id="separator70"> + <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="Anchor2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-LineToolbox"> + <object class="GtkMenuToolButton" id="Object-AnchorMenu2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LineToolbox</property> + <property name="action_name">.uno:AnchorMenu</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> + <style> + <class name="priority-10"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Wrap1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Wrap1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-BasicShapes"> + <object class="GtkToolButton" id="Draw-WrapOff"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BasicShapes</property> + <property name="action_name">.uno:WrapOff</property> </object> <packing> <property name="expand">False</property> @@ -9209,10 +9721,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-FlowChartShapes"> + <object class="GtkToolButton" id="Draw-WrapOn"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlowChartShapes</property> + <property name="action_name">.uno:WrapOn</property> </object> <packing> <property name="expand">False</property> @@ -9220,10 +9732,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-DrawText"> + <object class="GtkToolButton" id="Draw-WrapIdeal"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DrawText</property> + <property name="action_name">.uno:WrapIdeal</property> </object> <packing> <property name="expand">False</property> @@ -9234,54 +9746,101 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-9"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Wrap2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator132"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> + <property name="margin_left">5</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-WrapLeft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:WrapLeft</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-WrapThrough"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:WrapThrough</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-WrapRight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:WrapRight</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> + <style> + <class name="priority-8"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">4</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="PointsSection"> + <object class="sfxlo-OptionalBox" id="Draw-Section-WrapDialog"> <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="SectionBottom92"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap13"> <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">icons</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-ToggleObjectBezierMode"> + <object class="GtkToolButton" id="Draw-TextWrap2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectBezierMode</property> + <property name="visible_horizontal">False</property> + <property name="action_name">.uno:TextWrap</property> + <property name="icon_name">sfx2/res/symphony/open_more.png</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -9291,8 +9850,23 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-7"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Align1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator202"> + <object class="GtkSeparator" id="separator75"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -9303,94 +9877,212 @@ <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> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-ObjectAlignLeft2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignLeft</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-AlignCenter2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignCenter</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-ObjectAlignRight2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignRight</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">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> + <property name="position">6</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="LineSection"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Align2"> <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="SectionBottom52"> + <object class="sfxlo-NotebookbarToolBox" id="Align4"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">text</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-FormatLine"> + <object class="GtkToolButton" id="Draw-AlignUp2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatLine</property> + <property name="action_name">.uno:AlignUp</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> + <child> + <object class="GtkToolButton" id="Draw-AlignMiddle2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignMiddle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-AlignDown2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignDown</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-5"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Arrange1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="GtkSeparator" id="separator78"> + <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="SectionBottom53"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom54"> <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="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-XLineColor"> - <property name="visible">True</property> + <object class="GtkToolButton" id="Draw-BringToFront2"> <property name="can_focus">False</property> - <property name="action_name">.uno:XLineColor</property> + <property name="action_name">.uno:BringToFront</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Draw-LineEndStyle"> + <object class="GtkToolButton" id="Draw-ObjectForwardOne2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LineEndStyle</property> + <property name="action_name">.uno:ObjectForwardOne</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-4"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">8</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Arrange2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom55"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Draw-XLineStyle"> - <property name="width_request">100</property> + <object class="GtkToolButton" id="Draw-ObjectBackOne2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:XLineStyle</property> + <property name="action_name">.uno:ObjectBackOne</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkMenuToolButton" id="Draw-LineWidth"> - <property name="width_request">100</property> - <property name="visible">True</property> + <object class="GtkToolButton" id="Draw-SendToBack2"> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:LineWidth</property> + <property name="action_name">.uno:SendToBack</property> </object> <packing> <property name="expand">False</property> @@ -9404,8 +10096,23 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">9</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Area1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator184"> + <object class="GtkSeparator" id="separator79"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -9416,40 +10123,63 @@ <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> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom56"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FormatArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatArea</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</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"/> + <class name="priority-22"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">10</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FillSection"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Area2"> <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="SectionBottom54"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom58"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">text</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-FormatArea"> + <object class="GtkToolButton" id="Draw-FillStyle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatArea</property> + <property name="action_name">.uno:FillStyle</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -9459,98 +10189,154 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-21"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">11</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-AreaDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom55"> + <object class="sfxlo-NotebookbarToolBox" id="Draw2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-FillStyle"> - <property name="width_request">200</property> + <object class="GtkToolButton" id="Draw-FormatArea2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FillStyle</property> + <property name="visible_horizontal">False</property> + <property name="action_name">.uno:FormatArea</property> + <property name="icon_name">sfx2/res/symphony/open_more.png</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> + <style> + <class name="priority-20"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">12</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Line1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator185"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom18"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FormatLine"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatLine</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-19"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">13</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="WrapSection"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Line2"> <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="SectionBottom88"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom19"> <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">icons</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Draw-AnchorMenu"> + <object class="GtkToolButton" id="Draw-XLineColor"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AnchorMenu</property> + <property name="action_name">.uno:XLineColor</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-18"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">14</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Line3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="svtlo-ManagedMenuButton" id="Draw-WrapButton:MenuWrap"> - <property name="label" translatable="yes" context="notebookbar_compact|WrapMenuButton">Wrap</property> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom35"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="relief">none</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Draw-XLineStyle1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:XLineStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -9558,63 +10344,113 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-17"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">15</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Line4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator188"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom22"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-LineWidth1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineWidth</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-16"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">16</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ArrangeSection"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Line5"> <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="SectionBottom60"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom36"> <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="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-ObjectForwardOne"> + <object class="GtkToolButton" id="Draw-LineEndStyle2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> + <property name="action_name">.uno:LineEndStyle</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-15"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">17</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-LineDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Draw1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-ObjectBackOne"> + <object class="GtkToolButton" id="Draw-FormatLine1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> + <property name="visible_horizontal">False</property> + <property name="action_name">.uno:FormatLine</property> + <property name="icon_name">sfx2/res/symphony/open_more.png</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -9624,8 +10460,23 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-14"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">18</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Rotate"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator186"> + <object class="GtkSeparator" id="separator84"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -9636,35 +10487,82 @@ <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> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom20"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-ToggleObjectRotateMode1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ToggleObjectRotateMode</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-ToggleObjectBezierMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ToggleObjectBezierMode</property> + </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> - <style> - <class name="priority-4"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">19</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="AlignSection"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Flip"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="vexpand">True</property> <child> - <object class="svtlo-ManagedMenuButton" id="Draw-AlignButton:MenuAlign"> - <property name="label" translatable="yes" context="notebookbar_compact|AlignMenuButton">A_lign</property> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom21"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">False</property> - <property name="valign">center</property> - <property name="relief">none</property> - <property name="use_underline">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FlipVertical1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlipVertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FlipHorizontal1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlipHorizontal</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -9672,8 +10570,20 @@ <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">20</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-3d"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator189"> + <object class="GtkSeparator" id="separator32"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -9684,60 +10594,52 @@ <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> - <style> - <class name="priority-3"/> - </style> - </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="DrawingSection"> - <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="SectionBottom71"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom1"> <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">icons</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-SelectObject"> + <object class="GtkToolButton" id="Draw-ExtrusionToggle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SelectObject</property> + <property name="action_name">.uno:ExtrusionToggle</property> </object> <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="expand">True</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Draw-ToggleObjectRotateMode"> + <object class="GtkToolButton" id="Draw-ExtrusionDepthFloater"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectRotateMode</property> + <property name="action_name">.uno:ExtrusionDepthFloater</property> </object> <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="expand">True</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Draw-FlipVertical"> + <object class="GtkToolButton" id="Draw-ExtrusionDirectionFloater"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipVertical</property> + <property name="action_name">.uno:ExtrusionDirectionFloater</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkMenuToolButton" id="Draw-Extrusion3DColor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Extrusion3DColor</property> </object> <packing> <property name="expand">False</property> @@ -9745,10 +10647,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-FlipHorizontal"> + <object class="GtkMenuToolButton" id="Draw-ExtrusionSurfaceFloater"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> + <property name="action_name">.uno:ExtrusionSurfaceFloater</property> </object> <packing> <property name="expand">False</property> @@ -9759,22 +10661,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator130"> - <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> + <property name="position">1</property> </packing> </child> <style> @@ -9784,52 +10671,94 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">21</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DrawTextSection"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Fontwork"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom56"> + <object class="GtkSeparator" id="separator113"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Draw-InsertCaptionDialog"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:InsertCaptionDialog</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> + <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="GtkSeparator" id="separator70"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FontworkGalleryFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkGalleryFloater</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FontworkShapeType"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkShapeType</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FontworkSameLetterHeights"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkSameLetterHeights</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FontworkAlignmentFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkAlignmentFloater</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FontworkCharacterSpacingFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkCharacterSpacingFloater</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <style> @@ -9839,7 +10768,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">22</property> </packing> </child> </object> @@ -9962,59 +10891,112 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="BorderSection"> + <object class="sfxlo-OptionalBox" id="Object-Section-Label"> <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="SectionBottom94"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom113"> <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="margin_top">4</property> + <property name="margin_bottom">4</property> + <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-SetBorderStyle"> + <object class="GtkToolButton" id="Object-InsertCaptionDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SetBorderStyle</property> + <property name="action_name">.uno:InsertCaptionDialog</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom94"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-LineStyle"> + <object class="GtkToolButton" id="Object-NameGroup3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LineStyle</property> + <property name="action_name">.uno:NameGroup</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </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="Object-Section-Styles"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom95"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-FrameLineColor"> - <property name="visible">True</property> + <object class="GtkToolButton" id="Object-StyleApply4"> <property name="can_focus">False</property> - <property name="action_name">.uno:FrameLineColor</property> + <property name="action_name">.uno:StyleApply</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-11"/> + </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="Object-Section-Anchor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator204"> + <object class="GtkSeparator" id="separator47"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10025,37 +11007,144 @@ <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> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Anchor3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Object-AnchorMenu3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AnchorMenu</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> + <style> + <class name="priority-10"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">2</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="AreaSection1"> + <object class="sfxlo-OptionalBox" id="Object-Section-Wrap3"> <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="SectionBottom98"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">text</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-FormatArea"> + <object class="GtkToolButton" id="Object-WrapOff"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatArea</property> + <property name="action_name">.uno:WrapOff</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-WrapOn"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:WrapOn</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-WrapIdeal"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:WrapIdeal</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> + <style> + <class name="priority-9"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-Wrap4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="margin_left">5</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Wrap3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-WrapLeft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:WrapLeft</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-WrapThrough"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:WrapThrough</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-WrapRight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:WrapRight</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -10065,33 +11154,63 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-8"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-WrapDialog1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom99"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap14"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-FillStyle"> - <property name="width_request">200</property> + <object class="GtkToolButton" id="Object-TextWrap"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FillStyle</property> + <property name="visible_horizontal">False</property> + <property name="action_name">.uno:TextWrap</property> + <property name="icon_name">sfx2/res/symphony/open_more.png</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> + <style> + <class name="priority-7"/> + </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="Object-Section-Align3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator75"> + <object class="GtkSeparator" id="separator52"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10102,59 +11221,131 @@ <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> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-ObjectAlignLeft3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignLeft</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-AlignCenter3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignCenter</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-ObjectAlignRight3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignRight</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">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> + <property name="position">6</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="LinkSection"> + <object class="sfxlo-OptionalBox" id="Object-Section-Align4"> <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="SectionBottom95"> + <object class="sfxlo-NotebookbarToolBox" id="Align3"> <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="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-ChainFrames"> + <object class="GtkToolButton" id="Object-AlignUp3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ChainFrames</property> + <property name="action_name">.uno:AlignUp</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Object-UnhainFrames"> + <object class="GtkToolButton" id="Object-AlignMiddle3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:UnhainFrames</property> + <property name="action_name">.uno:AlignMiddle</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-AlignDown3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignDown</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-5"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-Arrange3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator74"> + <object class="GtkSeparator" id="separator55"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10165,127 +11356,214 @@ <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> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom96"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-BringToFront3"> + <property name="can_focus">False</property> + <property name="action_name">.uno:BringToFront</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-ObjectForwardOne3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectForwardOne</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-4"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">8</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="WrapSection1"> + <object class="sfxlo-OptionalBox" id="Object-Section-Arrange4"> <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="SectionBottom96"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom98"> <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">icons</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Object-AnchorMenu"> + <object class="GtkToolButton" id="Object-ObjectBackOne3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="action_name">.uno:AnchorMenu</property> + <property name="action_name">.uno:ObjectBackOne</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-SendToBack3"> + <property name="can_focus">False</property> + <property name="action_name">.uno:SendToBack</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">9</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-Area1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="svtlo-ManagedMenuButton" id="Object-WrapButton:MenuWrap"> - <property name="label" translatable="yes" context="notebookbar_compact|WrapMenuButton">Wrap</property> + <object class="GtkSeparator" id="separator72"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="relief">none</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="padding">5</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator126"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom99"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Dra-FormatArea1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatArea</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-19"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">10</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ArrangeSection1"> + <object class="sfxlo-OptionalBox" id="Object-Section-Area2"> <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="SectionBottom100"> <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="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-ObjectForwardOne"> + <object class="GtkToolButton" id="Draw-FillStyle1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> + <property name="action_name">.uno:FillStyle</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <style> + <class name="priority-18"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">11</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-AreaDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Object4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-ObjectBackOne"> + <object class="GtkToolButton" id="Draw-FormatArea1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> + <property name="visible_horizontal">False</property> + <property name="action_name">.uno:FormatArea</property> + <property name="icon_name">sfx2/res/symphony/open_more.png</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -10295,100 +11573,163 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-17"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">12</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-Border1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator113"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom25"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-BorderDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BorderDialog</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-16"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">13</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="AlignSection1"> + <object class="sfxlo-OptionalBox" id="Object-Section-Border2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="vexpand">True</property> <child> - <object class="svtlo-ManagedMenuButton" id="Object-AlignButton:MenuAlign"> - <property name="label" translatable="yes" context="notebookbar_compact|AlignMenuButton">A_lign</property> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom26"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">False</property> - <property name="valign">center</property> - <property name="relief">none</property> - <property name="use_underline">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-FrameLineColor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FrameLineColor</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-LineStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineStyle</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> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-15"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">14</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-Border3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator128"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom27"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Object-SetBorderStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SetBorderStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-14"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">15</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DrawTextSection2"> + <object class="sfxlo-OptionalBox" id="Object-Section-BorderDialog"> <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="SectionBottom113"> + <object class="sfxlo-NotebookbarToolBox" id="Object3"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</property> + <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-InsertCaptionDialog"> + <object class="GtkToolButton" id="ObjectBorderDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertCaptionDialog</property> + <property name="visible_horizontal">False</property> + <property name="action_name">.uno:BorderDialog</property> + <property name="icon_name">sfx2/res/symphony/open_more.png</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -10398,8 +11739,23 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-13"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">16</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-Chain"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator206"> + <object class="GtkSeparator" id="separator74"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10410,24 +11766,105 @@ <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="ExtBottom23"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-ChainFrames"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ChainFrames</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom24"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-UnhainFrames1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:UnhainFrames</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> </packing> </child> - <style> - <class name="priority-1"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">17</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-FrameDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Object5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FrameDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="visible_horizontal">False</property> + <property name="action_name">.uno:FrameDialog</property> + <property name="icon_name">sfx2/res/symphony/open_more.png</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">18</property> </packing> </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> @@ -10465,7 +11902,7 @@ </packing> </child> <child> - <object class="svtlo-ManagedMenuButton" id="Object-ObjectButton:MenuDraw"> + <object class="svtlo-ManagedMenuButton" id="Object-ObjectButton:MenuObject"> <property name="label" translatable="yes" context="notebookbar_compact|ObjectMenuButton">Object</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -10542,25 +11979,24 @@ <object class="sfxlo-PriorityMergedHBox" id="MediaContainer"> <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="MediaSection"> + <object class="sfxlo-OptionalBox" id="Media-Section-Label"> <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="first22"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom71"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> + <property name="margin_top">4</property> + <property name="margin_bottom">4</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-AVMediaPlayer"> + <object class="GtkToolButton" id="Object-InsertCaptionDialog2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AVMediaPlayer</property> + <property name="action_name">.uno:InsertCaptionDialog</property> </object> <packing> <property name="expand">False</property> @@ -10575,7 +12011,81 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator25"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom139"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-NameGroup1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NameGroup</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Media-Section-Styles"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom88"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Media-StyleApply"> + <property name="can_focus">False</property> + <property name="action_name">.uno:StyleApply</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> + <style> + <class name="priority-11"/> + </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="Media-Section-Anchor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="GtkSeparator" id="separator81"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10586,32 +12096,79 @@ <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> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Anchor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Object-AnchorMenu"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AnchorMenu</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> + <style> + <class name="priority-10"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">2</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Media-Section-AVMediaToolBox"> - <property name="width_request">148</property> + <object class="sfxlo-OptionalBox" id="Media-Section-Wrap1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom132"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap9"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-AVMediaToolBox"> + <object class="GtkToolButton" id="Media-WrapOff"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AVMediaToolBox</property> + <property name="action_name">.uno:WrapOff</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Media-WrapOn"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:WrapOn</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Media-WrapIdeal"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:WrapIdeal</property> </object> <packing> <property name="expand">False</property> @@ -10622,27 +12179,29 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-9"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Media-WrapSection"> + <object class="sfxlo-OptionalBox" id="Media-Section-Wrap2"> <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="Wrap6"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap8"> <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="margin_left">5</property> <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Media-WrapLeft"> @@ -10677,11 +12236,40 @@ <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> + <style> + <class name="priority-8"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Media-Section-WrapDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Wrap6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-WrapContour"> + <object class="GtkToolButton" id="Media-TextWrap"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WrapContour</property> + <property name="visible_horizontal">False</property> + <property name="action_name">.uno:TextWrap</property> + <property name="icon_name">sfx2/res/symphony/open_more.png</property> </object> <packing> <property name="expand">False</property> @@ -10695,8 +12283,23 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-7"/> + </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="Media-Section-Align1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator81"> + <object class="GtkSeparator" id="separator82"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10707,20 +12310,19 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap5"> + <object class="sfxlo-NotebookbarToolBox" id="Align9"> <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="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-WrapOff"> + <object class="GtkToolButton" id="Media-ObjectAlignLeft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WrapOff</property> + <property name="action_name">.uno:ObjectAlignLeft</property> </object> <packing> <property name="expand">False</property> @@ -10728,10 +12330,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-WrapOn"> + <object class="GtkToolButton" id="Media-AlignCenter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WrapOn</property> + <property name="action_name">.uno:AlignCenter</property> </object> <packing> <property name="expand">False</property> @@ -10739,10 +12341,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-WrapIdeal"> + <object class="GtkToolButton" id="Media-ObjectAlignRight"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WrapIdeal</property> + <property name="action_name">.uno:ObjectAlignRight</property> </object> <packing> <property name="expand">False</property> @@ -10753,51 +12355,34 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator83"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-6"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">6</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Media-AlignSection"> + <object class="sfxlo-OptionalBox" id="Media-Section-Align2"> <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="Align5"> + <object class="sfxlo-NotebookbarToolBox" id="Align10"> <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="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-AlignTop"> + <object class="GtkToolButton" id="Media-AlignUp"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignTop</property> + <property name="action_name">.uno:AlignUp</property> </object> <packing> <property name="expand">False</property> @@ -10805,10 +12390,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-AlignVerticalCenter"> + <object class="GtkToolButton" id="Media-AlignMiddle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignVerticalCenter</property> + <property name="action_name">.uno:AlignMiddle</property> </object> <packing> <property name="expand">False</property> @@ -10816,10 +12401,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-AlignBottom"> + <object class="GtkToolButton" id="Media-AlignDown"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignBottom</property> + <property name="action_name">.uno:AlignDown</property> </object> <packing> <property name="expand">False</property> @@ -10830,11 +12415,26 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-5"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Media-Section-Arrange1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator82"> + <object class="GtkSeparator" id="separator83"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10845,20 +12445,18 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align6"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom92"> <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="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-AlignLeft"> - <property name="visible">True</property> + <object class="GtkToolButton" id="Media-BringToFront"> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignLeft</property> + <property name="action_name">.uno:BringToFront</property> </object> <packing> <property name="expand">False</property> @@ -10866,21 +12464,58 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-AlignHorizontalCenter"> + <object class="GtkToolButton" id="Media-ObjectForwardOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignHorizontalCenter</property> + <property name="action_name">.uno:ObjectForwardOne</property> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-4"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">8</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Media-Section-Arrange2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom132"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-AlignRight"> + <object class="GtkToolButton" id="Media-ObjectBackOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignRight</property> + <property name="action_name">.uno:ObjectBackOne</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Media-SendToBack"> + <property name="can_focus">False</property> + <property name="action_name">.uno:SendToBack</property> </object> <packing> <property name="expand">False</property> @@ -10891,9 +12526,25 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">9</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Media-Section-AVMediaToolBox"> + <property name="width_request">447</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> <object class="GtkSeparator" id="separator108"> <property name="visible">True</property> @@ -10906,7 +12557,81 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">3</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom138"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Media-AVMediaToolBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AVMediaToolBox</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">10</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Media-Section-AVMediaPlayer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="GtkSeparator" id="separator123"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom16"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Media-AVMediaPlayer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AVMediaPlayer</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> <style> @@ -10916,18 +12641,18 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">11</property> </packing> </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="MediaSectio"> + <object class="sfxlo-DropdownBox" id="MediaSection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -10942,10 +12667,11 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Media-AnchorMenu"> + <object class="GtkToolButton" id="Media-TransformDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AnchorMenu</property> + <property name="valign">center</property> + <property name="action_name">.uno:TransformDialog</property> </object> <packing> <property name="expand">False</property> @@ -11536,11 +13262,11 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="PrintPreview-ClosePreview1"> + <object class="GtkToolButton" id="PrintPreview-FullScreen"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="action_name">.uno:ClosePreview</property> + <property name="action_name">.uno:FullScreen</property> </object> <packing> <property name="expand">True</property> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui index 2447b54ba658..9c014eba2c99 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui @@ -1341,6 +1341,64 @@ </object> </child> </object> + <object class="GtkMenu" id="MenuFrame"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="MenuFrame-InsertFrameInteract"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertFrameInteract</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuFrame-InsertFrame"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertFrame</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuFrame-InsertObjectFloatingFrame"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertObjectFloatingFrame</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuFrame-separator1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuFrame-ChainFrames"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ChainFrames</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuFrame-UnhainFrames"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:UnhainFrames</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuFrame-separator2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuFrame-FrameDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FrameDialog</property> + </object> + </child> + </object> <object class="GtkMenu" id="MenuGraphic"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -8600,7 +8658,7 @@ <object class="sfxlo-PriorityMergedHBox" id="ObjectContainer"> <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="Object-Section-Graphic"> + <object class="sfxlo-OptionalBox" id="Object-Section-Object"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> @@ -8726,11 +8784,12 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Object-Section-FormatLineArea"> + <object class="sfxlo-OptionalBox" id="Object-Section-BackFront"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator69"> + <object class="GtkSeparator" id="separator28"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -8745,123 +8804,61 @@ </packing> </child> <child> - <object class="GtkBox" id="box51"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="third10"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">text</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Object-BorderDialog"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BorderDialog</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="third11"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">text</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Object-FormatArea"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FormatArea</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box64"> + <object class="GtkBox" id="Section28"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box66"> + <object class="GtkBox" id="box16"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first6"> + <object class="sfxlo-NotebookbarToolBox" id="arrange2"> <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="Object-SetBorderStyle"> + <object class="GtkToolButton" id="Object-BringToFront"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SetBorderStyle</property> + <property name="action_name">.uno:BringToFront</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Object-LineStyle"> + <object class="GtkToolButton" id="Object-ObjectForwardOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LineStyle</property> + <property name="action_name">.uno:ObjectForwardOne</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="first7"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-FrameLineColor"> + <object class="GtkToolButton" id="Object-ObjectBackOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FrameLineColor</property> + <property name="action_name">.uno:ObjectBackOne</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-SendToBack"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SendToBack</property> + </object> + <packing> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -8869,7 +8866,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> </object> @@ -8880,21 +8877,23 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom45"> - <property name="width_request">200</property> + <object class="GtkBox" id="box35"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-FillStyle"> + <object class="svtlo-ManagedMenuButton" id="Object-Arrange:MenuArrange"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ArrangeButton">_Arrange</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FillStyle</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">False</property> + <property name="relief">none</property> + <property name="use_underline">True</property> </object> <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> </packing> </child> </object> @@ -8908,11 +8907,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-6"/> </style> </object> <packing> @@ -8927,88 +8926,16 @@ <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator28"> - <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="Section28"> + <object class="GtkBox" id="Section50"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box16"> + <object class="GtkBox" id="box52"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="arrange2"> - <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="Object-BringToFront"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BringToFront</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Object-ObjectForwardOne"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Object-ObjectBackOne"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Object-SendToBack"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SendToBack</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator32"> + <object class="GtkSeparator" id="separator42"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -9023,13 +8950,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align4"> + <object class="sfxlo-NotebookbarToolBox" id="Align7"> <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="Object-ObjectAlignLeft"> + <object class="GtkToolButton" id="Object-ObjectAlignLeft1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignLeft</property> @@ -9040,7 +8967,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-AlignCenter"> + <object class="GtkToolButton" id="Object-AlignCenter1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignCenter</property> @@ -9051,7 +8978,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-ObjectAlignRight"> + <object class="GtkToolButton" id="Object-ObjectAlignRight1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignRight</property> @@ -9076,35 +9003,19 @@ </packing> </child> <child> - <object class="GtkBox" id="box35"> + <object class="GtkBox" id="box53"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Object-Arrange:MenuArrange"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ArrangeButton">_Arrange</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">False</property> - <property name="relief">none</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="Align6"> + <object class="sfxlo-NotebookbarToolBox" id="Align8"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="halign">end</property> <property name="hexpand">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-AlignUp"> + <object class="GtkToolButton" id="Object-AlignUp1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignUp</property> @@ -9115,7 +9026,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-AlignMiddle"> + <object class="GtkToolButton" id="Object-AlignMiddle1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignMiddle</property> @@ -9126,7 +9037,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-AlignDown"> + <object class="GtkToolButton" id="Object-AlignDown1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignDown</property> @@ -9158,7 +9069,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-5"/> </style> </object> <packing> @@ -9292,7 +9203,7 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-4"/> </style> </object> <packing> @@ -9302,6 +9213,344 @@ </packing> </child> <child> + <object class="sfxlo-OptionalBox" id="Object-Section-BordersArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator69"> + <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="box51"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third11"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-FormatArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatArea</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third10"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-BorderDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BorderDialog</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-8"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-FormatLineArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="box69"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom63"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-FillStyle1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box70"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Object-SetBorderStyle1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SetBorderStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-LineStyle1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineStyle</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="first4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="hexpand">True</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-FrameLineColor1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FrameLineColor</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <style> + <class name="priority-7"/> + </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="Object-Section-Frame"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator39"> + <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="Section49"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box45"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom61"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-ChainFrames"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ChainFrames</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="SectionBottom62"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-UnhainFrames"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:UnhainFrames</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box43"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Media-Frame:MenuFrame"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|graphicB">F_rame</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">False</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-3"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> + </child> + <child> <object class="sfxlo-OptionalBox" id="Object-Section-Grid"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -9408,13 +9657,127 @@ </packing> </child> <style> + <class name="priority-2"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-View"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator38"> + <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="Section48"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom60"> + <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="Default-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> + <child> + <object class="GtkToolButton" id="Default-PrintPreview1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PrintPreview</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-Zoom1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Zoom</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box42"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Object-View:MenuView"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ViewButton">_View</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">False</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> <class name="priority-1"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">8</property> </packing> </child> <style> @@ -10461,10 +10824,10 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Print-PageDialog"> + <object class="GtkToolButton" id="Print-FullScreen"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:PageDialog</property> + <property name="action_name">.uno:FullScreen</property> </object> <packing> <property name="expand">False</property> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui index c8c2e08bff43..c07442b3024e 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui @@ -1164,6 +1164,64 @@ </object> </child> </object> + <object class="GtkMenu" id="MenuFrame"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="MenuFrame-InsertFrameInteract"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertFrameInteract</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuFrame-InsertFrame"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertFrame</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuFrame-InsertObjectFloatingFrame"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertObjectFloatingFrame</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuFrame-separator1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuFrame-FrameDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FrameDialog</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuFrame-ChainFrames"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ChainFrames</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuFrame-separator2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuFrame-UnhainFrames"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:UnhainFrames</property> + </object> + </child> + </object> <object class="GtkMenu" id="MenuGraphic"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -2719,6 +2777,38 @@ </object> </child> </object> + <object class="GtkMenu" id="MenuSlidelayout"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="ShowSinglePageD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ShowSinglePage</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="ShowTwoPagesD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ShowTwoPages</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="ShowBookviewD1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ShowBookview</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="ShowMultiplePagesD1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ShowMultiplePages</property> + </object> + </child> + </object> <object class="GtkMenu" id="MenuStyle"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -3889,7 +3979,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="DefaultBox"> + <object class="sfxlo-PriorityMergedHBox" id="DefaultContainer"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -5539,7 +5629,7 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="GraphicBox"> + <object class="sfxlo-PriorityMergedHBox" id="GraphicContainer"> <property name="can_focus">False</property> <child> <object class="sfxlo-OptionalBox" id="SectionGraphic"> @@ -6629,7 +6719,7 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="TableBox"> + <object class="sfxlo-PriorityMergedHBox" id="TableContainer"> <property name="can_focus">False</property> <child> <object class="sfxlo-OptionalBox" id="SectionStyleTable"> @@ -8744,7 +8834,7 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="AnnotationBox"> + <object class="sfxlo-PriorityMergedHBox" id="ReviewContainer"> <property name="can_focus">False</property> <child> <object class="sfxlo-OptionalBox" id="SectionLanguage"> @@ -9702,7 +9792,7 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="DrawBox"> + <object class="sfxlo-PriorityMergedHBox" id="DrawContainer"> <property name="can_focus">False</property> <child> <object class="sfxlo-OptionalBox" id="SectionDraw"> @@ -11376,7 +11466,7 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="DrawTextBox"> + <object class="sfxlo-PriorityMergedHBox" id="DrawTextContainer"> <property name="can_focus">False</property> <child> <object class="sfxlo-OptionalBox" id="SectionFormat1"> @@ -11693,7 +11783,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> @@ -12270,7 +12360,7 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="MediaBox"> + <object class="sfxlo-PriorityMergedHBox" id="MediaContainer"> <property name="can_focus">False</property> <child> <object class="sfxlo-OptionalBox" id="SectionFormat2"> @@ -12726,18 +12816,18 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="OLEBox"> + <object class="sfxlo-PriorityMergedHBox" id="ObjectContainer"> <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="SectionGraphic2"> + <object class="sfxlo-OptionalBox" id="Object-Section-Object"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkBox" id="horizontal39"> + <object class="GtkBox" id="horizontal47"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator148"> + <object class="GtkSeparator" id="separator8"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -12750,27 +12840,26 @@ </packing> </child> <child> - <object class="GtkBox" id="vertical40"> + <object class="GtkBox" id="vertical48"> <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="SectionBottom1"> - <property name="width_request">200</property> + <object class="sfxlo-NotebookbarToolBox" id="first43"> <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="FillStyle1"> + <object class="GtkToolButton" id="Object-InsertCaptionDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FillStyle</property> + <property name="action_name">.uno:InsertCaptionDialog</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -12782,66 +12871,44 @@ </packing> </child> <child> - <object class="GtkBox" id="box82"> + <object class="GtkBox" id="third20"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first47"> + <object class="sfxlo-NotebookbarToolBox" id="first14"> <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="InsertCaptionDialog2"> + <object class="GtkToolButton" id="ChainFrames"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertCaptionDialog</property> + <property name="action_name">.uno:ChainFrames</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="second40"> + <object class="sfxlo-NotebookbarToolBox" id="second46"> <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="SetBorderStyle2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SetBorderStyle</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkMenuToolButton" id="LineStyle1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:LineStyle</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkMenuToolButton" id="FrameLineColor1"> + <object class="GtkToolButton" id="UnhainFrames"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FrameLineColor</property> + <property name="action_name">.uno:UnhainFrames</property> </object> <packing> <property name="expand">False</property> @@ -12863,12 +12930,12 @@ </packing> </child> <child> - <object class="GtkBox" id="third14"> + <object class="GtkBox" id="third19"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="oleB:MenuOLE"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_full|FrameButton">F_rame</property> + <object class="svtlo-ManagedMenuButton" id="Object-Frame:MenuOLE"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_full|FrameButton">_Object</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="focus_on_click">False</property> @@ -12884,25 +12951,14 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="third3Ext5"> + <object class="sfxlo-NotebookbarToolBox" id="third3Ext7"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="halign">end</property> <property name="hexpand">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <property name="icon_size">1</property> - <child> - <object class="GtkToolButton" id="FrameDialog"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FrameDialog</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -12914,7 +12970,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> </object> @@ -12939,7 +12995,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SectionArrange1"> + <object class="sfxlo-OptionalBox" id="Object-Section-Arrange"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -13075,56 +13131,322 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator150"> + <object class="sfxlo-OptionalBox" id="Object-Section-Wrap2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="AlignGroup1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align5"> + <object class="GtkBox" id="WrapGroup6"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="GtkToolButton" id="AlignLeft2"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap11"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignLeft</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-ContourDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ContourDialog</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkToolButton" id="AlignHorizontalCenter2"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap12"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignHorizontalCenter</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-TextWrap"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:TextWrap</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">1</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-3"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator18"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">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="GtkBox" id="box77"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="arrageOLE:MenuArrange"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_full|ArrangeButton">_Arrange</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <style> + <class name="priority-5"/> + </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="Object-Section-Align"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="AlignGroup2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-ObjectAlignLeft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignLeft</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-AlignCenter"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignCenter</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-ObjectAlignRight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignRight</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-AlignUp"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignUp</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-AlignMiddle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignMiddle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-AlignDown"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignDown</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <style> + <class name="priority-4"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-Arrange2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="horizontal46"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="vertical47"> + <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="box17"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator17"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="grid3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first56"> + <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="AlignRight2"> + <object class="GtkToolButton" id="Layout-BringToFront"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignRight</property> + <property name="action_name">.uno:BringToFront</property> </object> <packing> <property name="expand">False</property> @@ -13133,44 +13455,67 @@ </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align6"> + <object class="sfxlo-NotebookbarToolBox" id="second52"> <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="AlignTop2"> + <object class="GtkToolButton" id="Layout-SendToBack"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignTop</property> + <property name="action_name">.uno:SendToBack</property> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first57"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="AlignVerticalCenter2"> + <object class="GtkToolButton" id="Layout-ObjectForwardOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignVerticalCenter</property> + <property name="action_name">.uno:ObjectForwardOne</property> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Second2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="AlignBottom4"> + <object class="GtkToolButton" id="Layout-ObjectBackOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignBottom</property> + <property name="action_name">.uno:ObjectBackOne</property> </object> <packing> <property name="expand">False</property> @@ -13179,97 +13524,269 @@ </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">1</property> + <property name="top_attach">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box18"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator151"> + <object class="sfxlo-NotebookbarToolBox" id="thirdExt26"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <property name="halign">end</property> + <property name="hexpand">True</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <property name="icon_size">1</property> + <child> + <object class="GtkMenuToolButton" id="AnchorMenu4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AnchorMenu</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> + <property name="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">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <style> + <class name="priority-3"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-Frame"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="horizontal39"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator148"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="vertical40"> + <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="box61"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkBox" id="SendToFrontGroup1"> + <object class="GtkBox" id="box62"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="OneStep2"> + <object class="sfxlo-NotebookbarToolBox" id="third21"> <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="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="AlignBottom5"> + <object class="GtkToolButton" id="Object-FormatArea"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> + <property name="action_name">.uno:FormatArea</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third22"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="BringToFront2"> + <object class="GtkToolButton" id="Object-BorderDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BringToFront</property> + <property name="action_name">.uno:BorderDialog</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box78"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="BackgroundFront1"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom117"> <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="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="ObjectBackOne3"> + <object class="GtkToolButton" id="Object-FillStyle1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> + <property name="action_name">.uno:FillStyle</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="GtkBox" id="box79"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkToolButton" id="SendToBack2"> + <object class="sfxlo-NotebookbarToolBox" id="first47"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SendToBack</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Object-SetBorderStyle1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:SetBorderStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-LineStyle1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineStyle</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom120"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-FrameLineColor1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FrameLineColor</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> @@ -13283,7 +13800,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">1</property> </packing> </child> </object> @@ -13294,12 +13811,12 @@ </packing> </child> <child> - <object class="GtkBox" id="box77"> + <object class="GtkBox" id="third14"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="arrageOLE:MenuArrange"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_full|ArrangeButton">_Arrange</property> + <object class="svtlo-ManagedMenuButton" id="Media-Frame:MenuFrame"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_full|FrameButton">F_rame</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="focus_on_click">False</property> @@ -13310,12 +13827,12 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="thirdExt24"> + <object class="sfxlo-NotebookbarToolBox" id="third3Ext5"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="halign">end</property> @@ -13324,10 +13841,10 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkMenuToolButton" id="AnchorMenu3"> + <object class="GtkToolButton" id="FrameDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AnchorMenu</property> + <property name="action_name">.uno:FrameDialog</property> </object> <packing> <property name="expand">False</property> @@ -13363,17 +13880,17 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-6"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">4</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SectionGraphic3"> + <object class="sfxlo-OptionalBox" id="Object-Section-Grid"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -13508,11 +14025,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">5</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SectionView2"> + <object class="sfxlo-OptionalBox" id="Object-Section-View"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -13684,7 +14201,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">6</property> </packing> </child> <style> @@ -13699,7 +14216,7 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="PrintBox"> + <object class="sfxlo-PriorityMergedHBox" id="PrintContainer"> <property name="can_focus">False</property> <child> <object class="sfxlo-OptionalBox" id="PrintLayouot"> @@ -13830,7 +14347,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="prints:SlidelayoutMenu"> + <object class="svtlo-ManagedMenuButton" id="prints:MenuSlidelayout"> <property name="label" translatable="yes" context="notebookbar_groupedbar_full|PrintMenuButton">Slide Layout</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -14417,36 +14934,4 @@ </packing> </child> </object> - <object class="GtkMenu" id="SlidelayoutMenu"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkMenuItem" id="ShowSinglePageD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ShowSinglePage</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ShowTwoPagesD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ShowTwoPages</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ShowBookviewD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ShowBookview</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ShowMultiplePagesD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ShowMultiplePages</property> - </object> - </child> - </object> </interface> diff --git a/sw/uiconfig/swriter/ui/notebookbar_single.ui b/sw/uiconfig/swriter/ui/notebookbar_single.ui index 865dc6fd48b1..59784b4a8518 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_single.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_single.ui @@ -2670,7 +2670,7 @@ <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Graphic-WrapOff2"> + <object class="GtkToolButton" id="Graphic-WrapOff"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapOff</property> @@ -2681,7 +2681,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Graphic-WrapOn2"> + <object class="GtkToolButton" id="Graphic-WrapOn"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapOn</property> @@ -2692,7 +2692,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Graphic-WrapIdeal2"> + <object class="GtkToolButton" id="Graphic-WrapIdeal"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapIdeal</property> @@ -2724,13 +2724,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="margin_left">5</property> <child> <object class="sfxlo-NotebookbarToolBox" id="Wrap11"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Graphic-WrapLeft1"> + <object class="GtkToolButton" id="Graphic-WrapLeft"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapLeft</property> @@ -2741,7 +2742,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Graphic-WrapThrough1"> + <object class="GtkToolButton" id="Graphic-WrapThrough"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapThrough</property> @@ -2752,7 +2753,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Graphic-WrapRight1"> + <object class="GtkToolButton" id="Graphic-WrapRight"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapRight</property> @@ -3066,113 +3067,6 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Graphic-Section-Rotate"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <child> - <object class="GtkSeparator" id="separator43"> - <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="ExtBottom12"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Graphic-ToggleObjectRotateMode"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectRotateMode</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Graphic-RotateRight"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:RotateRight</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">10</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Graphic-Section-Flip"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Graphic-FlipVertical"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FlipVertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Graphic-FlipHorizontal"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </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">11</property> - </packing> - </child> - <child> <object class="sfxlo-OptionalBox" id="Graphic-Section-Crop"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -3220,7 +3114,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">12</property> + <property name="position">10</property> </packing> </child> <child> @@ -3277,7 +3171,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">13</property> + <property name="position">11</property> </packing> </child> <child> @@ -3314,7 +3208,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">14</property> + <property name="position">12</property> </packing> </child> <child> @@ -3368,7 +3262,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">15</property> + <property name="position">13</property> </packing> </child> <child> @@ -3407,7 +3301,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">16</property> + <property name="position">14</property> </packing> </child> <child> @@ -3445,7 +3339,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">17</property> + <property name="position">15</property> </packing> </child> <child> @@ -3483,6 +3377,113 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="position">16</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Rotate"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="GtkSeparator" id="separator43"> + <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="ExtBottom12"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Graphic-ToggleObjectRotateMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ToggleObjectRotateMode</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Graphic-RotateRight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RotateRight</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">17</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Flip"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Graphic-FlipVertical"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlipVertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Graphic-FlipHorizontal"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlipHorizontal</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </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">18</property> </packing> </child> @@ -3664,7 +3665,7 @@ <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-WrapOff3"> + <object class="GtkToolButton" id="Draw-WrapOff"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapOff</property> @@ -3675,7 +3676,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-WrapOn3"> + <object class="GtkToolButton" id="Draw-WrapOn"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapOn</property> @@ -3686,7 +3687,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-WrapIdeal3"> + <object class="GtkToolButton" id="Draw-WrapIdeal"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapIdeal</property> @@ -3718,13 +3719,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="margin_left">5</property> <child> <object class="sfxlo-NotebookbarToolBox" id="Wrap5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-WrapLeft2"> + <object class="GtkToolButton" id="Draw-WrapLeft"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapLeft</property> @@ -3735,7 +3737,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-WrapThrough2"> + <object class="GtkToolButton" id="Draw-WrapThrough"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapThrough</property> @@ -3746,7 +3748,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-WrapRight2"> + <object class="GtkToolButton" id="Draw-WrapRight"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapRight</property> @@ -4709,7 +4711,7 @@ <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-WrapOff1"> + <object class="GtkToolButton" id="Media-WrapOff"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapOff</property> @@ -4720,7 +4722,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-WrapOn1"> + <object class="GtkToolButton" id="Media-WrapOn"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapOn</property> @@ -4731,7 +4733,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-WrapIdeal1"> + <object class="GtkToolButton" id="Media-WrapIdeal"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapIdeal</property> @@ -4763,6 +4765,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="margin_left">5</property> <child> <object class="sfxlo-NotebookbarToolBox" id="Wrap8"> <property name="visible">True</property> @@ -5387,7 +5390,7 @@ <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-WrapOff4"> + <object class="GtkToolButton" id="Object-WrapOff"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapOff</property> @@ -5398,7 +5401,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-WrapOn4"> + <object class="GtkToolButton" id="Object-WrapOn"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapOn</property> @@ -5409,7 +5412,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-WrapIdeal4"> + <object class="GtkToolButton" id="Object-WrapIdeal"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapIdeal</property> @@ -5441,13 +5444,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="margin_left">5</property> <child> <object class="sfxlo-NotebookbarToolBox" id="Wrap3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-WrapLeft3"> + <object class="GtkToolButton" id="Object-WrapLeft"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapLeft</property> @@ -5458,7 +5462,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-WrapThrough3"> + <object class="GtkToolButton" id="Object-WrapThrough"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapThrough</property> @@ -5469,7 +5473,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-WrapRight3"> + <object class="GtkToolButton" id="Object-WrapRight"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapRight</property> |