diff options
| author | andreas kainz <kainz.a@gmail.com> | 2019-07-02 14:13:20 +0200 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2019-07-03 11:40:48 +0200 |
| commit | 22d98585cf8f9b2b8fb1ef915978e07422141c2b (patch) | |
| tree | 3148c32f61d4656cd7009d1d9fb85620ac001c03 /sc | |
| parent | 2162acb490c7e5a03ec2c3d4a71e6125f64cba14 (diff) | |
update groupedbar NB layouts for more consistent between different apps
split groups to smaller groups for a better priority- functionality
update Drop-Down GtkMenus and make them consistent
Change-Id: Iece18df3c1ed2e066e6820e67755d52a30d63b27
Reviewed-on: https://gerrit.libreoffice.org/74990
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
(cherry picked from commit 7f8e5077f62aebf758004ac478918f586a8cce15)
Reviewed-on: https://gerrit.libreoffice.org/74997
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui | 2113 | ||||
| -rw-r--r-- | sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui | 270 |
2 files changed, 1746 insertions, 637 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> |