diff options
| author | andreas kainz <kainz.a@gmail.com> | 2019-07-02 14:13:20 +0200 |
|---|---|---|
| committer | andreas_kainz <kainz.a@gmail.com> | 2019-07-02 16:28:18 +0200 |
| commit | 7f8e5077f62aebf758004ac478918f586a8cce15 (patch) | |
| tree | 791d0646c4b5bc803cf4015f5e0b3b37118b5abc | |
| parent | c27c94f8945bb3568c0075e0e49207814f6d08fc (diff) | |
NB update UI's
Change-Id: Iece18df3c1ed2e066e6820e67755d52a30d63b27
Reviewed-on: https://gerrit.libreoffice.org/74990
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
| -rw-r--r-- | sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui | 2113 | ||||
| -rw-r--r-- | sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui | 270 | ||||
| -rw-r--r-- | sd/uiconfig/sdraw/ui/notebookbar.ui | 236 | ||||
| -rw-r--r-- | sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui | 4032 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui | 4220 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui | 375 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_compact.ui | 106 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 1155 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 84 |
9 files changed, 8165 insertions, 4426 deletions
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui index 8accaa28262c..d6d23a0312d2 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui @@ -544,118 +544,126 @@ <property name="action_name">.uno:ShowDetail</property> </object> </child> - </object> - <object class="GtkMenu" id="MenuDraw"> - <property name="visible">True</property> - <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="MenuDraw-Line"> + <object class="GtkSeparatorMenuItem" id="MenuData-separator8"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Line</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-Freeline_Unfilled"> + <object class="GtkMenuItem" id="MenuData-SamplingDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Freeline_Unfilled</property> + <property name="action_name">.uno:SamplingDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-Freeline"> + <object class="GtkMenuItem" id="MenuData-DescriptiveStatisticsDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Freeline</property> + <property name="action_name">.uno:DescriptiveStatisticsDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-Bezier_Unfilled"> + <object class="GtkMenuItem" id="MenuData-AnalysisOfVarianceDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Bezier_Unfilled</property> + <property name="action_name">.uno:AnalysisOfVarianceDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-BezierFill"> + <object class="GtkMenuItem" id="MenuData-CorrelationDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BezierFill</property> + <property name="action_name">.uno:CorrelationDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-Polygon_Unfilled"> + <object class="GtkMenuItem" id="MenuData-CovarianceDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Polygon_Unfilled</property> + <property name="action_name">.uno:CovarianceDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-Polygon_Diagonal_Unfilled"> + <object class="GtkMenuItem" id="MenuData-ExponentialSmoothingDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Polygon_Diagonal_Unfilled</property> + <property name="action_name">.uno:ExponentialSmoothingDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-Polygon_Diagonal"> + <object class="GtkMenuItem" id="MenuData-MovingAverageDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Polygon_Diagonal</property> + <property name="action_name">.uno:MovingAverageDialog</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuDraw-separator1"> + <object class="GtkMenuItem" id="MenuData-RegressionDialog"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:RegressionDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-BasicShapes"> + <object class="GtkMenuItem" id="MenuData-TTestDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BasicShapes</property> + <property name="action_name">.uno:TTestDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-SymbolShapes"> + <object class="GtkMenuItem" id="MenuData-FTestDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SymbolShapes</property> + <property name="action_name">.uno:FTestDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-ArrowShapes"> + <object class="GtkMenuItem" id="MenuData-ZTestDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ArrowShapes</property> + <property name="action_name">.uno:ZTestDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-StarShapes"> + <object class="GtkMenuItem" id="MenuData-ChiSquareTestDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:StarShapes</property> + <property name="action_name">.uno:ChiSquareTestDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-CalloutShapes"> + <object class="GtkMenuItem" id="MenuData-FourierAnalysisDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CalloutShapes</property> + <property name="action_name">.uno:FourierAnalysisDialog</property> </object> </child> + </object> + <object class="GtkMenu" id="MenuDraw"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="MenuDraw-FlowChartShapes"> + <object class="GtkMenuItem" id="MenuDraw-Line"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlowChartShapes</property> + <property name="action_name">.uno:Line</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuDraw-separator2"> + <object class="GtkMenuItem" id="MenuDraw-BasicShapes.rectangle"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:BasicShapes.rectangle</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-BasicShapes.ellipse"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BasicShapes.ellipse</property> </object> </child> <child> @@ -673,30 +681,105 @@ </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuDraw-separator3"> + <object class="GtkMenuItem" id="MenuDraw-DrawText"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:DrawText</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-AddTextBox"> + <object class="GtkMenuItem" id="MenuDraw-VerticalText"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AddTextBox</property> + <property name="action_name">.uno:VerticalText</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-DrawText"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DrawText</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-VerticalText"> + <object class="GtkMenuItem" id="MenuDraw-ArrowsToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ArrowsToolbox</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-LineToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineToolbox</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-ConnectorToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ConnectorToolbox</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-BasicShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BasicShapes</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-SymbolShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SymbolShapes</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-ArrowShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ArrowShapes</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-FlowChartShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlowChartShapes</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-CalloutShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CalloutShapes</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-StarShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:StarShapes</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:VerticalText</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-AddTextBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AddTextBox</property> </object> </child> <child> @@ -727,17 +810,17 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-ToggleObjectBezierMode"> + <object class="GtkMenuItem" id="MenuDraw-ExtrusionToggle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectBezierMode</property> + <property name="action_name">.uno:ExtrusionToggle</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-ExtrusionToggle"> + <object class="GtkMenuItem" id="MenuDraw-ToggleObjectBezierMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ExtrusionToggle</property> + <property name="action_name">.uno:ToggleObjectBezierMode</property> </object> </child> </object> @@ -851,6 +934,19 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> + <object class="GtkMenuItem" id="MenuEdit-Repeat"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Repeat</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuEdit-separator1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuEdit-Cut"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -872,6 +968,13 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuEdit-PasteUnformatted"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PasteUnformatted</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuEdit-PasteSpecial"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -913,6 +1016,13 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuEdit-SelectTables"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SelectTables</property> + </object> + </child> + <child> <object class="GtkSeparatorMenuItem" id="MenuEdit-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -973,10 +1083,24 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuEdit-SwitchControlDesignMode"> + <object class="GtkMenuItem" id="MenuEdit-EditLinks"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:EditLinks</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-ImageMapDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SwitchControlDesignMode</property> + <property name="action_name">.uno:ImageMapDialog</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-ObjectMenue"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectMenue</property> </object> </child> <child> @@ -2253,10 +2377,10 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="MenuReview-SpellingAndGrammarDialog"> + <object class="GtkMenuItem" id="MenuReview-SpellDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SpellingAndGrammarDialog</property> + <property name="action_name">.uno:SpellDialog</property> </object> </child> <child> @@ -2378,17 +2502,17 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuReview-InsertAnnotation"> + <object class="GtkMenuItem" id="MenuReview-CompareDocuments"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertAnnotation</property> + <property name="action_name">.uno:CompareDocuments</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuReview-ShowAnnotations"> + <object class="GtkMenuItem" id="MenuReview-MergeDocuments"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ShowAnnotations</property> + <property name="action_name">.uno:MergeDocuments</property> </object> </child> <child> @@ -2405,17 +2529,37 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuReview-CompareDocuments"> + <object class="GtkMenuItem" id="MenuReview-SetInputMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CompareDocuments</property> + <property name="action_name">.uno:SetInputMode</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuReview-MergeDocuments"> + <object class="GtkMenuItem" id="MenuReview-CellProtection"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:MergeDocuments</property> + <property name="action_name">.uno:CellProtection</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuReview-EditDoc"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:EditDoc</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuReview-separator6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuReview-RedactDoc"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RedactDoc</property> </object> </child> </object> @@ -3494,7 +3638,7 @@ </packing> </child> <style> - <class name="priority-9"/> + <class name="priority-10"/> </style> </object> <packing> @@ -3841,10 +3985,74 @@ <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="box2"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="third5"> + <object class="svtlo-ManagedMenuButton" id="Default-Paragraph:MenuParagraph"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphb">_Paragraph</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-9"/> + </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="Default-Section-Paragraph1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section34"> + <property name="visible">True</property> + <property name="can_focus">False</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="sfxlo-NotebookbarToolBox" id="third5"> + <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> @@ -3897,29 +4105,13 @@ </packing> </child> <child> - <object class="GtkBox" id="box2"> + <object class="GtkBox" id="box63"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Default-Paragraph:MenuParagraph"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphb">_Paragraph</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> - <child> <object class="sfxlo-NotebookbarToolBox" id="ExtBottom8"> <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> @@ -3985,7 +4177,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -4118,7 +4310,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -4255,7 +4447,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -4369,7 +4561,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child> @@ -4483,7 +4675,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <child> @@ -4597,7 +4789,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">8</property> </packing> </child> <child> @@ -4711,7 +4903,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">9</property> </packing> </child> <child> @@ -4817,7 +5009,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">10</property> </packing> </child> <style> @@ -4941,7 +5133,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-4"/> </style> </object> <packing> @@ -5286,17 +5478,83 @@ <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="box6"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom1"> + <object class="svtlo-ManagedMenuButton" id="paragraphS:MenuParagraph"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphS">_Paragraph</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">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="DrawText-Section-Paragraph1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section35"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box66"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third2"> + <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="CellVertTop"> + <object class="GtkToolButton" id="Default-CommonAlignTop1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CellVertTop</property> + <property name="action_name">.uno:CommonAlignTop</property> </object> <packing> <property name="expand">False</property> @@ -5304,10 +5562,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="CellVertCenter"> + <object class="GtkToolButton" id="Default-CommonAlignVerticalCenter1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CellVertCenter</property> + <property name="action_name">.uno:CommonAlignVerticalCenter</property> </object> <packing> <property name="expand">False</property> @@ -5315,10 +5573,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="CellVertBottom"> + <object class="GtkToolButton" id="Default-CommonAlignBottom1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CellVertBottom</property> + <property name="action_name">.uno:CommonAlignBottom</property> </object> <packing> <property name="expand">False</property> @@ -5340,38 +5598,22 @@ </packing> </child> <child> - <object class="GtkBox" id="box6"> + <object class="GtkBox" id="box67"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="paragraphS:MenuParagraph"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphS">_Paragraph</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> - <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom4"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom3"> <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="ParaspaceDecrease"> + <object class="GtkToolButton" id="Default-ToggleMergeCells1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ParaspaceDecrease</property> + <property name="action_name">.uno:ToggleMergeCells</property> </object> <packing> <property name="expand">False</property> @@ -5379,10 +5621,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="ParaspaceIncrease"> + <object class="GtkToolButton" id="Default-IncrementIndent1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ParaspaceIncrease</property> + <property name="action_name">.uno:IncrementIndent</property> </object> <packing> <property name="expand">False</property> @@ -5390,10 +5632,10 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="LineSpacing"> + <object class="GtkToolButton" id="Default-WrapText1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LineSpacing</property> + <property name="action_name">.uno:WrapText</property> </object> <packing> <property name="expand">False</property> @@ -5428,7 +5670,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -5542,7 +5784,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <style> @@ -5604,10 +5846,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-FlipHorizontal"> + <object class="GtkToolButton" id="Draw-ToggleObjectBezierMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> + <property name="action_name">.uno:ToggleObjectBezierMode</property> </object> <packing> <property name="expand">False</property> @@ -5615,10 +5857,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-ToggleObjectBezierMode"> + <object class="GtkToolButton" id="Draw-FlipHorizontal"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectBezierMode</property> + <property name="action_name">.uno:FlipHorizontal</property> </object> <packing> <property name="expand">False</property> @@ -5696,7 +5938,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> @@ -5707,17 +5949,17 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third1"> <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="Draw-FormatLine"> + <object class="GtkToolButton" id="Table-BorderDialog2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatLine</property> + <property name="action_name">.uno:Line</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -5731,17 +5973,17 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third9"> <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="Draw-FormatArea"> + <object class="GtkToolButton" id="Table-FormatArea2"> <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="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -5756,9 +5998,20 @@ <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">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-FormatLineArea1"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkBox" id="box9"> <property name="visible">True</property> @@ -5771,11 +6024,11 @@ <child> <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">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Draw-XLineStyle"> + <object class="GtkMenuToolButton" id="Draw-XLineStyle2"> <property name="width_request">100</property> <property name="visible">True</property> <property name="can_focus">False</property> @@ -5787,28 +6040,49 @@ <property name="homogeneous">False</property> </packing> </child> + <child> + <object class="GtkToolButton" id="Draw-LineWidth2"> + <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">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="first3"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom12"> <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="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-XLineColor"> + <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-XLineColor2"> <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">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -5826,26 +6100,26 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom12"> - <property name="width_request">200</property> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom13"> <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="Draw-FillStyle"> + <object class="GtkToolButton" id="Draw-FillStyle1"> <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">False</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -5857,26 +6131,37 @@ <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="Draw-Section-FormatLineArea2"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkBox" id="box58"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first4"> + <object class="sfxlo-NotebookbarToolBox" id="first3"> <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="Draw-LineEndStyle"> + <object class="GtkToolButton" id="Image-LineEndStyle1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:LineEndStyle</property> </object> <packing> <property name="expand">True</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -5887,20 +6172,20 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom13"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom48"> <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="Draw-FillShadow"> + <object class="GtkToolButton" id="Image-FillShadow1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FillShadow</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -5918,13 +6203,13 @@ </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-10"/> </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> @@ -6027,6 +6312,70 @@ <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="box32"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Draw-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> + </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-9"/> + </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-Arrange1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section46"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box73"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="sfxlo-NotebookbarToolBox" id="Align2"> <property name="visible">True</property> @@ -6081,26 +6430,10 @@ </packing> </child> <child> - <object class="GtkBox" id="box32"> + <object class="GtkBox" id="box76"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Draw-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="Align3"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -6163,13 +6496,13 @@ </packing> </child> <style> - <class name="priority-6"/> + <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">5</property> </packing> </child> <child> @@ -6263,10 +6596,74 @@ <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="box47"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="shapes1"> + <object class="svtlo-ManagedMenuButton" id="Draw-Draw:MenuDraw"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|draw">_Shape</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-7"/> + </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="Draw-Section-Draw1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section43"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box71"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="shapes1"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -6317,29 +6714,13 @@ </packing> </child> <child> - <object class="GtkBox" id="box47"> + <object class="GtkBox" id="box72"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Draw-Draw:MenuDraw"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|draw">_Shape</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> - <child> <object class="sfxlo-NotebookbarToolBox" id="shapes2"> <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> @@ -6398,13 +6779,13 @@ </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">3</property> + <property name="position">7</property> </packing> </child> <child> @@ -6513,13 +6894,13 @@ </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">8</property> </packing> </child> <child> @@ -6590,6 +6971,84 @@ <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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box49"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Draw-3D:Menu3D"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|3Db">3_D</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-4"/> + </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-3d1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section39"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box69"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">end</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> <object class="GtkMenuToolButton" id="Draw-ExtrusionSurfaceFloater"> <property name="visible">True</property> @@ -6627,26 +7086,10 @@ </packing> </child> <child> - <object class="GtkBox" id="box49"> + <object class="GtkBox" id="box70"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Draw-3D:Menu3D"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|3Db">3_D</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> - <child> <object class="sfxlo-NotebookbarToolBox" id="third4"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -6704,7 +7147,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">10</property> </packing> </child> <child> @@ -6818,7 +7261,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">11</property> </packing> </child> <child> @@ -6932,9 +7375,12 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">12</property> </packing> </child> + <child> + <placeholder/> + </child> <style> <class name="context-Draw"/> <class name="context-DrawLine"/> @@ -7067,7 +7513,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator15"> + <object class="GtkSeparator" id="separator5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -7078,28 +7524,28 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkBox" id="box45"> + <object class="GtkBox" id="box19"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="third7"> + <object class="sfxlo-NotebookbarToolBox" id="third3"> <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-Section-FormatLine"> + <object class="GtkToolButton" id="Table-BorderDialog1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatLine</property> + <property name="action_name">.uno:Line</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -7111,19 +7557,19 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="third8"> + <object class="sfxlo-NotebookbarToolBox" id="third6"> <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-Section-FormatArea"> + <object class="GtkToolButton" id="Table-FormatArea1"> <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="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -7138,26 +7584,37 @@ <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">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Image-Section-FormatLineArea1"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkBox" id="box19"> + <object class="GtkBox" id="box20"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box20"> + <object class="GtkBox" id="box21"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first41"> + <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="GtkMenuToolButton" id="Image-Section-XLineStyle"> + <object class="GtkMenuToolButton" id="Draw-XLineStyle1"> <property name="width_request">100</property> <property name="visible">True</property> <property name="can_focus">False</property> @@ -7169,28 +7626,49 @@ <property name="homogeneous">False</property> </packing> </child> + <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">True</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="first1"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom15"> <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="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-Section-XLineColor"> + <object class="GtkToolButton" id="Draw-LineEndStyle2"> + <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-XLineColor1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:XLineColor</property> </object> <packing> <property name="expand">True</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -7209,25 +7687,25 @@ </child> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom18"> - <property name="width_request">200</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="Image-Section-FillStyle"> + <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">True</property> - <property name="homogeneous">False</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -7239,26 +7717,37 @@ <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="Image-Section-FormatLineArea2"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkBox" id="box21"> + <object class="GtkBox" id="box45"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first5"> + <object class="sfxlo-NotebookbarToolBox" id="first4"> <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-Section-LineEndStyle"> + <object class="GtkToolButton" id="Image-LineEndStyle2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:LineEndStyle</property> </object> <packing> <property name="expand">True</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -7269,20 +7758,20 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom15"> + <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="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-Section-FillShadow"> + <object class="GtkToolButton" id="Image-FillShadow2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FillShadow</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -7306,7 +7795,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <child> @@ -7409,6 +7898,70 @@ <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="box25"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Image-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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-5"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Image-Section-Arrange1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <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="GtkBox" id="box77"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="sfxlo-NotebookbarToolBox" id="Align5"> <property name="visible">True</property> @@ -7463,26 +8016,10 @@ </packing> </child> <child> - <object class="GtkBox" id="box25"> + <object class="GtkBox" id="box84"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Image-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="Align1"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -7545,13 +8082,13 @@ </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">2</property> + <property name="position">5</property> </packing> </child> <child> @@ -7636,14 +8173,11 @@ <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> + <property name="position">6</property> </packing> </child> <child> @@ -7723,7 +8257,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">5</property> + <property name="position">7</property> </packing> </child> <child> @@ -7802,7 +8336,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> @@ -7917,7 +8451,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">9</property> </packing> </child> <style> @@ -8050,7 +8584,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator32"> + <object class="GtkSeparator" id="separator7"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -8061,28 +8595,28 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkBox" id="box36"> + <object class="GtkBox" id="box88"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="third10"> + <object class="sfxlo-NotebookbarToolBox" id="third7"> <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="Object-FormatLine"> + <object class="GtkToolButton" id="Table-BorderDialog3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatLine</property> + <property name="action_name">.uno:Line</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -8094,19 +8628,19 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="third11"> + <object class="sfxlo-NotebookbarToolBox" id="third8"> <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="Object-FormatArea"> + <object class="GtkToolButton" id="Table-FormatArea3"> <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="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -8121,26 +8655,37 @@ <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">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-FormatLineArea1"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkBox" id="box37"> + <object class="GtkBox" id="box89"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box38"> + <object class="GtkBox" id="box90"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first6"> + <object class="sfxlo-NotebookbarToolBox" id="first5"> <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="Object-XLineStyle"> + <object class="GtkMenuToolButton" id="Draw-XLineStyle3"> <property name="width_request">100</property> <property name="visible">True</property> <property name="can_focus">False</property> @@ -8152,28 +8697,49 @@ <property name="homogeneous">False</property> </packing> </child> + <child> + <object class="GtkToolButton" id="Draw-LineWidth3"> + <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">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="first7"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom53"> <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="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-XLineColor"> + <object class="GtkToolButton" id="Draw-LineEndStyle3"> + <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-XLineColor3"> <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">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -8191,26 +8757,26 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom5"> - <property name="width_request">200</property> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom54"> <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="Object-FillStyle"> + <object class="GtkToolButton" id="Draw-FillStyle3"> <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">False</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -8222,26 +8788,37 @@ <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="Object-Section-FormatLineArea2"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkBox" id="box48"> + <object class="GtkBox" id="box91"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first8"> + <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="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-LineEndStyle"> + <object class="GtkToolButton" id="Image-LineEndStyle3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:LineEndStyle</property> </object> <packing> <property name="expand">True</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -8252,20 +8829,20 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom16"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom55"> <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-FillShadow"> + <object class="GtkToolButton" id="Image-FillShadow3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FillShadow</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -8283,13 +8860,13 @@ </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">3</property> </packing> </child> <child> @@ -8392,6 +8969,70 @@ <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="box64"> + <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> + </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">5</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-Arrange1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <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="box85"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="sfxlo-NotebookbarToolBox" id="Align4"> <property name="visible">True</property> @@ -8446,26 +9087,10 @@ </packing> </child> <child> - <object class="GtkBox" id="box64"> + <object class="GtkBox" id="box87"> <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"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -8534,7 +9159,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">6</property> </packing> </child> <child> @@ -8649,7 +9274,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">7</property> </packing> </child> <style> @@ -8667,7 +9292,7 @@ <object class="sfxlo-PriorityMergedHBox" id="MediaContainer"> <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="Media-Section-Graphic"> + <object class="sfxlo-OptionalBox" id="Media-Section-Media"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -8709,10 +9334,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-FlipHorizontal"> + <object class="GtkToolButton" id="Media-AVMediaPlayer"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> + <property name="action_name">.uno:AVMediaPlayer</property> </object> <packing> <property name="expand">False</property> @@ -8720,10 +9345,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-AVMediaPlayer"> + <object class="GtkToolButton" id="Media-FlipHorizontal"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AVMediaPlayer</property> + <property name="action_name">.uno:FlipHorizontal</property> </object> <packing> <property name="expand">False</property> @@ -8775,11 +9400,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="MediaSection-FormatLineArea"> + <object class="sfxlo-OptionalBox" id="Media-Section-AVMediaToolBox"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -8803,23 +9428,20 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="third12"> - <property name="width_request">800</property> + <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="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-AVMediaToolBox"> - <property name="width_request">800</property> + <object class="GtkToolButton" id="Media-AVMediaToolBox1"> <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">False</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -8830,57 +9452,120 @@ </packing> </child> <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="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">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Media-Section-Arrange"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkSeparator" id="separator77"> + <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="Section50"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> <object class="GtkBox" id="box59"> <property name="visible">True</property> <property name="can_focus">False</property> <child> <object class="sfxlo-NotebookbarToolBox" id="arrange4"> <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-Section-BringToFront"> + <object class="GtkToolButton" id="Draw-BringToFront1"> <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">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Media-Section-ObjectForwardOne"> + <object class="GtkToolButton" id="Media-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">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Media-Section-ObjectBackOne"> + <object class="GtkToolButton" id="Media-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">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Media-Section-SendToBack"> + <object class="GtkToolButton" id="Draw-SendToBack1"> <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">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -8891,7 +9576,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator70"> + <object class="GtkSeparator" id="separator80"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -8905,6 +9590,71 @@ <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="box36"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Media-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> + </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">2</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="baseline_position">bottom</property> + <child> + <object class="GtkBox" id="Section65"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box110"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="sfxlo-NotebookbarToolBox" id="Align9"> <property name="visible">True</property> @@ -8912,36 +9662,36 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-Section-ObjectAlignLeft"> + <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">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Media-Section-AlignCenter"> + <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">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Media-Section-ObjectAlignRight"> + <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">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -8951,65 +9701,63 @@ <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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box111"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="sfxlo-NotebookbarToolBox" id="Align10"> <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="Media-Section-AlignUp"> + <object class="GtkToolButton" id="Draw-AlignUp2"> <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">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Media-Section-AlignMiddle"> + <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">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Media-Section-AlignDown"> + <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">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">1</property> </packing> </child> </object> @@ -9033,7 +9781,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <child> @@ -9148,7 +9896,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">5</property> </packing> </child> <style> @@ -9210,10 +9958,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Multi-FlipHorizontal"> + <object class="GtkToolButton" id="Multi-ToggleObjectBezierMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> + <property name="action_name">.uno:ToggleObjectBezierMode</property> </object> <packing> <property name="expand">False</property> @@ -9221,10 +9969,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Multi-ToggleObjectBezierMode"> + <object class="GtkToolButton" id="Multi-FlipHorizontal"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectBezierMode</property> + <property name="action_name">.uno:FlipHorizontal</property> </object> <packing> <property name="expand">False</property> @@ -9302,28 +10050,28 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkBox" id="box78"> + <object class="GtkBox" id="box80"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> <object class="sfxlo-NotebookbarToolBox" id="third13"> <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="Multi-FormatLine"> + <object class="GtkToolButton" id="Table-BorderDialog5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatLine</property> + <property name="action_name">.uno:Line</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -9337,17 +10085,17 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third14"> <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="Multi-FormatArea"> + <object class="GtkToolButton" id="Table-FormatArea5"> <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="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -9362,26 +10110,37 @@ <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">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Multi-Section-FormatLineArea1"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkBox" id="box79"> + <object class="GtkBox" id="box81"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box80"> + <object class="GtkBox" id="box78"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first9"> + <object class="sfxlo-NotebookbarToolBox" id="first7"> <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="Multi-XLineStyle"> + <object class="GtkMenuToolButton" id="Draw-XLineStyle5"> <property name="width_request">100</property> <property name="visible">True</property> <property name="can_focus">False</property> @@ -9393,28 +10152,49 @@ <property name="homogeneous">False</property> </packing> </child> + <child> + <object class="GtkToolButton" id="Draw-LineWidth5"> + <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">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="first10"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom5"> <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="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Multi-XLineColor"> + <object class="GtkToolButton" id="Draw-LineEndStyle5"> + <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-XLineColor5"> <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">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -9432,26 +10212,26 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom31"> - <property name="width_request">200</property> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom16"> <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="Multi-FillStyle"> + <object class="GtkToolButton" id="Draw-FillStyle5"> <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">False</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -9463,26 +10243,37 @@ <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="Multi-Section-FormatLineArea2"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkBox" id="box81"> + <object class="GtkBox" id="box79"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first11"> + <object class="sfxlo-NotebookbarToolBox" id="first8"> <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="Multi-LineEndStyle"> + <object class="GtkToolButton" id="Image-LineEndStyle4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:LineEndStyle</property> </object> <packing> <property name="expand">True</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -9493,20 +10284,20 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom32"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom62"> <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="Multi-FillShadow"> + <object class="GtkToolButton" id="Image-FillShadow4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FillShadow</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -9524,13 +10315,13 @@ </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">1</property> + <property name="position">3</property> </packing> </child> <child> @@ -9633,10 +10424,74 @@ <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="box83"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align7"> + <object class="svtlo-ManagedMenuButton" id="Multi-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> + </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"/> + </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="Multi-Section-Arrange1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section51"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box37"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align7"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -9687,29 +10542,13 @@ </packing> </child> <child> - <object class="GtkBox" id="box83"> + <object class="GtkBox" id="box38"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Multi-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="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> @@ -9775,7 +10614,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> @@ -9890,7 +10729,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> @@ -10005,7 +10844,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">7</property> </packing> </child> <style> @@ -10199,79 +11038,96 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first29"> + <object class="GtkBox" id="box41"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="resize_mode">immediate</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Print-FirstPage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FirstPage</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Print-PreviousPage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:PreviousPage</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> + <property name="can_focus">False</property> <child> - <object class="GtkToolButton" id="Print-NextPage"> + <object class="sfxlo-NotebookbarToolBox" id="second13"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:NextPage</property> + <property name="can_focus">True</property> + <property name="resize_mode">immediate</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Print-ZoomOut"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ZoomOut</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">False</property> + <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkToolButton" id="Print-LastPage"> + <object class="sfxlo-NotebookbarToolBox" id="second10"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LastPage</property> + <property name="halign">end</property> + <property name="hexpand">True</property> + <property name="resize_mode">immediate</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Print-ZoomIn"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ZoomIn</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">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">1</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="GtkBox" id="box41"> + <object class="GtkBox" id="box48"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="second13"> + <object class="sfxlo-NotebookbarToolBox" id="first29"> <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">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Print-ZoomOut"> + <object class="GtkToolButton" id="Print-FirstPage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ZoomOut</property> + <property name="action_name">.uno:FirstPage</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Print-PreviousPage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PreviousPage</property> </object> <packing> <property name="expand">False</property> @@ -10286,17 +11142,30 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="second10"> + <object class="sfxlo-NotebookbarToolBox" id="first6"> <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="resize_mode">immediate</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Print-ZoomIn"> + <object class="GtkToolButton" id="Print-NextPage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ZoomIn</property> + <property name="action_name">.uno:NextPage</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Print-LastPage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LastPage</property> </object> <packing> <property name="expand">False</property> @@ -10306,14 +11175,13 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">1</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">2</property> </packing> @@ -10589,12 +11457,11 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Property"> + <object class="sfxlo-OptionalBox" id="Form-Section-Form2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator12"> + <object class="GtkSeparator" id="separator8"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10609,14 +11476,16 @@ </packing> </child> <child> - <object class="GtkBox" id="Section36"> + <object class="GtkBox" id="GroupB59"> <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="SectionBottom51"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom114"> <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> @@ -10627,7 +11496,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -10638,9 +11507,9 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom56"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom115"> <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> @@ -10651,7 +11520,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -10668,9 +11537,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-5"/> - </style> </object> <packing> <property name="expand">False</property> @@ -10679,30 +11545,31 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Property1"> + <object class="sfxlo-OptionalBox" id="Form-Section-Form3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> - <object class="GtkBox" id="Section22"> + <object class="GtkBox" id="GroupB49"> <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="SectionBottom35"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom118"> <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="Form-TabDialog"> + <object class="GtkToolButton" id="Form-TabDialog1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:TabDialog</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -10713,20 +11580,20 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom38"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom119"> <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="Form-OpenReadOnly"> + <object class="GtkToolButton" id="Form-OpenReadOnly2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:OpenReadOnly</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -10743,9 +11610,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-4"/> - </style> </object> <packing> <property name="expand">False</property> @@ -10754,30 +11618,46 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Property2"> + <object class="sfxlo-OptionalBox" id="Form-Section-Form4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> - <object class="GtkBox" id="Section23"> + <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="GroupB82"> + <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="SectionBottom43"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom128"> <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="Form-ControlProperties"> + <object class="GtkToolButton" id="Form-ControlProperties2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ControlProperties</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -10788,20 +11668,20 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom44"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom129"> <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="Form-AutoControlFocus"> + <object class="GtkToolButton" id="Form-AutoControlFocus2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AutoControlFocus</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -10819,7 +11699,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-4"/> </style> </object> <packing> @@ -10829,12 +11709,11 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Form1"> + <object class="sfxlo-OptionalBox" id="Form-Section-Form5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator30"> + <object class="GtkSeparator" id="separator59"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10849,18 +11728,20 @@ </packing> </child> <child> - <object class="GtkBox" id="Section20"> + <object class="GtkBox" id="GroupB54"> <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="SectionBottom110"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom51"> <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> @@ -10871,7 +11752,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> @@ -10882,7 +11763,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> @@ -10892,8 +11773,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="SectionBottom56"> + <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> @@ -10904,7 +11798,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> @@ -10915,7 +11809,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> @@ -10929,20 +11823,63 @@ <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">4</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator55"> + <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="SectionBottom63"> <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> @@ -10950,10 +11887,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> @@ -10961,21 +11898,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> @@ -10983,10 +11933,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> @@ -10994,10 +11944,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> @@ -11025,16 +11975,15 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Form2"> + <object class="sfxlo-OptionalBox" id="Form-Section-Form7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator35"> + <object class="GtkSeparator" id="separator62"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -11049,14 +11998,16 @@ </packing> </child> <child> - <object class="GtkBox" id="Section38"> + <object class="GtkBox" id="GroupB56"> <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="SectionBottom112"> <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> @@ -11102,7 +12053,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom113"> <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> @@ -11159,7 +12110,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <style> diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui index a42ce9fd3e72..fc2f38648373 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui @@ -1,5 +1,6 @@ -<!-- <?xml version="1.0" encoding="UTF-8"?> --> +<?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.22.1 --> +<!-- <?xml version="1.0" encoding="UTF-8"?> --> <interface domain="sc"> <requires lib="gtk+" version="3.18"/> <requires lib="LibreOffice" version="1.0"/> @@ -637,118 +638,126 @@ <property name="action_name">.uno:ShowDetail</property> </object> </child> - </object> - <object class="GtkMenu" id="MenuDraw"> - <property name="visible">True</property> - <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="MenuDraw-Line"> + <object class="GtkSeparatorMenuItem" id="MenuData-separator8"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Line</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-Freeline_Unfilled"> + <object class="GtkMenuItem" id="MenuData-SamplingDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Freeline_Unfilled</property> + <property name="action_name">.uno:SamplingDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-Freeline"> + <object class="GtkMenuItem" id="MenuData-DescriptiveStatisticsDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Freeline</property> + <property name="action_name">.uno:DescriptiveStatisticsDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-Bezier_Unfilled"> + <object class="GtkMenuItem" id="MenuData-AnalysisOfVarianceDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Bezier_Unfilled</property> + <property name="action_name">.uno:AnalysisOfVarianceDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-BezierFill"> + <object class="GtkMenuItem" id="MenuData-CorrelationDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BezierFill</property> + <property name="action_name">.uno:CorrelationDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-Polygon_Unfilled"> + <object class="GtkMenuItem" id="MenuData-CovarianceDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Polygon_Unfilled</property> + <property name="action_name">.uno:CovarianceDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-Polygon_Diagonal_Unfilled"> + <object class="GtkMenuItem" id="MenuData-ExponentialSmoothingDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Polygon_Diagonal_Unfilled</property> + <property name="action_name">.uno:ExponentialSmoothingDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-Polygon_Diagonal"> + <object class="GtkMenuItem" id="MenuData-MovingAverageDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Polygon_Diagonal</property> + <property name="action_name">.uno:MovingAverageDialog</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuDraw-separator1"> + <object class="GtkMenuItem" id="MenuData-RegressionDialog"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:RegressionDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-BasicShapes"> + <object class="GtkMenuItem" id="MenuData-TTestDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BasicShapes</property> + <property name="action_name">.uno:TTestDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-SymbolShapes"> + <object class="GtkMenuItem" id="MenuData-FTestDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SymbolShapes</property> + <property name="action_name">.uno:FTestDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-ArrowShapes"> + <object class="GtkMenuItem" id="MenuData-ZTestDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ArrowShapes</property> + <property name="action_name">.uno:ZTestDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-StarShapes"> + <object class="GtkMenuItem" id="MenuData-ChiSquareTestDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:StarShapes</property> + <property name="action_name">.uno:ChiSquareTestDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-CalloutShapes"> + <object class="GtkMenuItem" id="MenuData-FourierAnalysisDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CalloutShapes</property> + <property name="action_name">.uno:FourierAnalysisDialog</property> </object> </child> + </object> + <object class="GtkMenu" id="MenuDraw"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="MenuDraw-FlowChartShapes"> + <object class="GtkMenuItem" id="MenuDraw-Line"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlowChartShapes</property> + <property name="action_name">.uno:Line</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuDraw-separator2"> + <object class="GtkMenuItem" id="MenuDraw-BasicShapes.rectangle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BasicShapes.rectangle</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-BasicShapes.ellipse"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:BasicShapes.ellipse</property> </object> </child> <child> @@ -766,30 +775,105 @@ </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuDraw-separator3"> + <object class="GtkMenuItem" id="MenuDraw-DrawText"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:DrawText</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-AddTextBox"> + <object class="GtkMenuItem" id="MenuDraw-VerticalText"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AddTextBox</property> + <property name="action_name">.uno:VerticalText</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-DrawText"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DrawText</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-VerticalText"> + <object class="GtkMenuItem" id="MenuDraw-ArrowsToolbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:VerticalText</property> + <property name="action_name">.uno:ArrowsToolbox</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-LineToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineToolbox</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-ConnectorToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ConnectorToolbox</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-BasicShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BasicShapes</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-SymbolShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SymbolShapes</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-ArrowShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ArrowShapes</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-FlowChartShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlowChartShapes</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-CalloutShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CalloutShapes</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-StarShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:StarShapes</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-AddTextBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AddTextBox</property> </object> </child> <child> @@ -820,17 +904,17 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-ToggleObjectBezierMode"> + <object class="GtkMenuItem" id="MenuDraw-ExtrusionToggle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectBezierMode</property> + <property name="action_name">.uno:ExtrusionToggle</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-ExtrusionToggle"> + <object class="GtkMenuItem" id="MenuDraw-ToggleObjectBezierMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ExtrusionToggle</property> + <property name="action_name">.uno:ToggleObjectBezierMode</property> </object> </child> </object> @@ -944,6 +1028,19 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> + <object class="GtkMenuItem" id="MenuEdit-Repeat"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Repeat</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuEdit-separator1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuEdit-Cut"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -965,6 +1062,13 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuEdit-PasteUnformatted"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PasteUnformatted</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuEdit-PasteSpecial"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1006,6 +1110,13 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuEdit-SelectTables"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SelectTables</property> + </object> + </child> + <child> <object class="GtkSeparatorMenuItem" id="MenuEdit-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1072,6 +1183,33 @@ <property name="action_name">.uno:PageFormatDialog</property> </object> </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-EditLinks"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:EditLinks</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-ImageMapDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ImageMapDialog</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-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="MenuEdit-separator6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> </object> <object class="GtkMenu" id="MenuFile"> <property name="visible">True</property> @@ -2196,10 +2334,10 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="MenuReview-SpellingAndGrammarDialog"> + <object class="GtkMenuItem" id="MenuReview-SpellDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SpellingAndGrammarDialog</property> + <property name="action_name">.uno:SpellDialog</property> </object> </child> <child> @@ -2321,17 +2459,17 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuReview-InsertAnnotation"> + <object class="GtkMenuItem" id="MenuReview-CompareDocuments"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertAnnotation</property> + <property name="action_name">.uno:CompareDocuments</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuReview-ShowAnnotations"> + <object class="GtkMenuItem" id="MenuReview-MergeDocuments"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ShowAnnotations</property> + <property name="action_name">.uno:MergeDocuments</property> </object> </child> <child> @@ -2348,17 +2486,37 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuReview-CompareDocuments"> + <object class="GtkMenuItem" id="MenuReview-SetInputMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CompareDocuments</property> + <property name="action_name">.uno:SetInputMode</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuReview-MergeDocuments"> + <object class="GtkMenuItem" id="MenuReview-CellProtection"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:MergeDocuments</property> + <property name="action_name">.uno:CellProtection</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuReview-EditDoc"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:EditDoc</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuReview-separator6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuReview-RedactDoc"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RedactDoc</property> </object> </child> </object> diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui index 96192cf34f69..9213b216ef82 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar.ui @@ -14880,13 +14880,12 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Media-Section-ObjectAlign1"> + <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="GtkSeparator" id="separator31"> + <object class="GtkSeparator" id="separator86"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -14901,128 +14900,70 @@ </packing> </child> <child> - <object class="GtkBox" id="box33"> + <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="AlignGroup9"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom138"> + <property name="width_request">148</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <property name="show_arrow">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align17"> + <object class="GtkToolButton" id="Media-AVMediaToolBox"> <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-ObjectAlignLeft1"> - <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-AlignCenter1"> - <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-ObjectAlignRight1"> - <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> + <property name="action_name">.uno:AVMediaToolBox</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> + </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="SectionBottom139"> + <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="sfxlo-NotebookbarToolBox" id="Align18"> + <object class="GtkToolButton" id="Media-AVMediaPlayer1"> <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-AlignUp1"> - <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-AlignDown1"> - <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> - <child> - <object class="GtkToolButton" id="Object-AlignMiddle1"> - <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> + <property name="action_name">.uno:AVMediaPlayer</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> </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">2</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">5</property> + <property name="position">1</property> </packing> </child> <child> @@ -15156,16 +15097,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">2</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Media-Section-AVMediaToolBox"> + <object class="sfxlo-OptionalBox" id="Media-Section-ObjectAlign1"> <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="separator86"> + <object class="GtkSeparator" id="separator31"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -15180,70 +15122,128 @@ </packing> </child> <child> - <object class="GtkBox" id="box15"> + <object class="GtkBox" id="box33"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom138"> - <property name="width_request">148</property> + <object class="GtkBox" id="AlignGroup9"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="show_arrow">False</property> + <property name="orientation">vertical</property> <child> - <object class="GtkToolButton" id="Media-AVMediaToolBox"> + <object class="sfxlo-NotebookbarToolBox" id="Align17"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AVMediaToolBox</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-ObjectAlignLeft1"> + <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-AlignCenter1"> + <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-ObjectAlignRight1"> + <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="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom139"> - <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"> + <object class="sfxlo-NotebookbarToolBox" id="Align18"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AVMediaPlayer</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-AlignUp1"> + <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-AlignDown1"> + <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> + <child> + <object class="GtkToolButton" id="Object-AlignMiddle1"> + <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> </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">1</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> + <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">7</property> + <property name="position">3</property> </packing> </child> </object> diff --git a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui index ef814639bb6e..a136a1032064 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui @@ -272,56 +272,76 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-Freeline_Unfilled"> + <object class="GtkMenuItem" id="MenuDraw-BasicShapes.rectangle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Freeline_Unfilled</property> + <property name="action_name">.uno:BasicShapes.rectangle</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-Freeline"> + <object class="GtkMenuItem" id="MenuDraw-BasicShapes.ellipse"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Freeline</property> + <property name="action_name">.uno:BasicShapes.ellipse</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-Bezier_Unfilled"> + <object class="GtkMenuItem" id="MenuDraw-DrawCaption"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DrawCaption</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-VerticalCaption"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Bezier_Unfilled</property> + <property name="action_name">.uno:VerticalCaption</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-BezierFill"> + <object class="GtkMenuItem" id="MenuDraw-DrawText"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BezierFill</property> + <property name="action_name">.uno:Text</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-Polygon_Unfilled"> + <object class="GtkMenuItem" id="MenuDraw-VerticalText"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Polygon_Unfilled</property> + <property name="action_name">.uno:VerticalText</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-Polygon_Diagonal_Unfilled"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Polygon_Diagonal_Unfilled</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-Polygon_Diagonal"> + <object class="GtkMenuItem" id="MenuDraw-ArrowsToolbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Polygon_Diagonal</property> + <property name="action_name">.uno:ArrowsToolbox</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuDraw-separator1"> + <object class="GtkMenuItem" id="MenuDraw-LineToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineToolbox</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-ConnectorToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ConnectorToolbox</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator2"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -348,10 +368,10 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-StarShapes"> + <object class="GtkMenuItem" id="MenuDraw-FlowChartShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:StarShapes</property> + <property name="action_name">.uno:FlowChartShapes</property> </object> </child> <child> @@ -362,57 +382,57 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-FlowChartShapes"> + <object class="GtkMenuItem" id="MenuDraw-StarShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlowChartShapes</property> + <property name="action_name">.uno:StarShapes</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuDraw-separator2"> + <object class="GtkMenuItem" id="MenuDraw-Objects3DToolbox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:Objects3DToolbox</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-DrawCaption"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DrawCaption</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-InsertGraphic"> + <object class="GtkMenuItem" id="MenuDraw-AddTextBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertGraphic</property> + <property name="action_name">.uno:AddTextBox</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-FontworkGalleryFloater"> + <object class="GtkMenuItem" id="MenuDraw-InsertGraphic"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FontworkGalleryFloater</property> + <property name="action_name">.uno:InsertGraphic</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuDraw-separator3"> + <object class="GtkMenuItem" id="MenuDraw-FontworkGalleryFloater"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkGalleryFloater</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-DrawText"> + <object class="GtkMenuItem" id="MenuDraw-Text_Marquee"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Text</property> + <property name="action_name">.uno:Text_Marquee</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-VerticalText"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:VerticalText</property> </object> </child> <child> @@ -434,82 +454,89 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="SelectObjectD"> + <object class="GtkMenuItem" id="DrawEdit-SelectObject"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SelectObject</property> </object> </child> <child> - <object class="GtkMenuItem" id="ToggleObjectRotateModeD"> + <object class="GtkMenuItem" id="DrawEdit-ToggleObjectBezierMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectRotateMode</property> + <property name="action_name">.uno:ToggleObjectBezierMode</property> </object> </child> <child> - <object class="GtkMenuItem" id="SelectObjectD1"> + <object class="GtkSeparatorMenuItem" id="DrawEdit-Separator1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectBezierMode</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator129"> + <object class="GtkMenuItem" id="DrawEdit-ToggleObjectRotateMode"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:ToggleObjectRotateMode</property> </object> </child> <child> - <object class="GtkMenuItem" id="FlipVerticald"> + <object class="GtkMenuItem" id="DrawEdit-FlipVertical"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FlipVertical</property> </object> </child> <child> - <object class="GtkMenuItem" id="FlipHorizontalD1"> + <object class="GtkMenuItem" id="DrawEdit-FlipHorizontal"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FlipHorizontal</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator120"> + <object class="GtkMenuItem" id="DrawEdit-AdvancedMode"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:AdvancedMode</property> </object> </child> <child> - <object class="GtkMenuItem" id="TransformDialogD"> + <object class="GtkSeparatorMenuItem" id="DrawEdit-Separator2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="DrawEdit-TransformDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:TransformDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="FormatLineD"> + <object class="GtkMenuItem" id="DrawEdit-FormatLine"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FormatLine</property> </object> </child> <child> - <object class="GtkMenuItem" id="FormatAreaD"> + <object class="GtkMenuItem" id="DrawEdit-FormatArea"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FormatArea</property> </object> </child> <child> - <object class="GtkMenuItem" id="TextAttributesD"> + <object class="GtkMenuItem" id="DrawEdit-TextAttributes"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:TextAttributes</property> </object> </child> <child> - <object class="GtkMenuItem" id="FontWorkD"> + <object class="GtkMenuItem" id="DrawEdit-FontWork"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FontWork</property> @@ -520,6 +547,19 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> + <object class="GtkMenuItem" id="MenuEdit-Repeat"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Repeat</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuEdit-separator1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuEdit-Cut"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -601,10 +641,45 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuEdit-SwitchControlDesignMode"> + <object class="GtkMenuItem" id="MenuEdit-EditHyperlink"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:EditHyperlink</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-ModifyField"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ModifyField</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-IndexEntryDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:IndexEntryDialog</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-ManageLinks"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ManageLinks</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-ImageMapDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ImageMapDialog</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-ObjectMenue"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SwitchControlDesignMode</property> + <property name="action_name">.uno:ObjectMenue</property> </object> </child> <child> @@ -614,6 +689,33 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuEdit-ToggleObjectBezierMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ToggleObjectBezierMode</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-GlueEditMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GlueEditMode</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-EditDoc"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:EditDoc</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuEdit-separator6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuEdit-PageSetup"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -2060,91 +2162,90 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="SpellDialogD"> + <object class="GtkMenuItem" id="MenuReview-SpellDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SpellDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="SpellOnlineD"> + <object class="GtkMenuItem" id="MenuReview-SpellOnline"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SpellOnline</property> </object> </child> <child> - <object class="GtkMenuItem" id="ThesaurusDialogD"> + <object class="GtkMenuItem" id="MenuReview-ThesaurusDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ThesaurusDialog</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator47"> + <object class="GtkMenuItem" id="MenuReview-MoreDictionaries"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:MoreDictionaries</property> </object> </child> <child> - <object class="GtkMenuItem" id="SetLanguageAllTextMenuD"> + <object class="GtkSeparatorMenuItem" id="MenuReview-separator1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SetLanguageAllTextMenu</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator112"> + <object class="GtkMenuItem" id="MenuReview-SetLanguageAllTextMenu"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:SetLanguageAllTextMenu</property> </object> </child> <child> - <object class="GtkMenuItem" id="HyphenationD"> + <object class="GtkSeparatorMenuItem" id="MenuReview-separator2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Hyphenation</property> </object> </child> <child> - <object class="GtkMenuItem" id="ChineseConversionD"> + <object class="GtkMenuItem" id="MenuReview-ChineseConversion"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ChineseConversion</property> </object> </child> <child> - <object class="GtkMenuItem" id="HangulHanjaConversionD"> + <object class="GtkMenuItem" id="MenuReview-HangulHanjaConversion"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:HangulHanjaConversion</property> </object> </child> <child> - <object class="GtkMenuItem" id="MoreDictionariesD"> + <object class="GtkMenuItem" id="MenuReview-Hyphenation"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:MoreDictionaries</property> + <property name="action_name">.uno:Hyphenation</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator49"> + <object class="GtkSeparatorMenuItem" id="MenuReview-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="InsertAnnotationD"> + <object class="GtkSeparatorMenuItem" id="MenuReview-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertAnnotation</property> </object> </child> <child> - <object class="GtkMenuItem" id="ShowAnnotations"> + <object class="GtkMenuItem" id="MenuReview-RedactDoc"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ShowAnnotations</property> + <property name="action_name">.uno:RedactDoc</property> </object> </child> </object> @@ -2711,30 +2812,58 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuView-LeftPaneDraw"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LeftPaneDraw</property> + </object> + </child> + <child> <object class="GtkSeparatorMenuItem" id="MenuView-separator2"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuView-LeftPaneImpress"> + <object class="GtkMenuItem" id="MenuView-ShowRuler"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LeftPaneImpress</property> + <property name="action_name">.uno:ShowRuler</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuView-ToggleTabBarVisibility"> + <object class="GtkMenuItem" id="MenuView-GridVisible"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleTabBarVisibility</property> + <property name="action_name">.uno:GridVisible</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuView-ShowRuler"> + <object class="GtkMenuItem" id="MenuView-GridUse"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ShowRuler</property> + <property name="action_name">.uno:GridUse</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuView-SnapFrame"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SnapFrame</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuView-SnapPoints"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SnapPoints</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuView-SnapBorder"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SnapBorder</property> </object> </child> <child> @@ -2771,12 +2900,32 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuView-ZoomPageWidth"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ZoomPageWidth</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuView-Zoom100Percent"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Zoom100Percent</property> </object> </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuView-separator5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuView-Zoom"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Zoom</property> + </object> + </child> </object> <object class="GtkGrid" id="NotebookBar"> <property name="visible">True</property> @@ -3390,9 +3539,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-5"/> - </style> </object> <packing> <property name="expand">False</property> @@ -3451,8 +3597,113 @@ <property name="homogeneous">False</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">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="shapes6"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="toolbar_style">icons</property> + <child> + <object class="GtkToolButton" id="Default-StarShapes1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:StarShapes</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">False</property> + </packing> + </child> <child> - <object class="GtkToolButton" id="Default-ConnectorToolbox1"> + <object class="GtkToolButton" id="Default-CalloutShapes1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CalloutShapes</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-FlowChartShapes1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlowChartShapes</property> + </object> + <packing> + <property name="expand">True</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> + </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">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Default-Section-Draw2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section20"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box95"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="shapes3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <child> + <object class="GtkToolButton" id="Default-ConnectorToolbox2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ConnectorToolbox</property> @@ -3470,7 +3721,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator20"> + <object class="GtkSeparator" id="separator82"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -3485,13 +3736,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineA8"> + <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">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Default-XLineColor1"> + <object class="GtkToolButton" id="Default-XLineColor2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:XLineColor</property> @@ -3516,49 +3767,16 @@ </packing> </child> <child> - <object class="GtkBox" id="box11"> + <object class="GtkBox" id="box96"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="shapes6"> + <object class="sfxlo-NotebookbarToolBox" id="shapes4"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <child> - <object class="GtkToolButton" id="Default-StarShapes1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:StarShapes</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Default-CalloutShapes1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:CalloutShapes</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Default-FlowChartShapes1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FlowChartShapes</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Default-Objects3DToolbox1"> + <object class="GtkToolButton" id="Default-Objects3DToolbox2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Objects3DToolbox</property> @@ -3576,7 +3794,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator51"> + <object class="GtkSeparator" id="separator88"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -3591,13 +3809,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB8"> + <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">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Default-FillColor1"> + <object class="GtkToolButton" id="Default-FillColor2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FillColor</property> @@ -3629,13 +3847,13 @@ </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> @@ -3791,13 +4009,13 @@ </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">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -3905,13 +4123,13 @@ </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">5</property> </packing> </child> <child> @@ -4019,35 +4237,22 @@ </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-2"/> </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> - <style> - <class name="context-Default"/> - <class name="context-DrawPage"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-PriorityMergedHBox" id="TableContainer"> - <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="Table-Section-Insert"> + <object class="sfxlo-OptionalBox" id="Default-Section-Form"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator10"> + <object class="GtkSeparator" id="separator66"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -4062,32 +4267,22 @@ </packing> </child> <child> - <object class="GtkBox" id="Section3"> + <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="SectionBottom3"> + <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">end</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Table-SplitCell"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SplitCell</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Table-MergeCells"> + <object class="GtkToolButton" id="Default-SwitchControlDesignMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:MergeCells</property> + <property name="action_name">.uno:SwitchControlDesignMode</property> </object> <packing> <property name="expand">False</property> @@ -4095,10 +4290,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-TableDialog"> + <object class="GtkToolButton" id="Default-TextboxForm"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:TableDialog</property> + <property name="action_name">.uno:Edit</property> </object> <packing> <property name="expand">False</property> @@ -4106,100 +4301,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-OptimizeTable"> + <object class="GtkToolButton" id="Default-CheckBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:OptimizeTable</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="GtkBox" id="box2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="svtlo-ManagedMenuButton" id="Table-Table:MenuRowsColumns"> - <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|rowscolumnst">_Table</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">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">0</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Table-Section-FormatLineArea"> - <property name="visible">True</property> - <property name="can_focus">False</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="box39"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <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="Table-BorderDialog"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Line</property> + <property name="action_name">.uno:CheckBox</property> </object> <packing> <property name="expand">False</property> @@ -4214,26 +4319,19 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="third6"> + <object class="svtlo-ManagedMenuButton" id="Default-FormButton:MenuForm"> + <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|FormButton">Fo_rm</property> <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-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> + <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">True</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> @@ -4244,194 +4342,30 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkBox" id="box40"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkBox" id="box41"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="first21"> - <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="SectionBottom16"> - <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="box42"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom79"> - <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="Table-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">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="GtkBox" id="box89"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="first14"> - <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="Draw-LineEndStyle1"> - <property name="visible">True</property> - <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> - </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">True</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Draw-FillShadow2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FillShadow</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">3</property> - </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">1</property> + <property name="position">7</property> </packing> </child> + <style> + <class name="context-Default"/> + <class name="context-DrawPage"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-PriorityMergedHBox" id="TableContainer"> + <property name="can_focus">False</property> <child> <object class="sfxlo-OptionalBox" id="Table-Section-Font"> <property name="visible">True</property> @@ -4661,14 +4595,11 @@ <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> + <property name="position">0</property> </packing> </child> <child> @@ -4752,9 +4683,9 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom3"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom5"> <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> @@ -4768,6 +4699,83 @@ <property name="homogeneous">False</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">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box25"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Table-Paragraph:MenuParagraph"> + <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|paragrapht">_Paragraph</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-8"/> + </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="Table-Section-Paragraph1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section45"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box99"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom3"> + <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="Table-CenterPara"> <property name="visible">True</property> @@ -4816,29 +4824,13 @@ </packing> </child> <child> - <object class="GtkBox" id="box25"> + <object class="GtkBox" id="box100"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Table-Paragraph:MenuParagraph"> - <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|paragrapht">_Paragraph</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> - <child> <object class="sfxlo-NotebookbarToolBox" id="third2"> <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> @@ -4898,13 +4890,13 @@ </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">2</property> </packing> </child> <child> @@ -4912,6 +4904,129 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> + <object class="GtkSeparator" id="separator10"> + <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="Section3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom3"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Table-SplitCell"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SplitCell</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-MergeCells"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:MergeCells</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-TableDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:TableDialog</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-OptimizeTable"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:OptimizeTable</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="GtkBox" id="box2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Table-Table:MenuRowsColumns"> + <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|rowscolumnst">_Table</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">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">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-Table1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> <object class="GtkSeparator" id="separator124"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -4981,45 +5096,29 @@ <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="box57"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="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">1</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40"> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop14"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="opacity">0.92156862745098034</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Table-EntireColumn"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:EntireColumn</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Table-SetMinimalColumnWidth"> + <object class="GtkToolButton" id="Table-InsertRowsBefore"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SetMinimalColumnWidth</property> + <property name="action_name">.uno:InsertRowsBefore</property> </object> <packing> <property name="expand">False</property> @@ -5027,10 +5126,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-SetOptimalColumnWidth"> + <object class="GtkToolButton" id="Table-InsertRowsAfter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SetOptimalColumnWidth</property> + <property name="action_name">.uno:InsertRowsAfter</property> </object> <packing> <property name="expand">False</property> @@ -5038,10 +5137,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-DistributeColumns"> + <object class="GtkToolButton" id="Table-DeleteRows"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DistributeColumns</property> + <property name="action_name">.uno:DeleteRows</property> </object> <packing> <property name="expand">False</property> @@ -5052,32 +5151,74 @@ <packing> <property name="expand">False</property> <property name="fill">True</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> + <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-6"/> + </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-Table2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section43"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box57"> + <object class="GtkBox" id="box97"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop14"> + <object class="GtkSeparator" id="separator17"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="opacity">0.92156862745098034</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">1</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Table-InsertRowsBefore"> + <object class="GtkToolButton" id="Table-EntireColumn"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertRowsBefore</property> + <property name="action_name">.uno:EntireColumn</property> </object> <packing> <property name="expand">False</property> @@ -5085,10 +5226,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-InsertRowsAfter"> + <object class="GtkToolButton" id="Table-SetMinimalColumnWidth"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertRowsAfter</property> + <property name="action_name">.uno:SetMinimalColumnWidth</property> </object> <packing> <property name="expand">False</property> @@ -5096,10 +5237,21 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-DeleteRows"> + <object class="GtkToolButton" id="Table-SetOptimalColumnWidth"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DeleteRows</property> + <property name="action_name">.uno:SetOptimalColumnWidth</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-DistributeColumns"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DistributeColumns</property> </object> <packing> <property name="expand">False</property> @@ -5110,11 +5262,22 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</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="GtkBox" id="box98"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator17"> + <object class="GtkSeparator" id="separator20"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -5131,9 +5294,9 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom33"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom55"> <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> @@ -5202,21 +5365,21 @@ </packing> </child> <style> - <class name="priority-2"/> + <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">5</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Table-Section-Calc"> + <object class="sfxlo-OptionalBox" id="Table-Section-FormatLineArea1"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator139"> + <object class="GtkSeparator" id="separator1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -5227,64 +5390,29 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkBox" id="Section23"> + <object class="GtkBox" id="box39"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box60"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom38"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Table-TableSort"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:TableSort</property> - </object> - <packing> - <property name="expand">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="SectionBottom43"> + <object class="GtkToolButton" id="Table-BorderDialog"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Table-AutoSum"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AutoSum</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">False</property> - </packing> - </child> + <property name="can_focus">False</property> + <property name="action_name">.uno:Line</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -5295,23 +5423,20 @@ </packing> </child> <child> - <object class="GtkBox" id="box61"> + <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="svtlo-ManagedMenuButton" id="Table-Calc:MenuCalculate"> - <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|calculatet">_Calc</property> + <object class="GtkToolButton" id="Table-FormatArea"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">False</property> - <property name="relief">none</property> - <property name="use_underline">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatArea</property> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -5325,11 +5450,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-1"/> + <class name="priority-4"/> </style> </object> <packing> @@ -5338,91 +5463,77 @@ <property name="position">6</property> </packing> </child> - <style> - <class name="context-Table"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="sfxlo-PriorityMergedHBox" id="DrawTextContainer"> - <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="Text-Section-Insert"> + <object class="sfxlo-OptionalBox" id="Table-Section-FormatLineArea2"> <property name="visible">True</property> <property name="can_focus">False</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="GtkBox" id="Section9"> + <object class="GtkBox" id="box40"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom1"> + <object class="GtkBox" id="box41"> <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="DrawText-InsertGraphic"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:InsertGraphic</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="DrawText-InsertObjectChart"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:InsertObjectChart</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> + <property name="can_focus">False</property> <child> - <object class="GtkToolButton" id="DrawText-InsertPage"> + <object class="sfxlo-NotebookbarToolBox" id="first14"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertPage</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">False</property> - <property name="homogeneous">False</property> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkToolButton" id="DrawText-InsertTable"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom16"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertTable</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="homogeneous">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> @@ -5433,23 +5544,20 @@ </packing> </child> <child> - <object class="GtkBox" id="box8"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom33"> <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="svtlo-ManagedMenuButton" id="DrawText-Insert:MenuInsert"> - <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|insertText">_Insert</property> + <object class="GtkToolButton" id="Object-FillStyle2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">False</property> - <property name="relief">none</property> - <property name="use_underline">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillStyle</property> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -5463,22 +5571,25 @@ <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">0</property> + <property name="position">7</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Text-Section-FormatLineArea"> + <object class="sfxlo-OptionalBox" id="Table-Section-Calc"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator16"> + <object class="GtkSeparator" id="separator139"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -5493,112 +5604,52 @@ </packing> </child> <child> - <object class="GtkBox" id="box77"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="third15"> - <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="Text-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">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="third16"> - <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="Text-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="box84"> + <object class="GtkBox" id="Section23"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box85"> + <object class="GtkBox" id="box60"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first12"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom38"> <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="Text-XLineStyle"> + <object class="GtkToolButton" id="Table-TableSort"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:XLineStyle</property> + <property name="action_name">.uno:TableSort</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">False</property> </packing> </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom17"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom43"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Text-XLineColor"> + <object class="GtkToolButton" id="Table-AutoSum"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:XLineColor</property> + <property name="action_name">.uno:AutoSum</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">False</property> </packing> </child> @@ -5617,68 +5668,121 @@ </packing> </child> <child> - <object class="GtkBox" id="box87"> + <object class="GtkBox" id="box61"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom32"> - <property name="width_request">200</property> + <object class="svtlo-ManagedMenuButton" id="Table-Calc:MenuCalculate"> + <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|calculatet">_Calc</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="Text-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">False</property> - </packing> - </child> + <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">1</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> + <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">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">8</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-Insert"> + <property name="visible">True</property> + <property name="can_focus">False</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="GtkBox" id="box88"> + <object class="GtkBox" id="Section9"> <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="SectionBottom1"> <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="Draw-LineEndStyle2"> + <object class="GtkToolButton" id="Default-InsertGraphic1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LineEndStyle</property> + <property name="action_name">.uno:InsertGraphic</property> </object> <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-InsertObjectChart1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertObjectChart</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-InsertPage1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertPage</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-InsertTable1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertTable</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -5689,20 +5793,23 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom54"> + <object class="GtkBox" id="box8"> <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> <child> - <object class="GtkToolButton" id="Draw-FillShadow1"> + <object class="svtlo-ManagedMenuButton" id="Default-Insert:MenuInsert1"> + <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|insertText">_Insert</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FillShadow</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="homogeneous">True</property> + <property name="fill">False</property> + <property name="position">0</property> </packing> </child> </object> @@ -5716,19 +5823,32 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-1"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">9</property> </packing> </child> + <style> + <class name="context-Table"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-PriorityMergedHBox" id="DrawTextContainer"> + <property name="can_focus">False</property> <child> <object class="sfxlo-OptionalBox" id="Text-Section-Font"> <property name="visible">True</property> @@ -5958,14 +6078,11 @@ <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">2</property> + <property name="position">1</property> </packing> </child> <child> @@ -6065,6 +6182,83 @@ <property name="homogeneous">False</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">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box20"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Text-Paragraph:MenuParagraph"> + <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|paragrapht">_Paragraph</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-5"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Text-Section-Paragraph1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <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="box42"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom6"> + <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="Text-Section-CenterPara"> <property name="visible">True</property> @@ -6113,29 +6307,13 @@ </packing> </child> <child> - <object class="GtkBox" id="box20"> + <object class="GtkBox" id="box89"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Text-Paragraph:MenuParagraph"> - <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|paragrapht">_Paragraph</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> - <child> <object class="sfxlo-NotebookbarToolBox" id="third5"> <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> @@ -6195,7 +6373,7 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-4"/> </style> </object> <packing> @@ -6205,6 +6383,299 @@ </packing> </child> <child> + <object class="sfxlo-OptionalBox" id="Text-Section-FormatLineArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator3"> + <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="box101"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third12"> + <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-BorderDialog1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Line</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="third17"> + <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-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">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">4</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Text-Section-FormatLineArea1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="box77"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box84"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first12"> + <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-LineWidth1"> + <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="SectionBottom17"> + <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-LineEndStyle4"> + <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-XLineColor1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:XLineColor</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </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="SectionBottom127"> + <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="Draw-FillStyle4"> + <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">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">5</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Text-Section-FormatLineArea2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="box85"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first27"> + <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="Image-LineEndStyle"> + <property name="visible">True</property> + <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> + </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="SectionBottom134"> + <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="Image-FillShadow"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillShadow</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">3</property> + </packing> + </child> + <style> + <class name="priority-2"/> + </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="Text-Section-View"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -6315,7 +6786,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">7</property> </packing> </child> <style> @@ -6471,7 +6942,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator26"> + <object class="GtkSeparator" id="separator16"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -6482,7 +6953,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> @@ -6493,17 +6964,17 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third1"> <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="Draw-FormatLine"> + <object class="GtkToolButton" id="Table-BorderDialog2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatLine</property> + <property name="action_name">.uno:Line</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -6517,17 +6988,17 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third9"> <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="Draw-FormatArea"> + <object class="GtkToolButton" id="Table-FormatArea2"> <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="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -6542,9 +7013,20 @@ <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">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-FormatLineArea1"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkBox" id="box9"> <property name="visible">True</property> @@ -6557,14 +7039,15 @@ <child> <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">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Draw-XLineStyle"> + <object class="GtkMenuToolButton" id="Draw-XLineStyle2"> <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> @@ -6572,28 +7055,49 @@ <property name="homogeneous">False</property> </packing> </child> + <child> + <object class="GtkToolButton" id="Draw-LineWidth2"> + <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">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="first3"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom21"> <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="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-XLineColor"> + <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-XLineColor2"> <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">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -6611,26 +7115,26 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom21"> - <property name="width_request">200</property> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom22"> <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="Draw-FillStyle"> + <object class="GtkToolButton" id="Draw-FillStyle1"> <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">False</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -6642,26 +7146,37 @@ <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="Draw-Section-FormatLineArea2"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkBox" id="box58"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first4"> + <object class="sfxlo-NotebookbarToolBox" id="first3"> <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="Draw-LineEndStyle"> + <object class="GtkToolButton" id="Image-LineEndStyle1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:LineEndStyle</property> </object> <packing> <property name="expand">True</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -6672,20 +7187,20 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom22"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom32"> <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="Draw-FillShadow"> + <object class="GtkToolButton" id="Image-FillShadow1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FillShadow</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -6703,13 +7218,13 @@ </packing> </child> <style> - <class name="priority-8"/> + <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> @@ -6812,10 +7327,74 @@ <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="box32"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align2"> + <object class="svtlo-ManagedMenuButton" id="Draw-Arrange:MenuArrange"> + <property name="label" translatable="yes" context="draw_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> + </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-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="Draw-Section-Arrange1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <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="box87"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align2"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -6866,29 +7445,13 @@ </packing> </child> <child> - <object class="GtkBox" id="box32"> + <object class="GtkBox" id="box88"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Draw-Arrange:MenuArrange"> - <property name="label" translatable="yes" context="draw_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="Align3"> <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> @@ -6948,13 +7511,13 @@ </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-9"/> </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> @@ -7110,17 +7673,17 @@ </packing> </child> <style> - <class name="priority-6"/> + <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">6</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Draw-Section-Draw"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Shape"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -7232,10 +7795,74 @@ <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="box47"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="shapes1"> + <object class="svtlo-ManagedMenuButton" id="Draw-Draw:MenuDraw"> + <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|draw">_Shape</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-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="Draw-Section-Shape1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section54"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box104"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="shapes1"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -7297,29 +7924,13 @@ </packing> </child> <child> - <object class="GtkBox" id="box47"> + <object class="GtkBox" id="box105"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Draw-Draw:MenuDraw"> - <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|draw">_Shape</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> - <child> <object class="sfxlo-NotebookbarToolBox" id="shapes2"> <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> @@ -7389,13 +8000,13 @@ </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">4</property> + <property name="position">8</property> </packing> </child> <child> @@ -7503,13 +8114,13 @@ </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">5</property> + <property name="position">9</property> </packing> </child> <child> @@ -7579,6 +8190,83 @@ <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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box49"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Draw-3D:Menu3D"> + <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|3Db">3_D</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-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="Draw-Section-3d1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section51"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box102"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom36"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> <object class="GtkMenuToolButton" id="Draw-ExtrusionSurfaceFloater"> <property name="visible">True</property> @@ -7616,29 +8304,13 @@ </packing> </child> <child> - <object class="GtkBox" id="box49"> + <object class="GtkBox" id="box103"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Draw-3D:Menu3D"> - <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|3Db">3_D</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> - <child> <object class="sfxlo-NotebookbarToolBox" id="third4"> <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> @@ -7693,7 +8365,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">11</property> </packing> </child> <child> @@ -7807,7 +8479,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">12</property> </packing> </child> <child> @@ -7921,7 +8593,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">13</property> </packing> </child> <style> @@ -8066,7 +8738,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator60"> + <object class="GtkSeparator" id="separator26"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -8077,7 +8749,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> @@ -8088,17 +8760,17 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third7"> <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-Section-FormatLine"> + <object class="GtkToolButton" id="Table-BorderDialog3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatLine</property> + <property name="action_name">.uno:Line</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -8112,17 +8784,17 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third8"> <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-Section-FormatArea"> + <object class="GtkToolButton" id="Table-FormatArea3"> <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="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -8137,9 +8809,20 @@ <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">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Imag-Section-FormatLineArea1"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkBox" id="box50"> <property name="visible">True</property> @@ -8150,16 +8833,17 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first41"> + <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="GtkMenuToolButton" id="Image-Section-XLineStyle"> + <object class="GtkMenuToolButton" id="Draw-XLineStyle3"> <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> @@ -8167,28 +8851,49 @@ <property name="homogeneous">False</property> </packing> </child> + <child> + <object class="GtkToolButton" id="Draw-LineWidth3"> + <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">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="first1"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom18"> <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="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-Section-XLineColor"> + <object class="GtkToolButton" id="Draw-LineEndStyle2"> + <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-XLineColor3"> <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">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -8206,26 +8911,26 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom18"> - <property name="width_request">200</property> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom24"> <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="Image-Section-FillStyle"> + <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">True</property> - <property name="homogeneous">False</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -8237,26 +8942,40 @@ <property name="position">2</property> </packing> </child> + <style> + <class name="priority-8"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Imag-Section-FormatLineArea2"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkBox" id="box53"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first5"> + <object class="sfxlo-NotebookbarToolBox" id="first4"> <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-Section-LineEndStyle"> + <object class="GtkToolButton" id="Image-LineEndStyle2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:LineEndStyle</property> </object> <packing> <property name="expand">True</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -8267,20 +8986,20 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom24"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom54"> <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-Section-FillShadow"> + <object class="GtkToolButton" id="Image-FillShadow2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FillShadow</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -8298,13 +9017,13 @@ </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">1</property> + <property name="position">3</property> </packing> </child> <child> @@ -8407,10 +9126,74 @@ <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="sfxlo-NotebookbarToolBox" id="Align5"> + <object class="svtlo-ManagedMenuButton" id="Image-Arrange:MenuArrange"> + <property name="label" translatable="yes" context="draw_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> + </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-6"/> + </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="Image-Section-Arrange1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section55"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box106"> + <property name="visible">True</property> + <property name="can_focus">False</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> @@ -8461,29 +9244,13 @@ </packing> </child> <child> - <object class="GtkBox" id="box43"> + <object class="GtkBox" id="box107"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Image-Arrange:MenuArrange"> - <property name="label" translatable="yes" context="draw_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="Align1"> <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> @@ -8549,7 +9316,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> @@ -8705,13 +9472,13 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-3"/> </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> @@ -8796,14 +9563,11 @@ <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">4</property> + <property name="position">7</property> </packing> </child> <child> @@ -8880,7 +9644,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">5</property> + <property name="position">8</property> </packing> </child> <child> @@ -8957,7 +9721,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">9</property> </packing> </child> <style> @@ -9092,7 +9856,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> @@ -9100,7 +9864,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator57"> + <object class="GtkSeparator" id="separator51"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -9111,7 +9875,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> @@ -9122,17 +9886,17 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third10"> <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="OLE-FormatLine"> + <object class="GtkToolButton" id="Table-BorderDialog4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatLine</property> + <property name="action_name">.uno:Line</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -9146,17 +9910,17 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third11"> <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="OLE-FormatArea"> + <object class="GtkToolButton" id="Table-FormatArea4"> <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="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -9171,9 +9935,20 @@ <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">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="OLE-Section-FormatLineArea1"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkBox" id="box37"> <property name="visible">True</property> @@ -9184,16 +9959,17 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first6"> + <object class="sfxlo-NotebookbarToolBox" id="first5"> <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="OLE-XLineStyle"> + <object class="GtkMenuToolButton" id="Draw-XLineStyle4"> <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> @@ -9201,28 +9977,49 @@ <property name="homogeneous">False</property> </packing> </child> + <child> + <object class="GtkToolButton" id="Draw-LineWidth4"> + <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">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="first7"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom26"> <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="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="OLE-XLineColor"> + <object class="GtkToolButton" id="Draw-LineEndStyle3"> + <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-XLineColor4"> <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">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -9240,26 +10037,26 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom26"> - <property name="width_request">200</property> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom27"> <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="OLE-FillStyle"> + <object class="GtkToolButton" id="Draw-FillStyle3"> <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">False</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -9271,26 +10068,37 @@ <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="OLE-Section-FormatLineArea2"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkBox" id="box48"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first8"> + <object class="sfxlo-NotebookbarToolBox" id="first6"> <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="OLE-LineEndStyle"> + <object class="GtkToolButton" id="Image-LineEndStyle3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:LineEndStyle</property> </object> <packing> <property name="expand">True</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -9301,20 +10109,20 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom27"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom56"> <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="OLE-FillShadow"> + <object class="GtkToolButton" id="Image-FillShadow3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FillShadow</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -9332,13 +10140,13 @@ </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">3</property> </packing> </child> <child> @@ -9441,10 +10249,74 @@ <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="box64"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align4"> + <object class="svtlo-ManagedMenuButton" id="OLE-Arrange:MenuArrange"> + <property name="label" translatable="yes" context="draw_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> + </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">4</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="OLE-Section-Arrange1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section56"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box108"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align4"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -9495,29 +10367,13 @@ </packing> </child> <child> - <object class="GtkBox" id="box64"> + <object class="GtkBox" id="box109"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="OLE-Arrange:MenuArrange"> - <property name="label" translatable="yes" context="draw_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"> <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> @@ -9583,7 +10439,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">5</property> </packing> </child> <child> @@ -9745,7 +10601,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">6</property> </packing> </child> <style> @@ -9881,11 +10737,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="MediaSection-FormatLineArea"> + <object class="sfxlo-OptionalBox" id="Media-Section-AVMediaToolBox"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -9909,23 +10765,20 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="third12"> - <property name="width_request">800</property> + <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="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-AVMediaToolBox"> - <property name="width_request">800</property> + <object class="GtkToolButton" id="Media-AVMediaToolBox1"> <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">False</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -9936,57 +10789,120 @@ </packing> </child> <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom49"> + <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">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Media-Section-Arrange"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkSeparator" id="separator77"> + <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="Section52"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> <object class="GtkBox" id="box59"> <property name="visible">True</property> <property name="can_focus">False</property> <child> <object class="sfxlo-NotebookbarToolBox" id="arrange4"> <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-Section-BringToFront"> + <object class="GtkToolButton" id="Draw-BringToFront1"> <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">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Media-Section-Forward"> + <object class="GtkToolButton" id="Media-Forward"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Forward</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="Media-Section-Backward"> + <object class="GtkToolButton" id="Media-Backward"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Backward</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="Media-Section-SendToBack"> + <object class="GtkToolButton" id="Draw-SendToBack1"> <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">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -9997,7 +10913,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator77"> + <object class="GtkSeparator" id="separator80"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10011,43 +10927,108 @@ <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="box92"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align9"> + <object class="svtlo-ManagedMenuButton" id="Media-Arrange:MenuArrange"> + <property name="label" translatable="yes" context="draw_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> + </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">2</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="baseline_position">bottom</property> + <child> + <object class="GtkBox" id="Section53"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box93"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align9"> + <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="Media-Section-ObjectAlignLeft"> + <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">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Media-Section-AlignCenter"> + <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">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Media-Section-ObjectAlignRight"> + <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">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -10057,65 +11038,63 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator80"> - <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> + </packing> + </child> + <child> + <object class="GtkBox" id="box94"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="sfxlo-NotebookbarToolBox" id="Align10"> <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="Media-Section-AlignUp"> + <object class="GtkToolButton" id="Draw-AlignUp2"> <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">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Media-Section-AlignMiddle"> + <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">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Media-Section-AlignDown"> + <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">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">1</property> </packing> </child> </object> @@ -10139,7 +11118,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <child> @@ -10301,7 +11280,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <style> @@ -10455,7 +11434,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator89"> + <object class="GtkSeparator" id="separator57"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10466,28 +11445,28 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkBox" id="box78"> + <object class="GtkBox" id="box80"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> <object class="sfxlo-NotebookbarToolBox" id="third13"> <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="Multi-FormatLine"> + <object class="GtkToolButton" id="Table-BorderDialog5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatLine</property> + <property name="action_name">.uno:Line</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -10501,17 +11480,17 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third14"> <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="Multi-FormatArea"> + <object class="GtkToolButton" id="Table-FormatArea5"> <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="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -10526,29 +11505,41 @@ <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">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Multi-Section-FormatLineArea1"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkBox" id="box79"> + <object class="GtkBox" id="box81"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box80"> + <object class="GtkBox" id="box110"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first9"> + <object class="sfxlo-NotebookbarToolBox" id="first7"> <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="Multi-XLineStyle"> + <object class="GtkMenuToolButton" id="Draw-XLineStyle5"> <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> @@ -10556,28 +11547,49 @@ <property name="homogeneous">False</property> </packing> </child> + <child> + <object class="GtkToolButton" id="Draw-LineWidth5"> + <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">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="first10"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom37"> <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="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Multi-XLineColor"> + <object class="GtkToolButton" id="Draw-LineEndStyle5"> + <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-XLineColor5"> <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">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -10595,26 +11607,26 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom37"> - <property name="width_request">200</property> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom39"> <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="Multi-FillStyle"> + <object class="GtkToolButton" id="Draw-FillStyle5"> <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">False</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -10626,26 +11638,37 @@ <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="Multi-Section-FormatLineArea2"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkBox" id="box81"> + <object class="GtkBox" id="box111"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first11"> + <object class="sfxlo-NotebookbarToolBox" id="first8"> <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="Multi-LineEndStyle"> + <object class="GtkToolButton" id="Image-LineEndStyle4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:LineEndStyle</property> </object> <packing> <property name="expand">True</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -10656,20 +11679,20 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom39"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom57"> <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="Multi-FillShadow"> + <object class="GtkToolButton" id="Image-FillShadow4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FillShadow</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -10687,13 +11710,13 @@ </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">1</property> + <property name="position">3</property> </packing> </child> <child> @@ -10796,10 +11819,74 @@ <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="box83"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align7"> + <object class="svtlo-ManagedMenuButton" id="Multi-Arrange:MenuArrange"> + <property name="label" translatable="yes" context="draw_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> + </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"/> + </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="Multi-Section-Arrange1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section57"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box78"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align7"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -10850,29 +11937,13 @@ </packing> </child> <child> - <object class="GtkBox" id="box83"> + <object class="GtkBox" id="box79"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Multi-Arrange:MenuArrange"> - <property name="label" translatable="yes" context="draw_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="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> @@ -10938,7 +12009,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> @@ -11100,7 +12171,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> @@ -11214,7 +12285,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <style> @@ -11231,11 +12302,11 @@ <object class="sfxlo-PriorityMergedHBox" id="MasterPageContainer"> <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="Master-Section-Insert"> + <object class="sfxlo-OptionalBox" id="Master-Section-Master"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator84"> + <object class="GtkSeparator" id="separator166"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -11250,21 +12321,21 @@ </packing> </child> <child> - <object class="GtkBox" id="Section38"> + <object class="GtkBox" id="Section36"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom31"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom52"> <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="Master-InsertGraphic"> + <object class="GtkToolButton" id="Master-InsertMasterPage2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertGraphic</property> + <property name="action_name">.uno:InsertMasterPage</property> </object> <packing> <property name="expand">False</property> @@ -11272,10 +12343,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Master-InsertObjectChart"> + <object class="GtkToolButton" id="Master-DeleteMasterPage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertObjectChart</property> + <property name="action_name">.uno:DeleteMasterPage</property> </object> <packing> <property name="expand">False</property> @@ -11283,10 +12354,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Master-InsertMasterPage"> + <object class="GtkToolButton" id="Master-RenameMasterPage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertMasterPage</property> + <property name="action_name">.uno:RenameMasterPage</property> </object> <packing> <property name="expand">False</property> @@ -11294,10 +12365,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Master-InsertTable1"> + <object class="GtkToolButton" id="Master-CloseMasterView"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertTable</property> + <property name="action_name">.uno:CloseMasterView</property> </object> <packing> <property name="expand">False</property> @@ -11312,12 +12383,12 @@ </packing> </child> <child> - <object class="GtkBox" id="box71"> + <object class="GtkBox" id="box67"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Master-Insert:MenuInsert"> - <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|insertText">_Insert</property> + <object class="svtlo-ManagedMenuButton" id="Master-Master:MenuMasterPage"> + <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|oleB">_Master</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="focus_on_click">False</property> @@ -11327,7 +12398,7 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -11345,9 +12416,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-5"/> - </style> </object> <packing> <property name="expand">False</property> @@ -11488,7 +12556,7 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-5"/> </style> </object> <packing> @@ -11548,11 +12616,56 @@ <property name="homogeneous">False</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">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box34"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="shapes8"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="toolbar_style">icons</property> + <child> + <object class="GtkToolButton" id="Master-Draw-StarShapes1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:StarShapes</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">False</property> + </packing> + </child> <child> - <object class="GtkToolButton" id="Master-ConnectorToolbox1"> + <object class="GtkToolButton" id="Master-Draw-CalloutShapes1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ConnectorToolbox</property> + <property name="action_name">.uno:CalloutShapes</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Master-Draw-FlowChartShapes1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlowChartShapes</property> </object> <packing> <property name="expand">True</property> @@ -11563,38 +12676,81 @@ <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">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-6"/> + </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="Master-Section-Draw2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section58"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box112"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator27"> + <object class="sfxlo-NotebookbarToolBox" id="shapes9"> <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> - <child> - <object class="sfxlo-NotebookbarToolBox" id="LineA9"> - <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="Master-XLineColor1"> + <object class="GtkToolButton" id="Master-BasicShapes2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:XLineColor</property> + <property name="action_name">.uno:BasicShapes</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Master-SymbolShapes2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SymbolShapes</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Master-ArrowShapes2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ArrowShapes</property> + </object> + <packing> + <property name="expand">True</property> <property name="homogeneous">False</property> </packing> </child> @@ -11602,7 +12758,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">2</property> </packing> </child> </object> @@ -11613,16 +12769,16 @@ </packing> </child> <child> - <object class="GtkBox" id="box34"> + <object class="GtkBox" id="box113"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="shapes8"> + <object class="sfxlo-NotebookbarToolBox" id="shapes10"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <child> - <object class="GtkToolButton" id="Master-Draw-StarShapes1"> + <object class="GtkToolButton" id="Master-Draw-StarShapes2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:StarShapes</property> @@ -11633,7 +12789,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Master-Draw-CalloutShapes1"> + <object class="GtkToolButton" id="Master-Draw-CalloutShapes2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:CalloutShapes</property> @@ -11644,7 +12800,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Master-Draw-FlowChartShapes1"> + <object class="GtkToolButton" id="Master-Draw-FlowChartShapes2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FlowChartShapes</property> @@ -11654,17 +12810,6 @@ <property name="homogeneous">False</property> </packing> </child> - <child> - <object class="GtkToolButton" id="Master-Draw-Objects3DToolbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Objects3DToolbox</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">False</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -11672,43 +12817,129 @@ <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-5"/> + </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="Master-Section-Insert"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator84"> + <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="Section38"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom31"> + <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="Master-InsertGraphic"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertGraphic</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Master-InsertObjectChart"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertObjectChart</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> <child> - <object class="GtkSeparator" id="separator53"> + <object class="GtkToolButton" id="Master-InsertMasterPage"> <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="action_name">.uno:InsertMasterPage</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">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Master-InsertTable1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertTable</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="GtkBox" id="box71"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB9"> + <object class="svtlo-ManagedMenuButton" id="Master-Insert:MenuInsert"> + <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|insertText">_Insert</property> <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="Master-FillColor1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FillColor</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> + <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">3</property> + <property name="fill">False</property> + <property name="position">0</property> </packing> </child> </object> @@ -11726,13 +12957,13 @@ </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">4</property> </packing> </child> <child> @@ -11888,13 +13119,13 @@ </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">3</property> + <property name="position">5</property> </packing> </child> <child> @@ -12002,21 +13233,21 @@ </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-2"/> </style> </object> <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="Master-Section-Master"> + <object class="sfxlo-OptionalBox" id="Master-Section-Review"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator166"> + <object class="GtkSeparator" id="separator101"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12031,21 +13262,21 @@ </packing> </child> <child> - <object class="GtkBox" id="Section36"> + <object class="GtkBox" id="Section60"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom52"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom61"> <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="Master-InsertMasterPage2"> + <object class="GtkToolButton" id="Default-SpellDialog2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertMasterPage</property> + <property name="action_name">.uno:SpellDialog</property> </object> <packing> <property name="expand">False</property> @@ -12053,21 +13284,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Master-DeleteMasterPage"> + <object class="GtkToolButton" id="Default-InsertAnnotation2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DeleteMasterPage</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Master-RenameMasterPage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:RenameMasterPage</property> + <property name="action_name">.uno:InsertAnnotation</property> </object> <packing> <property name="expand">False</property> @@ -12075,10 +13295,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Master-CloseMasterView"> + <object class="GtkToolButton" id="Default-GridVisible2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CloseMasterView</property> + <property name="action_name">.uno:GridVisible</property> </object> <packing> <property name="expand">False</property> @@ -12093,12 +13313,12 @@ </packing> </child> <child> - <object class="GtkBox" id="box67"> + <object class="GtkBox" id="box114"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Master-Master:MenuMasterPage"> - <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|oleB">_Master</property> + <object class="svtlo-ManagedMenuButton" id="Default-Review:MenuReview2"> + <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|reviewb">_Review</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="focus_on_click">False</property> @@ -12126,11 +13346,14 @@ <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">5</property> + <property name="position">7</property> </packing> </child> <style> @@ -12174,7 +13397,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom50"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">end</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> @@ -12212,7 +13435,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Form-OpenReadOnly1"> + <object class="GtkToolButton" id="Form-OpenReadOnly2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:OpenReadOnly</property> @@ -12261,10 +13484,9 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Property"> + <object class="sfxlo-OptionalBox" id="Form-Section-Form2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> <object class="GtkSeparator" id="separator56"> <property name="visible">True</property> @@ -12281,14 +13503,16 @@ </packing> </child> <child> - <object class="GtkBox" id="Section20"> + <object class="GtkBox" id="GroupB59"> <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="SectionBottom51"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom114"> <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> @@ -12299,29 +13523,80 @@ </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="SectionBottom115"> + <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="Form-TabDialog"> + <object class="GtkToolButton" id="Form-ShowFmExplorer"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:TabDialog</property> + <property name="action_name">.uno:ShowFmExplorer</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">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="Form-Section-Form3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="GroupB49"> + <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="SectionBottom118"> + <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="Form-ControlProperties"> + <object class="GtkToolButton" id="Form-TabDialog1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ControlProperties</property> + <property name="action_name">.uno:TabDialog</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -12332,42 +13607,108 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom56"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom119"> <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="Form-ShowFmExplorer"> + <object class="GtkToolButton" id="Form-OpenReadOnly1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ShowFmExplorer</property> + <property name="action_name">.uno:OpenReadOnly</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">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="Form-Section-Form4"> + <property name="visible">True</property> + <property name="can_focus">False</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="GroupB82"> + <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="SectionBottom128"> + <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="Form-OpenReadOnly"> + <object class="GtkToolButton" id="Form-ControlProperties2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:OpenReadOnly</property> + <property name="action_name">.uno:ControlProperties</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="SectionBottom129"> + <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="Form-AutoControlFocus"> + <object class="GtkToolButton" id="Form-AutoControlFocus2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AutoControlFocus</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -12385,22 +13726,21 @@ </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">3</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Form1"> + <object class="sfxlo-OptionalBox" id="Form-Section-Form5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator58"> + <object class="GtkSeparator" id="separator59"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12415,18 +13755,20 @@ </packing> </child> <child> - <object class="GtkBox" id="Section43"> + <object class="GtkBox" id="GroupB54"> <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="SectionBottom110"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom51"> <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> @@ -12437,7 +13779,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> @@ -12448,7 +13790,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> @@ -12458,8 +13800,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="SectionBottom53"> + <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> @@ -12470,7 +13825,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> @@ -12481,7 +13836,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> @@ -12495,20 +13850,63 @@ <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">4</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form6"> + <property name="visible">True</property> + <property name="can_focus">False</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="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="SectionBottom48"> <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> @@ -12516,10 +13914,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> @@ -12527,21 +13925,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> @@ -12549,10 +13960,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> @@ -12560,10 +13971,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> @@ -12591,16 +14002,15 @@ <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="Form-Section-Form2"> + <object class="sfxlo-OptionalBox" id="Form-Section-Form7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator59"> + <object class="GtkSeparator" id="separator81"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12615,14 +14025,16 @@ </packing> </child> <child> - <object class="GtkBox" id="Section45"> + <object class="GtkBox" id="GroupB56"> <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="SectionBottom112"> <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> @@ -12668,7 +14080,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom113"> <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> @@ -12725,7 +14137,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> diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui index db6439c915b8..255fc0e4bc25 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui @@ -272,56 +272,76 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-Freeline_Unfilled"> + <object class="GtkMenuItem" id="MenuDraw-BasicShapes.rectangle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Freeline_Unfilled</property> + <property name="action_name">.uno:BasicShapes.rectangle</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-Freeline"> + <object class="GtkMenuItem" id="MenuDraw-BasicShapes.ellipse"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Freeline</property> + <property name="action_name">.uno:BasicShapes.ellipse</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-Bezier_Unfilled"> + <object class="GtkMenuItem" id="MenuDraw-DrawCaption"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Bezier_Unfilled</property> + <property name="action_name">.uno:DrawCaption</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-BezierFill"> + <object class="GtkMenuItem" id="MenuDraw-VerticalCaption"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BezierFill</property> + <property name="action_name">.uno:VerticalCaption</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-Polygon_Unfilled"> + <object class="GtkMenuItem" id="MenuDraw-DrawText"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Polygon_Unfilled</property> + <property name="action_name">.uno:Text</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-Polygon_Diagonal_Unfilled"> + <object class="GtkMenuItem" id="MenuDraw-VerticalText"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Polygon_Diagonal_Unfilled</property> + <property name="action_name">.uno:VerticalText</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-Polygon_Diagonal"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Polygon_Diagonal</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuDraw-separator1"> + <object class="GtkMenuItem" id="MenuDraw-ArrowsToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ArrowsToolbox</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-LineToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineToolbox</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-ConnectorToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ConnectorToolbox</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator2"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -348,10 +368,10 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-StarShapes"> + <object class="GtkMenuItem" id="MenuDraw-FlowChartShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:StarShapes</property> + <property name="action_name">.uno:FlowChartShapes</property> </object> </child> <child> @@ -362,57 +382,57 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-FlowChartShapes"> + <object class="GtkMenuItem" id="MenuDraw-StarShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlowChartShapes</property> + <property name="action_name">.uno:StarShapes</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuDraw-separator2"> + <object class="GtkMenuItem" id="MenuDraw-Objects3DToolbox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:Objects3DToolbox</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-DrawCaption"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DrawCaption</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-InsertGraphic"> + <object class="GtkMenuItem" id="MenuDraw-AddTextBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertGraphic</property> + <property name="action_name">.uno:AddTextBox</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-FontworkGalleryFloater"> + <object class="GtkMenuItem" id="MenuDraw-InsertGraphic"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FontworkGalleryFloater</property> + <property name="action_name">.uno:InsertGraphic</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuDraw-separator3"> + <object class="GtkMenuItem" id="MenuDraw-FontworkGalleryFloater"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkGalleryFloater</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-DrawText"> + <object class="GtkMenuItem" id="MenuDraw-Text_Marquee"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Text</property> + <property name="action_name">.uno:Text_Marquee</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-VerticalText"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:VerticalText</property> </object> </child> <child> @@ -434,82 +454,89 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="SelectObjectD"> + <object class="GtkMenuItem" id="DrawEdit-SelectObject"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SelectObject</property> </object> </child> <child> - <object class="GtkMenuItem" id="ToggleObjectRotateModeD"> + <object class="GtkMenuItem" id="DrawEdit-ToggleObjectBezierMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectRotateMode</property> + <property name="action_name">.uno:ToggleObjectBezierMode</property> </object> </child> <child> - <object class="GtkMenuItem" id="SelectObjectD1"> + <object class="GtkSeparatorMenuItem" id="DrawEdit-Separator1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectBezierMode</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator129"> + <object class="GtkMenuItem" id="DrawEdit-ToggleObjectRotateMode"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:ToggleObjectRotateMode</property> </object> </child> <child> - <object class="GtkMenuItem" id="FlipVerticald"> + <object class="GtkMenuItem" id="DrawEdit-FlipVertical"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FlipVertical</property> </object> </child> <child> - <object class="GtkMenuItem" id="FlipHorizontalD1"> + <object class="GtkMenuItem" id="DrawEdit-FlipHorizontal"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FlipHorizontal</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator120"> + <object class="GtkMenuItem" id="DrawEdit-AdvancedMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AdvancedMode</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="DrawEdit-Separator2"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="TransformDialogD"> + <object class="GtkMenuItem" id="DrawEdit-TransformDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:TransformDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="FormatLineD"> + <object class="GtkMenuItem" id="DrawEdit-FormatLine"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FormatLine</property> </object> </child> <child> - <object class="GtkMenuItem" id="FormatAreaD"> + <object class="GtkMenuItem" id="DrawEdit-FormatArea"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FormatArea</property> </object> </child> <child> - <object class="GtkMenuItem" id="TextAttributesD"> + <object class="GtkMenuItem" id="DrawEdit-TextAttributes"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:TextAttributes</property> </object> </child> <child> - <object class="GtkMenuItem" id="FontWorkD"> + <object class="GtkMenuItem" id="DrawEdit-FontWork"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FontWork</property> @@ -520,6 +547,19 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> + <object class="GtkMenuItem" id="MenuEdit-Repeat"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Repeat</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuEdit-separator1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuEdit-Cut"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -561,6 +601,13 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuEdit-CopyObjects"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CopyObjects</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuEdit-SelectAll"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -601,10 +648,38 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuEdit-SwitchControlDesignMode"> + <object class="GtkMenuItem" id="MenuEdit-EditHyperlink"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:EditHyperlink</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-ModifyField"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ModifyField</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-ManageLinks"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SwitchControlDesignMode</property> + <property name="action_name">.uno:ManageLinks</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-ImageMapDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ImageMapDialog</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-ObjectMenue"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectMenue</property> </object> </child> <child> @@ -614,6 +689,33 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuEdit-ToggleObjectBezierMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ToggleObjectBezierMode</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-GlueEditMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GlueEditMode</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-EditDoc"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:EditDoc</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuEdit-separator6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuEdit-PageSetup"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1970,91 +2072,90 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="SpellDialogD"> + <object class="GtkMenuItem" id="MenuReview-SpellDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SpellDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="SpellOnlineD"> + <object class="GtkMenuItem" id="MenuReview-SpellOnline"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SpellOnline</property> </object> </child> <child> - <object class="GtkMenuItem" id="ThesaurusDialogD"> + <object class="GtkMenuItem" id="MenuReview-ThesaurusDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ThesaurusDialog</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator47"> + <object class="GtkMenuItem" id="MenuReview-MoreDictionaries"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:MoreDictionaries</property> </object> </child> <child> - <object class="GtkMenuItem" id="SetLanguageAllTextMenuD"> + <object class="GtkSeparatorMenuItem" id="MenuReview-separator1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SetLanguageAllTextMenu</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator112"> + <object class="GtkMenuItem" id="MenuReview-SetLanguageAllTextMenu"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:SetLanguageAllTextMenu</property> </object> </child> <child> - <object class="GtkMenuItem" id="HyphenationD"> + <object class="GtkSeparatorMenuItem" id="MenuReview-separator2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Hyphenation</property> </object> </child> <child> - <object class="GtkMenuItem" id="ChineseConversionD"> + <object class="GtkMenuItem" id="MenuReview-ChineseConversion"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ChineseConversion</property> </object> </child> <child> - <object class="GtkMenuItem" id="HangulHanjaConversionD"> + <object class="GtkMenuItem" id="MenuReview-HangulHanjaConversion"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:HangulHanjaConversion</property> </object> </child> <child> - <object class="GtkMenuItem" id="MoreDictionariesD"> + <object class="GtkMenuItem" id="MenuReview-Hyphenation"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:MoreDictionaries</property> + <property name="action_name">.uno:Hyphenation</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator49"> + <object class="GtkSeparatorMenuItem" id="MenuReview-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="InsertAnnotationD"> + <object class="GtkSeparatorMenuItem" id="MenuReview-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertAnnotation</property> </object> </child> <child> - <object class="GtkMenuItem" id="ShowAnnotations"> + <object class="GtkMenuItem" id="MenuReview-RedactDoc"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ShowAnnotations</property> + <property name="action_name">.uno:RedactDoc</property> </object> </child> </object> @@ -2688,6 +2789,40 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuView-GridVisible"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GridVisible</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuView-SnapFrame"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SnapFrame</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuView-SnapPoints"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SnapPoints</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuView-SnapBorder"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SnapBorder</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuView-separator5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuView-OutputQualityColor"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -2702,7 +2837,7 @@ </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuView-separator5"> + <object class="GtkSeparatorMenuItem" id="MenuView-separator6"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -2715,12 +2850,32 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuView-ZoomPageWidth"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ZoomPageWidth</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuView-Zoom100Percent"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Zoom100Percent</property> </object> </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuView-separator7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuView-Zoom"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Zoom</property> + </object> + </child> </object> <object class="GtkGrid" id="NotebookBar"> <property name="visible">True</property> @@ -3335,9 +3490,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-6"/> - </style> </object> <packing> <property name="expand">False</property> @@ -3396,6 +3548,111 @@ <property name="homogeneous">False</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">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box22"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="shapes6"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="toolbar_style">icons</property> + <child> + <object class="GtkToolButton" id="Default-StarShapes1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:StarShapes</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-CalloutShapes1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CalloutShapes</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-FlowChartShapes1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlowChartShapes</property> + </object> + <packing> + <property name="expand">True</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> + </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">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Default-Section-Draw2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section55"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box96"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="shapes1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> <child> <object class="GtkToolButton" id="Default-ConnectorToolbox1"> <property name="visible">True</property> @@ -3432,7 +3689,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="LineA8"> <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> @@ -3461,48 +3718,15 @@ </packing> </child> <child> - <object class="GtkBox" id="box22"> + <object class="GtkBox" id="box97"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="shapes6"> + <object class="sfxlo-NotebookbarToolBox" id="shapes2"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <child> - <object class="GtkToolButton" id="Default-StarShapes1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:StarShapes</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Default-CalloutShapes1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:CalloutShapes</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Default-FlowChartShapes1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FlowChartShapes</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> <object class="GtkToolButton" id="Default-Objects3DToolbox1"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -3538,7 +3762,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="LineB8"> <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> @@ -3580,7 +3804,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -3742,7 +3966,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -3856,7 +4080,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -3981,7 +4205,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child> @@ -4095,7 +4319,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <style> @@ -4116,396 +4340,6 @@ <object class="sfxlo-PriorityMergedHBox" id="TableContainer"> <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="Table-Section-Section"> - <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="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="Section9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom3"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Table-Section-MergeCells"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:MergeCells</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Table-Section-SplitCell"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SplitCell</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Table-Section-TableDialog"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:TableDialog</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Table-Section-OptimizeTable"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:OptimizeTable</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="GtkBox" id="box10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="svtlo-ManagedMenuButton" id="Table-Table:MenuRowsColumns"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|rowscolumnst">_Table</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">False</property> - <property name="relief">none</property> - <property name="use_underline">True</property> - <property name="always_show_image">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">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">0</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Table-Section-FormatLineArea"> - <property name="visible">True</property> - <property name="can_focus">False</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="box39"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <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="Table-BorderDialog"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Line</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">True</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="box40"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkBox" id="box41"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="first21"> - <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="SectionBottom16"> - <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="box42"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom79"> - <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="Table-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">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="GtkBox" id="box92"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="first14"> - <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="Draw-LineEndStyle1"> - <property name="visible">True</property> - <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> - </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="SectionBottom43"> - <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="Draw-FillShadow2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FillShadow</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">3</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="Table-Section-Font"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -4732,14 +4566,11 @@ <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> + <property name="position">0</property> </packing> </child> <child> @@ -4822,10 +4653,74 @@ <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="box25"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom3"> + <object class="svtlo-ManagedMenuButton" id="Table-Paragraph:MenuParagraph"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragrapht">_Paragraph</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-8"/> + </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="Table-Section-Paragraph1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section56"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box42"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom3"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -4887,29 +4782,13 @@ </packing> </child> <child> - <object class="GtkBox" id="box25"> + <object class="GtkBox" id="box92"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Table-Paragraph:MenuParagraph"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragrapht">_Paragraph</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> - <child> <object class="sfxlo-NotebookbarToolBox" id="third2"> <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> @@ -4969,13 +4848,13 @@ </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">2</property> </packing> </child> <child> @@ -4983,6 +4862,129 @@ <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="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="Section9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom3"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Table-Section-MergeCells"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:MergeCells</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-Section-SplitCell"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SplitCell</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-Section-TableDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:TableDialog</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-Section-OptimizeTable"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:OptimizeTable</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="GtkBox" id="box10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Table-Table:MenuRowsColumns"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|rowscolumnst">_Table</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">False</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + <property name="always_show_image">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">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">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-Table1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> <object class="GtkSeparator" id="separator124"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -5009,7 +5011,7 @@ <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="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -5052,6 +5054,101 @@ <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="box57"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop14"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="opacity">0.92156862745098034</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Table-InsertRowsBefore"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertRowsBefore</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-InsertRowsAfter"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertRowsAfter</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-DeleteRows"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DeleteRows</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> + </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-6"/> + </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-Table2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section57"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box98"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkSeparator" id="separator3"> <property name="visible">True</property> @@ -5072,7 +5169,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40"> <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> @@ -5134,21 +5231,37 @@ </packing> </child> <child> - <object class="GtkBox" id="box57"> + <object class="GtkBox" id="box99"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop14"> + <object class="GtkSeparator" id="separator16"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="opacity">0.92156862745098034</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">1</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom33"> + <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="Table-InsertRowsBefore"> + <object class="GtkToolButton" id="Table-EntireRow"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertRowsBefore</property> + <property name="action_name">.uno:EntireRow</property> </object> <packing> <property name="expand">False</property> @@ -5156,10 +5269,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-InsertRowsAfter"> + <object class="GtkToolButton" id="Table-SetMinimalRowHeight"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertRowsAfter</property> + <property name="action_name">.uno:SetMinimalRowHeight</property> </object> <packing> <property name="expand">False</property> @@ -5167,10 +5280,21 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-DeleteRows"> + <object class="GtkToolButton" id="Table-SetOptimalRowHeight"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DeleteRows</property> + <property name="action_name">.uno:SetOptimalRowHeight</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-DistributeRows"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DistributeRows</property> </object> <packing> <property name="expand">False</property> @@ -5181,48 +5305,147 @@ <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> + </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">5</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-FormatLineArea1"> + <property name="visible">True</property> + <property name="can_focus">False</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">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box39"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <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="GtkSeparator" id="separator16"> + <object class="GtkToolButton" id="Table-BorderDialog"> <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:Line</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">1</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="sfxlo-NotebookbarToolBox" id="SectionBottom33"> + <object class="GtkToolButton" id="Table-FormatArea"> <property name="visible">True</property> - <property name="can_focus">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">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">6</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-FormatLineArea2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="box40"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box41"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first14"> + <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="Table-EntireRow"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:EntireRow</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Table-SetMinimalRowHeight"> + <object class="GtkMenuToolButton" id="Object-SetBorderStyle2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SetMinimalRowHeight</property> + <property name="valign">center</property> + <property name="action_name">.uno:SetBorderStyle</property> </object> <packing> <property name="expand">False</property> @@ -5230,32 +5453,69 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-SetOptimalRowHeight"> + <object class="GtkToolButton" id="Object-LineStyle2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SetOptimalRowHeight</property> + <property name="action_name">.uno:LineStyle</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> + </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="SectionBottom16"> + <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-DistributeRows"> + <object class="GtkToolButton" id="Object-FrameLineColor2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DistributeRows</property> + <property name="action_name">.uno:FrameLineColor</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> </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="sfxlo-NotebookbarToolBox" id="SectionBottom43"> + <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> @@ -5269,17 +5529,17 @@ <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-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">7</property> </packing> </child> <child> @@ -5387,34 +5647,21 @@ </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-2"/> </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> - <style> - <class name="context-Table"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="sfxlo-PriorityMergedHBox" id="DrawTextContainer"> - <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="Text-Slide-Section"> + <object class="sfxlo-OptionalBox" id="Table-Section-Insert"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator13"> + <object class="GtkSeparator" id="separator94"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -5429,21 +5676,21 @@ </packing> </child> <child> - <object class="GtkBox" id="Section10"> + <object class="GtkBox" id="Section58"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom1"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom57"> <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="Text-Presentation"> + <object class="GtkToolButton" id="Default-InsertGraphic1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Presentation</property> + <property name="action_name">.uno:InsertGraphic</property> </object> <packing> <property name="expand">False</property> @@ -5451,10 +5698,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Text-PresentationCurrentSlide"> + <object class="GtkToolButton" id="Default-InsertObjectChart1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:PresentationCurrentSlide</property> + <property name="action_name">.uno:InsertObjectChart</property> </object> <packing> <property name="expand">False</property> @@ -5462,7 +5709,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Text-InsertPage"> + <object class="GtkToolButton" id="Default-InsertPage1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertPage</property> @@ -5473,10 +5720,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Text-AssignLayout"> + <object class="GtkToolButton" id="Default-InsertTable1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AssignLayout</property> + <property name="action_name">.uno:InsertTable</property> </object> <packing> <property name="expand">False</property> @@ -5491,19 +5738,18 @@ </packing> </child> <child> - <object class="GtkBox" id="box8"> + <object class="GtkBox" id="box100"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Text-Slide:MenuSlide"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|reviewb">S_lide</property> + <object class="svtlo-ManagedMenuButton" id="Default-Insert:MenuInsert1"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|insertText">_Insert</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="focus_on_click">False</property> <property name="receives_default">False</property> <property name="relief">none</property> <property name="use_underline">True</property> - <property name="always_show_image">True</property> </object> <packing> <property name="expand">False</property> @@ -5525,19 +5771,35 @@ <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">0</property> + <property name="position">9</property> </packing> </child> + <style> + <class name="context-Table"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-PriorityMergedHBox" id="DrawTextContainer"> + <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="Text-Section-FormatLineArea"> + <object class="sfxlo-OptionalBox" id="Text-Slide-Slide"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator31"> + <object class="GtkSeparator" id="separator13"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -5552,192 +5814,58 @@ </packing> </child> <child> - <object class="GtkBox" id="box87"> + <object class="GtkBox" id="Section10"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="third15"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom1"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="toolbar_style">text</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Text-FormatLine"> + <object class="GtkToolButton" id="Text-Presentation"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatLine</property> + <property name="action_name">.uno:Presentation</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="third16"> - <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="Text-FormatArea"> + <object class="GtkToolButton" id="Text-PresentationCurrentSlide"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatArea</property> + <property name="action_name">.uno:PresentationCurrentSlide</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="box88"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkBox" id="box89"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="first12"> - <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="Text-XLineStyle"> - <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">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="SectionBottom17"> - <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="Text-XLineColor"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:XLineColor</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="box90"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom32"> - <property name="width_request">200</property> + <object class="GtkToolButton" id="Text-InsertPage"> <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="Text-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">False</property> - </packing> - </child> + <property name="action_name">.uno:InsertPage</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">False</property> </packing> </child> - </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="GtkBox" id="box91"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="first13"> - <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="Draw-LineEndStyle2"> + <object class="GtkToolButton" id="Text-AssignLayout"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LineEndStyle</property> + <property name="action_name">.uno:AssignLayout</property> </object> <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="expand">False</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -5748,20 +5876,24 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom54"> + <object class="GtkBox" id="box8"> <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> <child> - <object class="GtkToolButton" id="Draw-FillShadow1"> + <object class="svtlo-ManagedMenuButton" id="Text-Slide:MenuSlide"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|reviewb">S_lide</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FillShadow</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">False</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + <property name="always_show_image">True</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">False</property> + <property name="position">0</property> </packing> </child> </object> @@ -5775,17 +5907,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">1</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">1</property> + <property name="position">0</property> </packing> </child> <child> @@ -6015,14 +6147,11 @@ <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">2</property> + <property name="position">1</property> </packing> </child> <child> @@ -6122,6 +6251,83 @@ <property name="homogeneous">False</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">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box20"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Text-Paragraph:MenuParagraph"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragrapht">_Paragraph</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-5"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Text-Section-Paragraph1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section59"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box87"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom5"> + <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="Text-Section-CenterPara"> <property name="visible">True</property> @@ -6170,29 +6376,13 @@ </packing> </child> <child> - <object class="GtkBox" id="box20"> + <object class="GtkBox" id="box88"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Text-Paragraph:MenuParagraph"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragrapht">_Paragraph</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> - <child> <object class="sfxlo-NotebookbarToolBox" id="third5"> <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> @@ -6252,7 +6442,7 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-4"/> </style> </object> <packing> @@ -6262,6 +6452,180 @@ </packing> </child> <child> + <object class="sfxlo-OptionalBox" id="Text-Section-FormatLineArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator31"> + <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="box101"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third15"> + <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-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">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="third17"> + <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-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">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">4</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Text-Section-FormatLineArea1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="box89"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box90"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first12"> + <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="Draw-XLineColor1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:XLineColor</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom127"> + <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="Draw-FillStyle4"> + <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">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">5</property> + </packing> + </child> + <child> <object class="sfxlo-OptionalBox" id="Text-Section-View"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -6383,7 +6747,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">7</property> </packing> </child> <style> @@ -6549,7 +6913,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> @@ -6560,17 +6924,17 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third1"> <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="Draw-FormatLine"> + <object class="GtkToolButton" id="Table-BorderDialog2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatLine</property> + <property name="action_name">.uno:Line</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -6584,17 +6948,17 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third9"> <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="Draw-FormatArea"> + <object class="GtkToolButton" id="Table-FormatArea2"> <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="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -6609,9 +6973,20 @@ <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">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-FormatLineArea1"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkBox" id="box9"> <property name="visible">True</property> @@ -6624,14 +6999,15 @@ <child> <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">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Draw-XLineStyle"> + <object class="GtkMenuToolButton" id="Draw-XLineStyle2"> <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> @@ -6639,28 +7015,49 @@ <property name="homogeneous">False</property> </packing> </child> + <child> + <object class="GtkToolButton" id="Draw-LineWidth2"> + <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">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="first3"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom21"> <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="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-XLineColor"> + <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-XLineColor2"> <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">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -6678,26 +7075,26 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom21"> - <property name="width_request">200</property> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom22"> <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="Draw-FillStyle"> + <object class="GtkToolButton" id="Draw-FillStyle1"> <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">False</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -6709,26 +7106,37 @@ <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="Draw-Section-FormatLineArea2"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkBox" id="box58"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first4"> + <object class="sfxlo-NotebookbarToolBox" id="first3"> <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="Draw-LineEndStyle"> + <object class="GtkToolButton" id="Image-LineEndStyle1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:LineEndStyle</property> </object> <packing> <property name="expand">True</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -6739,20 +7147,20 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom22"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom32"> <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="Draw-FillShadow"> + <object class="GtkToolButton" id="Image-FillShadow1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FillShadow</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -6770,13 +7178,13 @@ </packing> </child> <style> - <class name="priority-9"/> + <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> @@ -6879,10 +7287,74 @@ <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="box32"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align2"> + <object class="svtlo-ManagedMenuButton" id="Draw-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> + </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-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="Draw-Section-Arrange1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section62"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box104"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align2"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -6933,29 +7405,13 @@ </packing> </child> <child> - <object class="GtkBox" id="box32"> + <object class="GtkBox" id="box105"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Draw-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="Align3"> <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> @@ -7015,13 +7471,13 @@ </packing> </child> <style> - <class name="priority-8"/> + <class name="priority-9"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">5</property> </packing> </child> <child> @@ -7177,17 +7633,17 @@ </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">6</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Draw-Section-Draw"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Shape"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -7282,6 +7738,23 @@ <property name="position">0</property> </packing> </child> + <child> + <object class="GtkSeparator" id="separator20"> + <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">1</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -7324,17 +7797,17 @@ </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">7</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Draw-Section-Draw1"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Shape1"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -7347,23 +7820,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator20"> - <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">1</property> - </packing> - </child> - <child> <object class="sfxlo-NotebookbarToolBox" id="shapes3"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -7502,13 +7958,13 @@ </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">8</property> </packing> </child> <child> @@ -7616,13 +8072,13 @@ </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">9</property> </packing> </child> <child> @@ -7692,6 +8148,83 @@ <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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box49"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Draw-3D:Menu3D"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|3Db">3_D</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-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="Draw-Section-3d1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section61"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box91"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom17"> + <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-ExtrusionSurfaceFloater"> <property name="visible">True</property> @@ -7729,29 +8262,13 @@ </packing> </child> <child> - <object class="GtkBox" id="box49"> + <object class="GtkBox" id="box102"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Draw-3D:Menu3D"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|3Db">3_D</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> - <child> <object class="sfxlo-NotebookbarToolBox" id="third4"> <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> @@ -7806,7 +8323,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">11</property> </packing> </child> <child> @@ -7920,7 +8437,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">12</property> </packing> </child> <child> @@ -8034,7 +8551,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">13</property> </packing> </child> <style> @@ -8190,7 +8707,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> @@ -8201,17 +8718,17 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third7"> <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-Section-FormatLine"> + <object class="GtkToolButton" id="Table-BorderDialog3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatLine</property> + <property name="action_name">.uno:Line</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -8225,17 +8742,17 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third8"> <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-Section-FormatArea"> + <object class="GtkToolButton" id="Table-FormatArea3"> <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="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -8250,9 +8767,20 @@ <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">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Imag-Section-FormatLineArea1"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkBox" id="box50"> <property name="visible">True</property> @@ -8263,16 +8791,17 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first41"> + <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="GtkMenuToolButton" id="Image-Section-XLineStyle"> + <object class="GtkMenuToolButton" id="Draw-XLineStyle3"> <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> @@ -8280,28 +8809,49 @@ <property name="homogeneous">False</property> </packing> </child> + <child> + <object class="GtkToolButton" id="Draw-LineWidth3"> + <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">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="first1"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom18"> <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="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-Section-XLineColor"> + <object class="GtkToolButton" id="Draw-LineEndStyle2"> + <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-XLineColor3"> <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">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -8319,26 +8869,26 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom18"> - <property name="width_request">200</property> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom24"> <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="Image-Section-FillStyle"> + <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">True</property> - <property name="homogeneous">False</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -8350,26 +8900,40 @@ <property name="position">2</property> </packing> </child> + <style> + <class name="priority-8"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Imag-Section-FormatLineArea2"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkBox" id="box53"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first5"> + <object class="sfxlo-NotebookbarToolBox" id="first4"> <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-Section-LineEndStyle"> + <object class="GtkToolButton" id="Image-LineEndStyle2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:LineEndStyle</property> </object> <packing> <property name="expand">True</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -8380,20 +8944,20 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom24"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom54"> <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-Section-FillShadow"> + <object class="GtkToolButton" id="Image-FillShadow2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FillShadow</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -8411,13 +8975,13 @@ </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">1</property> + <property name="position">3</property> </packing> </child> <child> @@ -8520,10 +9084,74 @@ <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="sfxlo-NotebookbarToolBox" id="Align5"> + <object class="svtlo-ManagedMenuButton" id="Image-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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-5"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Image-Section-Arrange1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section63"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box106"> + <property name="visible">True</property> + <property name="can_focus">False</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> @@ -8574,29 +9202,13 @@ </packing> </child> <child> - <object class="GtkBox" id="box43"> + <object class="GtkBox" id="box107"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Image-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="Align1"> <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> @@ -8656,13 +9268,13 @@ </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">2</property> + <property name="position">5</property> </packing> </child> <child> @@ -8818,13 +9430,13 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-3"/> </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> @@ -8909,14 +9521,11 @@ <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">4</property> + <property name="position">7</property> </packing> </child> <child> @@ -8993,7 +9602,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">5</property> + <property name="position">8</property> </packing> </child> <child> @@ -9070,7 +9679,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">9</property> </packing> </child> <style> @@ -9205,7 +9814,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> @@ -9224,7 +9833,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> @@ -9235,17 +9844,17 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third10"> <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="OLE-FormatLine"> + <object class="GtkToolButton" id="Table-BorderDialog4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatLine</property> + <property name="action_name">.uno:Line</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -9259,17 +9868,17 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third11"> <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="OLE-FormatArea"> + <object class="GtkToolButton" id="Table-FormatArea4"> <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="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -9284,9 +9893,20 @@ <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">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="OLE-Section-FormatLineArea1"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkBox" id="box37"> <property name="visible">True</property> @@ -9297,16 +9917,17 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first6"> + <object class="sfxlo-NotebookbarToolBox" id="first5"> <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="OLE-XLineStyle"> + <object class="GtkMenuToolButton" id="Draw-XLineStyle4"> <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> @@ -9314,28 +9935,49 @@ <property name="homogeneous">False</property> </packing> </child> + <child> + <object class="GtkToolButton" id="Draw-LineWidth4"> + <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">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="first7"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom26"> <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="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="OLE-XLineColor"> + <object class="GtkToolButton" id="Draw-LineEndStyle3"> + <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-XLineColor4"> <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">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -9353,26 +9995,26 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom26"> - <property name="width_request">200</property> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom27"> <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="OLE-FillStyle"> + <object class="GtkToolButton" id="Draw-FillStyle3"> <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">False</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -9384,26 +10026,37 @@ <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="OLE-Section-FormatLineArea2"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkBox" id="box48"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first8"> + <object class="sfxlo-NotebookbarToolBox" id="first6"> <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="OLE-LineEndStyle"> + <object class="GtkToolButton" id="Image-LineEndStyle3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:LineEndStyle</property> </object> <packing> <property name="expand">True</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -9414,20 +10067,20 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom27"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom58"> <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="OLE-FillShadow"> + <object class="GtkToolButton" id="Image-FillShadow3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FillShadow</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -9445,13 +10098,13 @@ </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">3</property> </packing> </child> <child> @@ -9554,10 +10207,74 @@ <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="box64"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align4"> + <object class="svtlo-ManagedMenuButton" id="OLE-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> + </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">4</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="OLE-Section-Arrange1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section64"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box108"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align4"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -9608,29 +10325,13 @@ </packing> </child> <child> - <object class="GtkBox" id="box64"> + <object class="GtkBox" id="box109"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="OLE-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"> <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> @@ -9696,7 +10397,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">5</property> </packing> </child> <child> @@ -9858,7 +10559,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">6</property> </packing> </child> <style> @@ -9994,11 +10695,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="MediaSection-FormatLineArea"> + <object class="sfxlo-OptionalBox" id="Media-Section-AVMediaToolBox"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -10022,23 +10723,20 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="third12"> - <property name="width_request">800</property> + <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="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-AVMediaToolBox"> - <property name="width_request">800</property> + <object class="GtkToolButton" id="Media-AVMediaToolBox1"> <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">False</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -10049,57 +10747,120 @@ </packing> </child> <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="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">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Media-Section-Arrange"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkSeparator" id="separator77"> + <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="Section35"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> <object class="GtkBox" id="box59"> <property name="visible">True</property> <property name="can_focus">False</property> <child> <object class="sfxlo-NotebookbarToolBox" id="arrange4"> <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-Section-BringToFront"> + <object class="GtkToolButton" id="Draw-BringToFront1"> <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">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Media-Section-Forward"> + <object class="GtkToolButton" id="Media-Forward"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Forward</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="Media-Section-Backward"> + <object class="GtkToolButton" id="Media-Backward"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Backward</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="Media-Section-SendToBack"> + <object class="GtkToolButton" id="Draw-SendToBack1"> <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">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -10110,7 +10871,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator77"> + <object class="GtkSeparator" id="separator80"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10124,43 +10885,108 @@ <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="box55"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align9"> + <object class="svtlo-ManagedMenuButton" id="Media-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> + </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">2</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="baseline_position">bottom</property> + <child> + <object class="GtkBox" id="Section65"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box110"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align9"> + <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="Media-Section-ObjectAlignLeft"> + <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">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Media-Section-AlignCenter"> + <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">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Media-Section-ObjectAlignRight"> + <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">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -10170,65 +10996,63 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator80"> - <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> + </packing> + </child> + <child> + <object class="GtkBox" id="box111"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="sfxlo-NotebookbarToolBox" id="Align10"> <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="Media-Section-AlignUp"> + <object class="GtkToolButton" id="Draw-AlignUp2"> <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">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Media-Section-AlignMiddle"> + <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">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Media-Section-AlignDown"> + <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">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">1</property> </packing> </child> </object> @@ -10252,7 +11076,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <child> @@ -10275,14 +11099,14 @@ </packing> </child> <child> - <object class="GtkBox" id="Section35"> + <object class="GtkBox" id="Section66"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> <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">icons</property> <property name="show_arrow">False</property> <child> @@ -10348,7 +11172,7 @@ </packing> </child> <child> - <object class="GtkBox" id="box55"> + <object class="GtkBox" id="box112"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -10370,7 +11194,7 @@ <child> <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="halign">end</property> <property name="hexpand">True</property> <property name="toolbar_style">icons</property> @@ -10414,7 +11238,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <style> @@ -10579,28 +11403,28 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkBox" id="box78"> + <object class="GtkBox" id="box80"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> <object class="sfxlo-NotebookbarToolBox" id="third13"> <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="Multi-FormatLine"> + <object class="GtkToolButton" id="Table-BorderDialog5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatLine</property> + <property name="action_name">.uno:Line</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -10614,17 +11438,17 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third14"> <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="Multi-FormatArea"> + <object class="GtkToolButton" id="Table-FormatArea5"> <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="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -10639,29 +11463,41 @@ <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">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Multi-Section-FormatLineArea1"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkBox" id="box79"> + <object class="GtkBox" id="box81"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box80"> + <object class="GtkBox" id="box78"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first9"> + <object class="sfxlo-NotebookbarToolBox" id="first7"> <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="Multi-XLineStyle"> + <object class="GtkMenuToolButton" id="Draw-XLineStyle5"> <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> @@ -10669,28 +11505,49 @@ <property name="homogeneous">False</property> </packing> </child> + <child> + <object class="GtkToolButton" id="Draw-LineWidth5"> + <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">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="first10"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom37"> <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="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Multi-XLineColor"> + <object class="GtkToolButton" id="Draw-LineEndStyle5"> + <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-XLineColor5"> <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">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -10708,26 +11565,26 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom37"> - <property name="width_request">200</property> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom39"> <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="Multi-FillStyle"> + <object class="GtkToolButton" id="Draw-FillStyle5"> <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">False</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -10739,26 +11596,37 @@ <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="Multi-Section-FormatLineArea2"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkBox" id="box81"> + <object class="GtkBox" id="box79"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first11"> + <object class="sfxlo-NotebookbarToolBox" id="first8"> <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="Multi-LineEndStyle"> + <object class="GtkToolButton" id="Image-LineEndStyle4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:LineEndStyle</property> </object> <packing> <property name="expand">True</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -10769,20 +11637,20 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom39"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom62"> <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="Multi-FillShadow"> + <object class="GtkToolButton" id="Image-FillShadow4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FillShadow</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -10800,13 +11668,13 @@ </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">1</property> + <property name="position">3</property> </packing> </child> <child> @@ -10909,10 +11777,74 @@ <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="box83"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align7"> + <object class="svtlo-ManagedMenuButton" id="Multi-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> + </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"/> + </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="Multi-Section-Arrange1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section67"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box113"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align7"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -10963,29 +11895,13 @@ </packing> </child> <child> - <object class="GtkBox" id="box83"> + <object class="GtkBox" id="box114"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Multi-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="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> @@ -11051,7 +11967,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> @@ -11213,7 +12129,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> @@ -11327,7 +12243,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <style> @@ -11620,7 +12536,7 @@ </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-7"/> </style> </object> <packing> @@ -11645,7 +12561,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="shapes7"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <child> <object class="GtkToolButton" id="Master-BasicShapes1"> @@ -11680,17 +12596,6 @@ <property name="homogeneous">False</property> </packing> </child> - <child> - <object class="GtkToolButton" id="Master-ConnectorToolbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ConnectorToolbox</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">False</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -11698,45 +12603,6 @@ <property name="position">2</property> </packing> </child> - <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">3</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="LineA9"> - <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="Master-XLineColor1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:XLineColor</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">4</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -11751,7 +12617,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="shapes8"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <child> <object class="GtkToolButton" id="Master-Draw-StarShapes1"> @@ -11786,17 +12652,6 @@ <property name="homogeneous">False</property> </packing> </child> - <child> - <object class="GtkToolButton" id="Master-Draw-Objects3DToolbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Objects3DToolbox</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">False</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -11804,35 +12659,134 @@ <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-6"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Master-Section-Draw2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section68"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box115"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator55"> + <object class="sfxlo-NotebookbarToolBox" id="shapes9"> <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">icons</property> + <child> + <object class="GtkToolButton" id="Master-BasicShapes2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BasicShapes</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Master-SymbolShapes2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SymbolShapes</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Master-ArrowShapes2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ArrowShapes</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">False</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> </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="box116"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB9"> + <object class="sfxlo-NotebookbarToolBox" id="shapes10"> <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="Master-FillColor1"> + <object class="GtkToolButton" id="Master-Draw-StarShapes2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FillColor</property> + <property name="action_name">.uno:StarShapes</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Master-Draw-CalloutShapes2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CalloutShapes</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Master-Draw-FlowChartShapes2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlowChartShapes</property> + </object> + <packing> + <property name="expand">True</property> <property name="homogeneous">False</property> </packing> </child> @@ -11840,7 +12794,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> </object> @@ -11864,15 +12818,15 @@ <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="Master-Section-Snap"> + <object class="sfxlo-OptionalBox" id="Master-Section-Insert"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator83"> + <object class="GtkSeparator" id="separator84"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -11887,43 +12841,21 @@ </packing> </child> <child> - <object class="GtkBox" id="Section37"> + <object class="GtkBox" id="Section38"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB2"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom31"> <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="Master-Snap-GridUse"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:GridUse</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Master-Snap-HelplinesUse"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:HelplinesUse</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Master-Snap-SnapFrame"> + <object class="GtkToolButton" id="Master-Section-InsertGraphic"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SnapFrame</property> + <property name="action_name">.uno:InsertGraphic</property> </object> <packing> <property name="expand">False</property> @@ -11931,10 +12863,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Master-Snap-SnapPoints"> + <object class="GtkToolButton" id="Master-Section-InsertObjectChart"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SnapPoints</property> + <property name="action_name">.uno:InsertObjectChart</property> </object> <packing> <property name="expand">False</property> @@ -11942,10 +12874,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Master-Snap-SnapBorder"> + <object class="GtkToolButton" id="Master-Section-DrawText"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SnapBorder</property> + <property name="action_name">.uno:Text</property> </object> <packing> <property name="expand">False</property> @@ -11960,12 +12892,12 @@ </packing> </child> <child> - <object class="GtkBox" id="box70"> + <object class="GtkBox" id="box71"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Master-Snap:MenuSnap"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|insertText">_Snap</property> + <object class="svtlo-ManagedMenuButton" id="Master-Insert:MenuInsert"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|insertText">_Insert</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="focus_on_click">False</property> @@ -11979,32 +12911,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="LineA2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">end</property> - <property name="hexpand">True</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Master-Snap-CapturePoint"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:CapturePoint</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> @@ -12026,15 +12932,15 @@ <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="Master-Section-Insert"> + <object class="sfxlo-OptionalBox" id="Master-Section-Snap"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator84"> + <object class="GtkSeparator" id="separator83"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12049,21 +12955,21 @@ </packing> </child> <child> - <object class="GtkBox" id="Section38"> + <object class="GtkBox" id="Section37"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom31"> + <object class="sfxlo-NotebookbarToolBox" id="LineB2"> <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="Master-Section-InsertGraphic"> + <object class="GtkToolButton" id="Master-Snap-GridUse"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertGraphic</property> + <property name="action_name">.uno:GridUse</property> </object> <packing> <property name="expand">False</property> @@ -12071,10 +12977,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Master-Section-InsertObjectChart"> + <object class="GtkToolButton" id="Master-Snap-HelplinesUse"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertObjectChart</property> + <property name="action_name">.uno:HelplinesUse</property> </object> <packing> <property name="expand">False</property> @@ -12082,10 +12988,32 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Master-Section-DrawText"> + <object class="GtkToolButton" id="Master-Snap-SnapFrame"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Text</property> + <property name="action_name">.uno:SnapFrame</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Master-Snap-SnapPoints"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SnapPoints</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Master-Snap-SnapBorder"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SnapBorder</property> </object> <packing> <property name="expand">False</property> @@ -12100,12 +13028,12 @@ </packing> </child> <child> - <object class="GtkBox" id="box71"> + <object class="GtkBox" id="box70"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Master-Insert:MenuInsert"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|insertText">_Insert</property> + <object class="svtlo-ManagedMenuButton" id="Master-Snap:MenuSnap"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|insertText">_Snap</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="focus_on_click">False</property> @@ -12119,6 +13047,32 @@ <property name="position">0</property> </packing> </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="LineA2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">end</property> + <property name="hexpand">True</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Master-Snap-CapturePoint"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CapturePoint</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> @@ -12140,7 +13094,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -12265,7 +13219,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child> @@ -12379,7 +13333,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <style> @@ -12512,12 +13466,11 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Property"> + <object class="sfxlo-OptionalBox" id="Form-Section-Form2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator58"> + <object class="GtkSeparator" id="separator27"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12532,14 +13485,16 @@ </packing> </child> <child> - <object class="GtkBox" id="Section45"> + <object class="GtkBox" id="GroupB59"> <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="SectionBottom51"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom114"> <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> @@ -12550,29 +13505,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Form-TabDialog"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:TabDialog</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Form-ControlProperties"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ControlProperties</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -12583,9 +13516,9 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom56"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom115"> <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> @@ -12596,29 +13529,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Form-OpenReadOnly"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:OpenReadOnly</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Form-AutoControlFocus"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AutoControlFocus</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -12635,9 +13546,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-3"/> - </style> </object> <packing> <property name="expand">False</property> @@ -12646,96 +13554,27 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Form1"> + <object class="sfxlo-OptionalBox" id="Form-Section-Form3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> - <child> - <object class="GtkSeparator" id="separator59"> - <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="Section46"> + <object class="GtkBox" id="GroupB49"> <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="SectionBottom110"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom118"> <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="Form-Label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Label</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Form-Edit"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Edit</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Form-CheckBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:CheckBox</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Form-RadioButton"> + <object class="GtkToolButton" id="Form-TabDialog1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:RadioButton</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Form-ListBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ListBox</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Form-ComboBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ComboBox</property> + <property name="action_name">.uno:TabDialog</property> </object> <packing> <property name="expand">False</property> @@ -12750,71 +13589,16 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom111"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom119"> <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="Form-FormattedField"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FormattedField</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Form-DateField"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:DateField</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Form-TimeField"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:TimeField</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Form-NumericField"> + <object class="GtkToolButton" id="Form-OpenReadOnly2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:NumericField</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Form-CurrencyField"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:CurrencyField</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Form-PatternField"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:PatternField</property> + <property name="action_name">.uno:OpenReadOnly</property> </object> <packing> <property name="expand">False</property> @@ -12835,9 +13619,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-2"/> - </style> </object> <packing> <property name="expand">False</property> @@ -12846,12 +13627,11 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Form2"> + <object class="sfxlo-OptionalBox" id="Form-Section-Form4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator62"> + <object class="GtkSeparator" id="separator58"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12866,43 +13646,23 @@ </packing> </child> <child> - <object class="GtkBox" id="Section47"> + <object class="GtkBox" id="GroupB82"> <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="SectionBottom112"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom128"> <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="Form-Pushbutton"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Pushbutton</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Form-Imagebutton"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Imagebutton</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Form-ImageControl"> + <object class="GtkToolButton" id="Form-ControlProperties2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ImageControl</property> + <property name="action_name">.uno:ControlProperties</property> </object> <packing> <property name="expand">False</property> @@ -12917,38 +13677,16 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom113"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom129"> <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="Form-FileControl"> + <object class="GtkToolButton" id="Form-AutoControlFocus2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FileControl</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Form-NavigationBar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:NavigationBar</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Form-Grid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Grid</property> + <property name="action_name">.uno:AutoControlFocus</property> </object> <packing> <property name="expand">False</property> @@ -12970,7 +13708,7 @@ </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-4"/> </style> </object> <packing> @@ -12979,26 +13717,12 @@ <property name="position">3</property> </packing> </child> - <style> - <class name="context-Form"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">9</property> - </packing> - </child> - <child> - <object class="sfxlo-PriorityMergedHBox" id="ReviewContainer"> - <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="Review-Section-Language"> + <object class="sfxlo-OptionalBox" id="Form-Section-Form5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator65"> + <object class="GtkSeparator" id="separator59"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -13013,48 +13737,49 @@ </packing> </child> <child> - <object class="GtkBox" id="Section48"> + <object class="GtkBox" id="GroupB54"> <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="SectionBottom44"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom51"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">end</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Review-SpellDialog"> + <object class="GtkToolButton" id="Tools-Label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SpellDialog</property> + <property name="action_name">.uno:Label</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="Review-ThesaurusDialog"> + <object class="GtkToolButton" id="Tools-Edit1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ThesaurusDialog</property> + <property name="action_name">.uno:Edit</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="Review-SpellOnline"> + <object class="GtkToolButton" id="Tools-CheckBox1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SpellOnline</property> + <property name="action_name">.uno:CheckBox</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -13065,181 +13790,49 @@ </packing> </child> <child> - <object class="svtlo-ManagedMenuButton" id="Review-Language:MenuLanguage"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|LanguageButton">_Language</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">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">0</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Review-Section-Review"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> - <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">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="sfxlo-NotebookbarToolBox" id="SectionBottom47"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom56"> <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="Review-TrackChanges"> + <object class="GtkToolButton" id="Tools-RadioButton2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:TrackChanges</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Review-PreviousTrackedChange"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:PreviousTrackedChange</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Review-NextTrackedChange"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:NextTrackedChange</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Review-AcceptTrackedChange"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AcceptTrackedChange</property> + <property name="action_name">.uno:RadioButton</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="Review-RejectTrackedChange"> + <object class="GtkToolButton" id="Tools-ListBox2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:RejectTrackedChange</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="GtkBox" id="box93"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="svtlo-ManagedMenuButton" id="Review-Review:MenuReview"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|reviewButton">_Review</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="relief">none</property> - <property name="use_underline">True</property> + <property name="action_name">.uno:ListBox</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="ExtTop20"> + <object class="GtkToolButton" id="Tools-ComboBox2"> <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="Review-AcceptTrackedChanges"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AcceptTrackedChanges</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> + <property name="action_name">.uno:ComboBox</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> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> </object> @@ -13250,22 +13843,21 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-3"/> </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="Review-Section-Comments"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator67"> + <object class="GtkSeparator" id="separator55"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -13280,33 +13872,34 @@ </packing> </child> <child> - <object class="GtkBox" id="Section50"> + <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="SectionBottom48"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom63"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">end</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Review-InsertAnnotation"> + <object class="GtkToolButton" id="Tools-NumericField2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertAnnotation</property> + <property name="action_name">.uno:NumericField</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="Review-ReplyComment"> + <object class="GtkToolButton" id="Tools-CurrencyField2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ReplyComment</property> + <property name="action_name">.uno:CurrencyField</property> </object> <packing> <property name="expand">False</property> @@ -13314,10 +13907,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Review-DeleteComment"> + <object class="GtkToolButton" id="Tools-PatternField2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DeleteComment</property> + <property name="action_name">.uno:PatternField</property> </object> <packing> <property name="expand">False</property> @@ -13332,76 +13925,16 @@ </packing> </child> <child> - <object class="svtlo-ManagedMenuButton" id="Review-Comments:MenuComments"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|CommentsButton">_Comments</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">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">3</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Review-Section-Compare"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> - <child> - <object class="GtkSeparator" id="separator81"> - <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="Section51"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom49"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom77"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">end</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Review-ProtectTraceChangeMode"> + <object class="GtkToolButton" id="Tools-FormattedField1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ProtectTraceChangeMode</property> + <property name="action_name">.uno:FormattedField</property> </object> <packing> <property name="expand">False</property> @@ -13409,10 +13942,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Review-CompareDocuments"> + <object class="GtkToolButton" id="Tools-DateField1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CompareDocuments</property> + <property name="action_name">.uno:DateField</property> </object> <packing> <property name="expand">False</property> @@ -13420,10 +13953,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Review-MergeDocuments"> + <object class="GtkToolButton" id="Tools-TimeField1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:MergeDocuments</property> + <property name="action_name">.uno:TimeField</property> </object> <packing> <property name="expand">False</property> @@ -13434,23 +13967,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="svtlo-ManagedMenuButton" id="Review-Compare:MenuCompare"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|CompareButton">Com_pare</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">True</property> <property name="position">1</property> </packing> </child> @@ -13468,16 +13984,15 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Review-Section-View"> + <object class="sfxlo-OptionalBox" id="Form-Section-Form7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator82"> + <object class="GtkSeparator" id="separator62"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -13492,21 +14007,23 @@ </packing> </child> <child> - <object class="GtkBox" id="Section52"> + <object class="GtkBox" id="GroupB56"> <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="SectionBottom53"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom112"> <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="Review-ControlCodes"> + <object class="GtkToolButton" id="Form-Pushbutton"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ControlCodes</property> + <property name="action_name">.uno:Pushbutton</property> </object> <packing> <property name="expand">False</property> @@ -13514,10 +14031,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Review-PrintPreview"> + <object class="GtkToolButton" id="Form-Imagebutton"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:PrintPreview</property> + <property name="action_name">.uno:Imagebutton</property> </object> <packing> <property name="expand">False</property> @@ -13525,11 +14042,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Review-Zoom"> + <object class="GtkToolButton" id="Form-ImageControl"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Zoom</property> - <property name="use_underline">True</property> + <property name="action_name">.uno:ImageControl</property> </object> <packing> <property name="expand">False</property> @@ -13544,15 +14060,44 @@ </packing> </child> <child> - <object class="svtlo-ManagedMenuButton" id="Review-View:MenuView"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ViewButton">_View</property> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom113"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="relief">none</property> - <property name="use_underline">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Form-FileControl"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FileControl</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-NavigationBar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NavigationBar</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Form-Grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Grid</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -13574,22 +14119,19 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <style> - <class name="context-Annotation"/> + <class name="context-Form"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">10</property> + <property name="position">9</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui index 0f00e9fbf31a..244de597fe30 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui @@ -258,151 +258,185 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="LineD"> + <object class="GtkMenuItem" id="MenuDraw-Line"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Line</property> </object> </child> <child> - <object class="GtkMenuItem" id="Freeline_UnfilledD"> + <object class="GtkMenuItem" id="MenuDraw-BasicShapes.rectangle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Freeline_Unfilled</property> + <property name="action_name">.uno:BasicShapes.rectangle</property> </object> </child> <child> - <object class="GtkMenuItem" id="FreelineD"> + <object class="GtkMenuItem" id="MenuDraw-BasicShapes.ellipse"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Freeline</property> + <property name="action_name">.uno:BasicShapes.ellipse</property> </object> </child> <child> - <object class="GtkMenuItem" id="Bezier_UnfilledD"> + <object class="GtkMenuItem" id="MenuDraw-DrawCaption"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Bezier_Unfilled</property> + <property name="action_name">.uno:DrawCaption</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-VerticalCaption"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:VerticalCaption</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-DrawText"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Text</property> </object> </child> <child> - <object class="GtkMenuItem" id="BezierFillD"> + <object class="GtkMenuItem" id="MenuDraw-VerticalText"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BezierFill</property> + <property name="action_name">.uno:VerticalText</property> </object> </child> <child> - <object class="GtkMenuItem" id="Polygon_UnfilledD"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Polygon_Unfilled</property> </object> </child> <child> - <object class="GtkMenuItem" id="Polygon_Diagonal_UnfilledD"> + <object class="GtkMenuItem" id="MenuDraw-ArrowsToolbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Polygon_Diagonal_Unfilled</property> + <property name="action_name">.uno:ArrowsToolbox</property> </object> </child> <child> - <object class="GtkMenuItem" id="Polygon_DiagonalD"> + <object class="GtkMenuItem" id="MenuDraw-LineToolbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Polygon_Diagonal</property> + <property name="action_name">.uno:LineToolbox</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator131"> + <object class="GtkMenuItem" id="MenuDraw-ConnectorToolbox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:ConnectorToolbox</property> </object> </child> <child> - <object class="GtkMenuItem" id="BasicShapesD"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-BasicShapes"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BasicShapes</property> </object> </child> <child> - <object class="GtkMenuItem" id="SymbolShapesD"> + <object class="GtkMenuItem" id="MenuDraw-SymbolShapes"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SymbolShapes</property> </object> </child> <child> - <object class="GtkMenuItem" id="ArrowShapesD"> + <object class="GtkMenuItem" id="MenuDraw-ArrowShapes"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ArrowShapes</property> </object> </child> <child> - <object class="GtkMenuItem" id="StarShapesD"> + <object class="GtkMenuItem" id="MenuDraw-FlowChartShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:StarShapes</property> + <property name="action_name">.uno:FlowChartShapes</property> </object> </child> <child> - <object class="GtkMenuItem" id="CalloutShapesD"> + <object class="GtkMenuItem" id="MenuDraw-CalloutShapes"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:CalloutShapes</property> </object> </child> <child> - <object class="GtkMenuItem" id="FlowChartShapesD"> + <object class="GtkMenuItem" id="MenuDraw-StarShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlowChartShapes</property> + <property name="action_name">.uno:StarShapes</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator134"> + <object class="GtkMenuItem" id="MenuDraw-Objects3DToolbox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:Objects3DToolbox</property> </object> </child> <child> - <object class="GtkMenuItem" id="DrawCaptionD"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DrawCaption</property> </object> </child> <child> - <object class="GtkMenuItem" id="InsertGraphicD2"> + <object class="GtkMenuItem" id="MenuDraw-AddTextBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AddTextBox</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-InsertGraphic"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertGraphic</property> </object> </child> <child> - <object class="GtkMenuItem" id="FontworkGalleryFloaterD1"> + <object class="GtkMenuItem" id="MenuDraw-FontworkGalleryFloater"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FontworkGalleryFloater</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator136"> + <object class="GtkMenuItem" id="MenuDraw-Text_Marquee"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:Text_Marquee</property> </object> </child> <child> - <object class="GtkMenuItem" id="ExtrusionToggleD"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-ExtrusionToggle"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ExtrusionToggle</property> </object> </child> <child> - <object class="GtkMenuItem" id="ToggleObjectBezierModeD"> + <object class="GtkMenuItem" id="MenuDraw-ToggleObjectBezierMode"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ToggleObjectBezierMode</property> @@ -413,82 +447,89 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="SelectObjectD"> + <object class="GtkMenuItem" id="DrawEdit-SelectObject"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SelectObject</property> </object> </child> <child> - <object class="GtkMenuItem" id="ToggleObjectRotateModeD"> + <object class="GtkMenuItem" id="DrawEdit-ToggleObjectBezierMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectRotateMode</property> + <property name="action_name">.uno:ToggleObjectBezierMode</property> </object> </child> <child> - <object class="GtkMenuItem" id="SelectObjectD1"> + <object class="GtkSeparatorMenuItem" id="DrawEdit-Separator1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectBezierMode</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator129"> + <object class="GtkMenuItem" id="DrawEdit-ToggleObjectRotateMode"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:ToggleObjectRotateMode</property> </object> </child> <child> - <object class="GtkMenuItem" id="FlipVerticald"> + <object class="GtkMenuItem" id="DrawEdit-FlipVertical"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FlipVertical</property> </object> </child> <child> - <object class="GtkMenuItem" id="FlipHorizontalD1"> + <object class="GtkMenuItem" id="DrawEdit-FlipHorizontal"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FlipHorizontal</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator120"> + <object class="GtkMenuItem" id="DrawEdit-AdvancedMode"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:AdvancedMode</property> </object> </child> <child> - <object class="GtkMenuItem" id="TransformDialogD"> + <object class="GtkSeparatorMenuItem" id="DrawEdit-Separator2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="DrawEdit-TransformDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:TransformDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="FormatLineD"> + <object class="GtkMenuItem" id="DrawEdit-FormatLine"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FormatLine</property> </object> </child> <child> - <object class="GtkMenuItem" id="FormatAreaD"> + <object class="GtkMenuItem" id="DrawEdit-FormatArea"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FormatArea</property> </object> </child> <child> - <object class="GtkMenuItem" id="TextAttributesD"> + <object class="GtkMenuItem" id="DrawEdit-TextAttributes"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:TextAttributes</property> </object> </child> <child> - <object class="GtkMenuItem" id="FontWorkD"> + <object class="GtkMenuItem" id="DrawEdit-FontWork"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FontWork</property> @@ -499,80 +540,181 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="cutd2"> + <object class="GtkMenuItem" id="MenuEdit-Repeat"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Repeat</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuEdit-separator1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-Cut"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Cut</property> </object> </child> <child> - <object class="GtkMenuItem" id="copyd2"> + <object class="GtkMenuItem" id="MenuEdit-Copy"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Copy</property> </object> </child> <child> - <object class="GtkMenuItem" id="pasted2"> + <object class="GtkMenuItem" id="MenuEdit-Paste"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Paste</property> </object> </child> <child> - <object class="GtkMenuItem" id="pastespeciald2"> + <object class="GtkMenuItem" id="MenuEdit-PasteUnformatted"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PasteUnformatted</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-PasteSpecial"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:PasteSpecial</property> </object> </child> <child> - <object class="GtkMenuItem" id="pasteunformatted2"> + <object class="GtkSeparatorMenuItem" id="MenuEdit-separator2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:PasteUnformatted</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator66"> + <object class="GtkMenuItem" id="MenuEdit-CopyObjects"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:CopyObjects</property> </object> </child> <child> - <object class="GtkMenuItem" id="SelectAlld2"> + <object class="GtkMenuItem" id="MenuEdit-SelectAll"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SelectAll</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator67"> + <object class="GtkSeparatorMenuItem" id="MenuEdit-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="FocusToFindbarD2"> + <object class="GtkMenuItem" id="MenuEdit-FocusToFindbar"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">vnd.sun.star.findbar:FocusToFindbar</property> </object> </child> <child> - <object class="GtkMenuItem" id="SearchDialogD2"> + <object class="GtkMenuItem" id="MenuEdit-SearchDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SearchDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="RestoreEditingView"> + <object class="GtkMenuItem" id="MenuEdit-RestoreEditingView"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:RestoreEditingView</property> </object> </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuEdit-separator4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-EditHyperlink"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:EditHyperlink</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-ModifyField"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ModifyField</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-ManageLinks"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ManageLinks</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-ImageMapDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ImageMapDialog</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-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="MenuEdit-separator5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-ToggleObjectBezierMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ToggleObjectBezierMode</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-GlueEditMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GlueEditMode</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-EditDoc"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:EditDoc</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuEdit-separator6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuEdit-PageSetup"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PageSetup</property> + </object> + </child> </object> <object class="GtkMenu" id="MenuFile"> <property name="visible">True</property> @@ -1828,91 +1970,90 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="SpellDialogD"> + <object class="GtkMenuItem" id="MenuReview-SpellDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SpellDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="SpellOnlineD"> + <object class="GtkMenuItem" id="MenuReview-SpellOnline"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SpellOnline</property> </object> </child> <child> - <object class="GtkMenuItem" id="ThesaurusDialogD"> + <object class="GtkMenuItem" id="MenuReview-ThesaurusDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ThesaurusDialog</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator60"> + <object class="GtkMenuItem" id="MenuReview-MoreDictionaries"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:MoreDictionaries</property> </object> </child> <child> - <object class="GtkMenuItem" id="SetLanguageAllTextMenuD"> + <object class="GtkSeparatorMenuItem" id="MenuReview-separator1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SetLanguageAllTextMenu</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator112"> + <object class="GtkMenuItem" id="MenuReview-SetLanguageAllTextMenu"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:SetLanguageAllTextMenu</property> </object> </child> <child> - <object class="GtkMenuItem" id="HyphenationD"> + <object class="GtkSeparatorMenuItem" id="MenuReview-separator2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Hyphenation</property> </object> </child> <child> - <object class="GtkMenuItem" id="ChineseConversionD"> + <object class="GtkMenuItem" id="MenuReview-ChineseConversion"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ChineseConversion</property> </object> </child> <child> - <object class="GtkMenuItem" id="HangulHanjaConversionD"> + <object class="GtkMenuItem" id="MenuReview-HangulHanjaConversion"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:HangulHanjaConversion</property> </object> </child> <child> - <object class="GtkMenuItem" id="MoreDictionariesD"> + <object class="GtkMenuItem" id="MenuReview-Hyphenation"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:MoreDictionaries</property> + <property name="action_name">.uno:Hyphenation</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator63"> + <object class="GtkSeparatorMenuItem" id="MenuReview-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="InsertAnnotationD"> + <object class="GtkSeparatorMenuItem" id="MenuReview-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertAnnotation</property> </object> </child> <child> - <object class="GtkMenuItem" id="ShowAnnotations"> + <object class="GtkMenuItem" id="MenuReview-RedactDoc"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ShowAnnotations</property> + <property name="action_name">.uno:RedactDoc</property> </object> </child> </object> @@ -2560,194 +2701,208 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="NormalMultiPaneGUID"> + <object class="GtkMenuItem" id="MenuView-NormalMultiPaneGUI"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:NormalMultiPaneGUI</property> </object> </child> <child> - <object class="GtkMenuItem" id="OutlineModeD"> + <object class="GtkMenuItem" id="MenuView-OutlineMode"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:OutlineMode</property> </object> </child> <child> - <object class="GtkMenuItem" id="NotesModeD"> + <object class="GtkMenuItem" id="MenuView-NotesMode"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:NotesMode</property> </object> </child> <child> - <object class="GtkMenuItem" id="DiaModeD"> + <object class="GtkMenuItem" id="MenuView-DiaMode"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:DiaMode</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator17"> + <object class="GtkSeparatorMenuItem" id="MenuView-separator1"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="SlideMasterPageD"> + <object class="GtkMenuItem" id="MenuView-SlideMasterPage"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SlideMasterPage</property> </object> </child> <child> - <object class="GtkMenuItem" id="NotesMasterPageD"> + <object class="GtkMenuItem" id="MenuView-NotesMasterPage"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:NotesMasterPage</property> </object> </child> <child> - <object class="GtkMenuItem" id="HandoutModeD"> + <object class="GtkMenuItem" id="MenuView-HandoutMode"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:HandoutMode</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator41"> + <object class="GtkSeparatorMenuItem" id="MenuView-separator2"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenubarD"> + <object class="GtkMenuItem" id="MenuView-Menubar"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Menubar</property> </object> </child> <child> - <object class="GtkMenuItem" id="Sidebar"> + <object class="GtkMenuItem" id="MenuView-Sidebar"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Sidebar</property> </object> </child> <child> - <object class="GtkMenuItem" id="StatusBarVisible"> + <object class="GtkMenuItem" id="MenuView-StatusBarVisible"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:StatusBarVisible</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator46"> + <object class="GtkSeparatorMenuItem" id="MenuView-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="LeftPaneImpressD"> + <object class="GtkMenuItem" id="MenuView-LeftPaneImpress"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:LeftPaneImpress</property> </object> </child> <child> - <object class="GtkMenuItem" id="ToggleTabBarVisibilityD"> + <object class="GtkMenuItem" id="MenuView-ToggleTabBarVisibility"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ToggleTabBarVisibility</property> </object> </child> <child> - <object class="GtkMenuItem" id="ShowRulerD"> + <object class="GtkMenuItem" id="MenuView-ShowRuler"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ShowRuler</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator53"> + <object class="GtkSeparatorMenuItem" id="MenuView-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="GridUseD1"> + <object class="GtkMenuItem" id="MenuView-GridVisible"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:GridVisible</property> </object> </child> <child> - <object class="GtkMenuItem" id="GridFrontD"> + <object class="GtkMenuItem" id="MenuView-SnapFrame"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:GridUse</property> + <property name="action_name">.uno:SnapFrame</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator70"> + <object class="GtkMenuItem" id="MenuView-SnapPoints"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:SnapPoints</property> </object> </child> <child> - <object class="GtkMenuItem" id="HelplinesVisibleD"> + <object class="GtkMenuItem" id="MenuView-SnapBorder"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:HelplinesVisible</property> + <property name="action_name">.uno:SnapBorder</property> </object> </child> <child> - <object class="GtkMenuItem" id="HelplinesUseD"> + <object class="GtkSeparatorMenuItem" id="MenuView-separator5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:HelplinesUse</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator74"> + <object class="GtkMenuItem" id="MenuView-OutputQualityColor"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:OutputQualityColor</property> </object> </child> <child> - <object class="GtkMenuItem" id="OutputQualityColorD"> + <object class="GtkMenuItem" id="MenuView-OutputQualityGrayscale"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:OutputQualityColor</property> + <property name="action_name">.uno:OutputQualityGrayscale</property> </object> </child> <child> - <object class="GtkMenuItem" id="OutputQualityGrayscaleD"> + <object class="GtkSeparatorMenuItem" id="MenuView-separator6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:OutputQualityGrayscale</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator158"> + <object class="GtkMenuItem" id="MenuView-ZoomPage"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:ZoomPage</property> </object> </child> <child> - <object class="GtkMenuItem" id="ZoomPageD"> + <object class="GtkMenuItem" id="MenuView-ZoomPageWidth"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ZoomPage</property> + <property name="action_name">.uno:ZoomPageWidth</property> </object> </child> <child> - <object class="GtkMenuItem" id="Zoom100PercentD"> + <object class="GtkMenuItem" id="MenuView-Zoom100Percent"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Zoom100Percent</property> </object> </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuView-separator7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuView-Zoom"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Zoom</property> + </object> + </child> </object> <object class="GtkGrid" id="NotebookBar"> <property name="visible">True</property> diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_compact.ui index f7c8fd4697f1..3ad0789f58c4 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui @@ -15969,6 +15969,60 @@ </packing> </child> <child> + <object class="sfxlo-OptionalBox" id="Form-Section-Anchor"> + <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="separator153"> + <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="Anchor6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Object-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-16"/> + </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-Wrap3"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -16041,7 +16095,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> @@ -16103,7 +16157,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -16144,7 +16198,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -16195,7 +16249,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -16245,7 +16299,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child> @@ -16306,7 +16360,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <child> @@ -16370,7 +16424,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">8</property> </packing> </child> <child> @@ -16419,7 +16473,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">9</property> </packing> </child> <child> @@ -16472,7 +16526,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">10</property> </packing> </child> <child> @@ -16509,7 +16563,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">10</property> + <property name="position">11</property> </packing> </child> <child> @@ -16543,13 +16597,13 @@ </packing> </child> <style> - <class name="priority-19"/> + <class name="priority-20"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">11</property> + <property name="position">12</property> </packing> </child> <child> @@ -16583,13 +16637,13 @@ </packing> </child> <style> - <class name="priority-18"/> + <class name="priority-19"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">12</property> + <property name="position">13</property> </packing> </child> <child> @@ -16639,13 +16693,13 @@ </packing> </child> <style> - <class name="priority-17"/> + <class name="priority-18"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">13</property> + <property name="position">14</property> </packing> </child> <child> @@ -16679,13 +16733,13 @@ </packing> </child> <style> - <class name="priority-16"/> + <class name="priority-17"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">14</property> + <property name="position">15</property> </packing> </child> <child> @@ -16762,7 +16816,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">15</property> + <property name="position">16</property> </packing> </child> <child> @@ -16824,7 +16878,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">16</property> + <property name="position">17</property> </packing> </child> <child> @@ -16890,7 +16944,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">17</property> + <property name="position">18</property> </packing> </child> <child> @@ -16967,7 +17021,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">18</property> + <property name="position">19</property> </packing> </child> <child> @@ -17029,7 +17083,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">19</property> + <property name="position">20</property> </packing> </child> <child> @@ -17084,7 +17138,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">20</property> + <property name="position">21</property> </packing> </child> <child> @@ -17150,7 +17204,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">21</property> + <property name="position">22</property> </packing> </child> <child> @@ -17216,7 +17270,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">22</property> + <property name="position">23</property> </packing> </child> </object> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui index c8b137d6aa23..df45ffe7880d 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui @@ -427,6 +427,13 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuDraw-ArrowsToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ArrowsToolbox</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuDraw-LineToolbox"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -434,24 +441,23 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-ArrowsToolbox"> + <object class="GtkMenuItem" id="MenuDraw-ConnectorToolbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ArrowsToolbox</property> + <property name="action_name">.uno:ConnectorToolbox</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-BasicShapes"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BasicShapes</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-ArrowShapes"> + <object class="GtkMenuItem" id="MenuDraw-BasicShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ArrowShapes</property> + <property name="action_name">.uno:BasicShapes</property> </object> </child> <child> @@ -462,10 +468,17 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-StarShapes"> + <object class="GtkMenuItem" id="MenuDraw-ArrowShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:StarShapes</property> + <property name="action_name">.uno:ArrowShapes</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-FlowChartShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlowChartShapes</property> </object> </child> <child> @@ -476,14 +489,14 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-FlowChartShapes"> + <object class="GtkMenuItem" id="MenuDraw-StarShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlowChartShapes</property> + <property name="action_name">.uno:StarShapes</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuDraw-separator2"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -517,12 +530,19 @@ </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuDraw-separator3"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> + <object class="GtkMenuItem" id="MenuDraw-ExtrusionToggle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ExtrusionToggle</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuDraw-ToggleObjectBezierMode"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -3832,7 +3852,7 @@ </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-8"/> </style> </object> <packing> @@ -4163,14 +4183,78 @@ <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="box2"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom35"> + <object class="svtlo-ManagedMenuButton" id="Default-Paragraph:MenuParagraph"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ParagraphButton">_Paragraph</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-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="Default-Section-Paragraph1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section36"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box64"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom56"> + <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="Default-DefaultBullet"> + <object class="GtkMenuToolButton" id="Default-DefaultBullet1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:DefaultBullet</property> @@ -4181,7 +4265,7 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="Default-DefaultNumbering"> + <object class="GtkMenuToolButton" id="Default-DefaultNumbering1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:DefaultNumbering</property> @@ -4206,35 +4290,19 @@ </packing> </child> <child> - <object class="GtkBox" id="box2"> + <object class="GtkBox" id="box66"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Default-Paragraph:MenuParagraph"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ParagraphButton">_Paragraph</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> - <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom8"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom7"> <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="GtkMenuToolButton" id="Default-LineSpacing"> + <object class="GtkMenuToolButton" id="Default-LineSpacing1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:LineSpacing</property> @@ -4245,7 +4313,7 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="Default-BackgroundColor"> + <object class="GtkMenuToolButton" id="Default-BackgroundColor1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BackgroundColor</property> @@ -4283,7 +4351,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -4434,7 +4502,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -4559,7 +4627,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -4673,7 +4741,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child> @@ -4787,7 +4855,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <child> @@ -4893,7 +4961,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">8</property> </packing> </child> <style> @@ -5033,6 +5101,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-7"/> + </style> </object> <packing> <property name="expand">False</property> @@ -5253,9 +5324,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-6"/> - </style> </object> <packing> <property name="expand">False</property> @@ -5467,7 +5535,7 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-6"/> </style> </object> <packing> @@ -5577,14 +5645,80 @@ <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="box38"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom32"> + <object class="svtlo-ManagedMenuButton" id="Table-Table:MenuTable"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|rowscolumnst">_Table</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">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-5"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-Table1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkBox" id="Section37"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box67"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom57"> + <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="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> @@ -5596,7 +5730,7 @@ </packing> </child> <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> @@ -5607,7 +5741,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> @@ -5618,7 +5752,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> @@ -5643,36 +5777,19 @@ </packing> </child> <child> - <object class="GtkBox" id="box38"> + <object class="GtkBox" id="box71"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Table-Table:MenuTable"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|rowscolumnst">_Table</property> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop5"> <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> - <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop14"> - <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="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> @@ -5684,7 +5801,7 @@ </packing> </child> <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> @@ -5695,7 +5812,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> @@ -5706,7 +5823,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> @@ -5744,7 +5861,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -5952,7 +6069,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -6067,7 +6184,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child> @@ -6181,7 +6298,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <style> @@ -6334,8 +6451,6 @@ <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="separator29"> <property name="visible">True</property> @@ -6422,8 +6537,6 @@ <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="box9"> <property name="visible">True</property> @@ -6543,6 +6656,9 @@ <property name="position">2</property> </packing> </child> + <style> + <class name="priority-11"/> + </style> </object> <packing> <property name="expand">False</property> @@ -6651,14 +6767,79 @@ <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="box49"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align2"> + <object class="svtlo-ManagedMenuButton" id="Draw-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> + </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-10"/> + </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-Arrange1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkBox" id="Section51"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box78"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align1"> + <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-ObjectAlignLeft"> + <object class="GtkToolButton" id="Draw-ObjectAlignLeft1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignLeft</property> @@ -6669,7 +6850,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-AlignCenter"> + <object class="GtkToolButton" id="Draw-AlignCenter1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignCenter</property> @@ -6680,7 +6861,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-ObjectAlignRight"> + <object class="GtkToolButton" id="Draw-ObjectAlignRight1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignRight</property> @@ -6705,35 +6886,19 @@ </packing> </child> <child> - <object class="GtkBox" id="box49"> + <object class="GtkBox" id="box79"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Draw-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="Align3"> + <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="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="Draw-AlignUp"> + <object class="GtkToolButton" id="Draw-AlignUp1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignUp</property> @@ -6744,7 +6909,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-AlignMiddle"> + <object class="GtkToolButton" id="Draw-AlignMiddle1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignMiddle</property> @@ -6755,7 +6920,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-AlignDown"> + <object class="GtkToolButton" id="Draw-AlignDown1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignDown</property> @@ -6787,13 +6952,13 @@ </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-9"/> </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> @@ -6921,13 +7086,13 @@ </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-8"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -7021,14 +7186,80 @@ <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="box47"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="shapes1"> + <object class="svtlo-ManagedMenuButton" id="Draw-Draw:MenuDraw"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|draw">_Shape</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">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-7"/> + </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="Draw-Section-Draw1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkBox" id="Section44"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box76"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="shapes3"> + <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-BasicShapes"> + <object class="GtkToolButton" id="Draw-BasicShapes1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BasicShapes</property> @@ -7039,7 +7270,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-SymbolShapes"> + <object class="GtkToolButton" id="Draw-SymbolShapes1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SymbolShapes</property> @@ -7050,7 +7281,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-ArrowShapes"> + <object class="GtkToolButton" id="Draw-ArrowShapes1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ArrowShapes</property> @@ -7075,35 +7306,18 @@ </packing> </child> <child> - <object class="GtkBox" id="box47"> + <object class="GtkBox" id="box77"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Draw-Draw:MenuDraw"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|draw">_Shape</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">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="shapes2"> + <object class="sfxlo-NotebookbarToolBox" id="shapes4"> <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> <child> - <object class="GtkToolButton" id="Draw-StarShapes"> + <object class="GtkToolButton" id="Draw-StarShapes1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:StarShapes</property> @@ -7114,7 +7328,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-CalloutShapes"> + <object class="GtkToolButton" id="Draw-CalloutShapes1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:CalloutShapes</property> @@ -7125,7 +7339,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-FlowChartShapes"> + <object class="GtkToolButton" id="Draw-FlowChartShapes1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FlowChartShapes</property> @@ -7157,13 +7371,13 @@ </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">7</property> </packing> </child> <child> @@ -7271,13 +7485,13 @@ </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">8</property> </packing> </child> <child> @@ -7347,6 +7561,83 @@ <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box60"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Draw-3D:Menu3D"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|3Db">3_D</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-4"/> + </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-3d1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section43"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box74"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom32"> + <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-ExtrusionSurfaceFloater"> <property name="visible">True</property> @@ -7384,35 +7675,19 @@ </packing> </child> <child> - <object class="GtkBox" id="box60"> + <object class="GtkBox" id="box75"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Draw-3D:Menu3D"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|3Db">3_D</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> - <child> - <object class="sfxlo-NotebookbarToolBox" id="third5"> + <object class="sfxlo-NotebookbarToolBox" id="third1"> <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="Draw-ExtrusionDepthFloater"> + <object class="GtkToolButton" id="Draw-ExtrusionDepthFloater1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ExtrusionDepthFloater</property> @@ -7423,7 +7698,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-ExtrusionDirectionFloater"> + <object class="GtkToolButton" id="Draw-ExtrusionDirectionFloater1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ExtrusionDirectionFloater</property> @@ -7461,7 +7736,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">10</property> </packing> </child> <child> @@ -7575,7 +7850,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">11</property> </packing> </child> <child> @@ -7689,7 +7964,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">12</property> </packing> </child> <style> @@ -8032,7 +8307,7 @@ </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-8"/> </style> </object> <packing> @@ -8142,14 +8417,79 @@ <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="box25"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align5"> + <object class="svtlo-ManagedMenuButton" id="Image-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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-7"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Image-Section-Arrange1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkBox" id="Section38"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box72"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align4"> + <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="Image-Section-ObjectAlignLeft"> + <object class="GtkToolButton" id="Image-Section-ObjectAlignLeft1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignLeft</property> @@ -8160,7 +8500,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-Section-AlignCenter"> + <object class="GtkToolButton" id="Image-Section-AlignCenter1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignCenter</property> @@ -8171,7 +8511,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-Section-ObjectAlignRight"> + <object class="GtkToolButton" id="Image-Section-ObjectAlignRight1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignRight</property> @@ -8196,35 +8536,19 @@ </packing> </child> <child> - <object class="GtkBox" id="box25"> + <object class="GtkBox" id="box73"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Image-Arrange:MenuArrange"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ArrangeButton">_Arrange</property> + <object class="sfxlo-NotebookbarToolBox" id="Align6"> <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="Align1"> - <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="Image-Section-AlignUp"> + <object class="GtkToolButton" id="Image-Section-AlignUp1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignUp</property> @@ -8235,7 +8559,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-Section-AlignMiddle"> + <object class="GtkToolButton" id="Image-Section-AlignMiddle1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignMiddle</property> @@ -8246,7 +8570,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-Section-AlignDown"> + <object class="GtkToolButton" id="Image-Section-AlignDown1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignDown</property> @@ -8284,7 +8608,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -8418,7 +8742,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -8512,7 +8836,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child> @@ -8592,7 +8916,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <child> @@ -8672,7 +8996,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">8</property> </packing> </child> <child> @@ -8788,7 +9112,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">9</property> </packing> </child> <style> @@ -9009,9 +9333,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-8"/> - </style> </object> <packing> <property name="expand">False</property> @@ -9942,7 +10263,7 @@ <object class="sfxlo-PriorityMergedHBox" id="MediaContainer"> <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="Media-Section-Graphic"> + <object class="sfxlo-OptionalBox" id="Media-Section-Media"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> @@ -10065,11 +10386,11 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="MediaSection-FormatLineArea"> + <object class="sfxlo-OptionalBox" id="Media-Section-AVMediaToolBox"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator130"> + <object class="GtkSeparator" id="separator45"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10084,27 +10405,24 @@ </packing> </child> <child> - <object class="GtkBox" id="box61"> + <object class="GtkBox" id="box84"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="third12"> - <property name="width_request">1000</property> + <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="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-AVMediaToolBox"> - <property name="width_request">800</property> + <object class="GtkToolButton" id="Media-AVMediaToolBox1"> <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="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -10116,17 +10434,80 @@ </packing> </child> <child> - <object class="GtkBox" id="box63"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom35"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="arrange4"> + <object class="GtkToolButton" id="Media-AVMediaPlayer1"> <property name="visible">True</property> - <property name="can_focus">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">1</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="baseline_position">bottom</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="GtkBox" id="Section52"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box80"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="arrange3"> + <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="Media-BringToFront"> + <object class="GtkToolButton" id="Draw-BringToFront1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BringToFront</property> @@ -10137,7 +10518,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-ObjectForwardOne"> + <object class="GtkToolButton" id="Draw-ObjectForwardOne1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectForwardOne</property> @@ -10148,7 +10529,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-ObjectBackOne"> + <object class="GtkToolButton" id="Draw-ObjectBackOne1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectBackOne</property> @@ -10159,7 +10540,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-SendToBack"> + <object class="GtkToolButton" id="Draw-SendToBack1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SendToBack</property> @@ -10177,7 +10558,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator141"> + <object class="GtkSeparator" id="separator44"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10191,17 +10572,82 @@ <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="box81"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap6"> + <object class="svtlo-ManagedMenuButton" id="Media-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> + </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">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Arrange3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkBox" id="Section53"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box82"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align2"> + <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="Media-WrapOff"> + <object class="GtkToolButton" id="Draw-ObjectAlignLeft2"> <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> @@ -10209,10 +10655,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-WrapOn"> + <object class="GtkToolButton" id="Draw-AlignCenter2"> <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> @@ -10220,10 +10666,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-WrapIdeal"> + <object class="GtkToolButton" id="Draw-ObjectAlignRight2"> <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> @@ -10237,32 +10683,30 @@ <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="box83"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator148"> + <object class="sfxlo-NotebookbarToolBox" id="Align3"> <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> - <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap8"> - <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="halign">end</property> + <property name="hexpand">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-WrapLeft"> + <object class="GtkToolButton" id="Draw-AlignUp2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WrapLeft</property> + <property name="action_name">.uno:AlignUp</property> </object> <packing> <property name="expand">False</property> @@ -10270,10 +10714,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-WrapThrough"> + <object class="GtkToolButton" id="Draw-AlignMiddle2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WrapThrough</property> + <property name="action_name">.uno:AlignMiddle</property> </object> <packing> <property name="expand">False</property> @@ -10281,10 +10725,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-WrapRight"> + <object class="GtkToolButton" id="Draw-AlignDown2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WrapRight</property> + <property name="action_name">.uno:AlignDown</property> </object> <packing> <property name="expand">False</property> @@ -10293,131 +10737,143 @@ </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-2"/> + </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-Wrap1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</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="WrapGroup3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Wrap9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> - <object class="GtkSeparator" id="separator149"> + <object class="GtkToolButton" id="Draw-WrapOff1"> <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="action_name">.uno:WrapOff</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">5</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align9"> + <object class="GtkToolButton" id="Draw-WrapOn1"> <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="Media-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="Media-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="Media-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> + <property name="can_focus">False</property> + <property name="action_name">.uno:WrapOn</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">6</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator146"> + <object class="GtkToolButton" id="Draw-WrapIdeal1"> <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="action_name">.uno:WrapIdeal</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">7</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="Wrap10"> + <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="Align10"> + <object class="GtkToolButton" id="Draw-WrapLeft1"> <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="Media-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="Media-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="Media-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> + <property name="can_focus">False</property> + <property name="action_name">.uno:WrapLeft</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">8</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-WrapThrough1"> + <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-WrapRight1"> + <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> @@ -10441,7 +10897,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">4</property> </packing> </child> <style> @@ -11279,9 +11735,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-4"/> - </style> </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 cc4aa6c191d2..ed968f364d14 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui @@ -427,6 +427,13 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuDraw-ArrowsToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ArrowsToolbox</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuDraw-LineToolbox"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -434,24 +441,23 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-ArrowsToolbox"> + <object class="GtkMenuItem" id="MenuDraw-ConnectorToolbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ArrowsToolbox</property> + <property name="action_name">.uno:ConnectorToolbox</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-BasicShapes"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BasicShapes</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-ArrowShapes"> + <object class="GtkMenuItem" id="MenuDraw-BasicShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ArrowShapes</property> + <property name="action_name">.uno:BasicShapes</property> </object> </child> <child> @@ -462,10 +468,17 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-StarShapes"> + <object class="GtkMenuItem" id="MenuDraw-ArrowShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:StarShapes</property> + <property name="action_name">.uno:ArrowShapes</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-FlowChartShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlowChartShapes</property> </object> </child> <child> @@ -476,14 +489,14 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-FlowChartShapes"> + <object class="GtkMenuItem" id="MenuDraw-StarShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlowChartShapes</property> + <property name="action_name">.uno:StarShapes</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuDraw-separator2"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -517,12 +530,19 @@ </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuDraw-separator3"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> + <object class="GtkMenuItem" id="MenuDraw-ExtrusionToggle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ExtrusionToggle</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuDraw-ToggleObjectBezierMode"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -5189,7 +5209,7 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-6"/> </style> </object> <packing> @@ -5418,7 +5438,7 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-5"/> </style> </object> <packing> @@ -5620,7 +5640,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-4"/> </style> </object> <packing> @@ -5822,7 +5842,7 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-3"/> </style> </object> <packing> @@ -5998,7 +6018,7 @@ </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-2"/> </style> </object> <packing> @@ -9599,10 +9619,10 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="CommonAlignUp"> + <object class="GtkToolButton" id="CommonAlignTop"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CommonAlignUp</property> + <property name="action_name">.uno:CommonAlignTop</property> </object> <packing> <property name="expand">False</property> @@ -9610,10 +9630,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="CommonAlignMiddle"> + <object class="GtkToolButton" id="CommonAlignVerticalCenter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CommonAlignMiddle</property> + <property name="action_name">.uno:CommonAlignVerticalCenter</property> </object> <packing> <property name="expand">False</property> @@ -9621,10 +9641,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="CommonAlignDown"> + <object class="GtkToolButton" id="CommonAlignBottom"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CommonAlignDown</property> + <property name="action_name">.uno:CommonAlignBottom</property> </object> <packing> <property name="expand">False</property> @@ -10447,6 +10467,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-7"/> + </style> </object> <packing> <property name="expand">False</property> @@ -10729,7 +10752,7 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-6"/> </style> </object> <packing> @@ -10851,7 +10874,7 @@ <placeholder/> </child> <style> - <class name="priority-4"/> + <class name="priority-5"/> </style> </object> <packing> @@ -11053,7 +11076,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-4"/> </style> </object> <packing> @@ -11495,9 +11518,6 @@ <property name="position">0</property> </packing> </child> - <style> - <class name="priority-5"/> - </style> </object> <packing> <property name="expand">False</property> @@ -13287,9 +13307,6 @@ <property name="position">0</property> </packing> </child> - <style> - <class name="priority-4"/> - </style> </object> <packing> <property name="expand">False</property> @@ -14733,9 +14750,6 @@ <property name="position">0</property> </packing> </child> - <style> - <class name="priority-6"/> - </style> </object> <packing> <property name="expand">False</property> |