[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sc/uiconfig sd/uiconfig sw/uiconfig
andreas kainz (via logerrit)
logerrit at kemper.freedesktop.org
Wed Jul 3 09:41:38 UTC 2019
sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui | 2203 ++++--
sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui | 270
sd/uiconfig/sdraw/ui/notebookbar.ui | 236
sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui | 4386 ++++++++----
sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui | 4972 +++++++-------
sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui | 375 -
sw/uiconfig/swriter/ui/notebookbar_compact.ui | 106
sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 1213 ++-
sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 84
9 files changed, 8792 insertions(+), 5053 deletions(-)
New commits:
commit 22d98585cf8f9b2b8fb1ef915978e07422141c2b
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Tue Jul 2 14:13:20 2019 +0200
Commit: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Wed Jul 3 11:40:48 2019 +0200
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 at gmail.com>
(cherry picked from commit 7f8e5077f62aebf758004ac478918f586a8cce15)
Reviewed-on: https://gerrit.libreoffice.org/74997
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
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: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>
@@ -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:ImageMapDialog</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuEdit-ObjectMenue">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:SwitchControlDesignMode</property>
+ <property name="action_name">.uno:ObjectMenue</property>
</object>
</child>
<child>
@@ -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="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">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>
+ <object class="sfxlo-NotebookbarToolBox" id="ExtBottom8">
<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,52 +6312,6 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="Align2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="Draw-ObjectAlignLeft">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:ObjectAlignLeft</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="Draw-AlignCenter">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:AlignCenter</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="Draw-ObjectAlignRight">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:ObjectAlignRight</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -6100,14 +6339,108 @@
<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>
- <property name="halign">end</property>
- <property name="hexpand">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
+ </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>
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="Draw-ObjectAlignLeft">
+ <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>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Draw-AlignCenter">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:AlignCenter</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Draw-ObjectAlignRight">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ObjectAlignRight</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box76">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="Align3">
+ <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="Draw-AlignUp">
<property name="visible">True</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>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list