sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 939 -
sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui |11640 ++++++++-------
2 files changed, 7482 insertions(+), 5097 deletions(-)
New commits:
commit f19156fdb5893ae8aeae93d65011d99d8c5e7735
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Sun Jun 30 01:28:02 2019 +0200
Commit: andreas_kainz <kain...@gmail.com>
CommitDate: Mon Jul 1 12:16:58 2019 +0200
NB writer groupedbar review for 6.3
Change-Id: Ic4e582adbacaa73d48e9b8194ab7c99b47fff4b7
Reviewed-on: https://gerrit.libreoffice.org/74923
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kain...@gmail.com>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index 5ccbce93b833..c8b137d6aa23 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -379,72 +379,72 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuDraw-Freeline_Unfilled">
+ <object class="GtkMenuItem" id="MenuDraw-BasicShapes.rectangle">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:Freeline_Unfilled</property>
+ <property name="action_name">.uno:BasicShapes.rectangle</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuDraw-Freeline">
+ <object class="GtkMenuItem" id="MenuDraw-BasicShapes.ellipse">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:Freeline</property>
+ <property name="action_name">.uno:BasicShapes.ellipse</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuDraw-Bezier_Unfilled">
+ <object class="GtkMenuItem" id="MenuDraw-DrawCaption">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:Bezier_Unfilled</property>
+ <property name="action_name">.uno:DrawCaption</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuDraw-BezierFill">
+ <object class="GtkMenuItem" id="MenuDraw-VerticalCaption">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:BezierFill</property>
+ <property name="action_name">.uno:VerticalCaption</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuDraw-Polygon_Unfilled">
+ <object class="GtkMenuItem" id="MenuDraw-DrawText">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:Polygon_Unfilled</property>
+ <property name="action_name">.uno:DrawText</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuDraw-Polygon_Diagonal_Unfilled">
+ <object class="GtkMenuItem" id="MenuDraw-VerticalText">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:Polygon_Diagonal_Unfilled</property>
+ <property name="action_name">.uno:VerticalText</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuDraw-Polygon_Diagonal">
+ <object class="GtkSeparatorMenuItem" id="MenuDraw-separator1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:Polygon_Diagonal</property>
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="MenuDraw-separator1">
+ <object class="GtkMenuItem" id="MenuDraw-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-BasicShapes">
+ <object class="GtkMenuItem" id="MenuDraw-ArrowsToolbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:BasicShapes</property>
+ <property name="action_name">.uno:ArrowsToolbox</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuDraw-SymbolShapes">
+ <object class="GtkMenuItem" id="MenuDraw-BasicShapes">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:SymbolShapes</property>
+ <property name="action_name">.uno:BasicShapes</property>
</object>
</child>
<child>
@@ -455,6 +455,13 @@
</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-StarShapes">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -482,26 +489,6 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuDraw-DrawCaption">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:DrawCaption</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuDraw-VerticalCaption">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:VerticalCaption</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>
@@ -509,20 +496,6 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuDraw-DrawText">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:DrawText</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuDraw-VerticalText">
- <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-InsertGraphic">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -544,7 +517,7 @@
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="MenuDraw-separator4">
+ <object class="GtkSeparatorMenuItem" id="MenuDraw-separator3">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@@ -556,13 +529,6 @@
<property name="action_name">.uno:ToggleObjectBezierMode</property>
</object>
</child>
- <child>
- <object class="GtkMenuItem" id="MenuDraw-ExtrusionToggle">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:ExtrusionToggle</property>
- </object>
- </child>
</object>
<object class="GtkMenu" id="MenuDrawEdit">
<property name="visible">True</property>
@@ -643,13 +609,6 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuDrawEdit-FontWork">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:FontWork</property>
- </object>
- </child>
- <child>
<object class="GtkSeparatorMenuItem" id="MenuDrawEdit-separator3">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -674,6 +633,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>
@@ -743,13 +715,6 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuEdit-ShadowCursor">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:ShadowCursor</property>
- </object>
- </child>
- <child>
<object class="GtkSeparatorMenuItem" id="MenuEdit-separator3">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -783,10 +748,66 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuEdit-SwitchControlDesignMode">
+ <object class="GtkMenuItem" id="MenuEdit-EditHyperlink">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:SwitchControlDesignMode</property>
+ <property name="action_name">.uno:EditHyperlink</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuEdit-EditFootnote">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:EditFootnote</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuEdit-IndexEntryDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:IndexEntryDialog</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuEdit-AuthoritiesEntryDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:AuthoritiesEntryDialog</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuEdit-FieldDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:FieldDialog</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuEdit-LinkDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:LinkDialog</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="GtkMenuItem" id="MenuEdit-ChangeDatabaseField">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ChangeDatabaseField</property>
</object>
</child>
<child>
@@ -796,6 +817,53 @@
</object>
</child>
<child>
+ <object class="GtkMenuItem" id="MenuEdit-ShadowCursor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ShadowCursor</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuEdit-EditDoc">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:EditDoc</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="MenuEdit-separator6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuEdit-InsertPageHeader">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:InsertPageHeader</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuEdit-InsertPageFooter">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:InsertPageFooter</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuEdit-UseHeaderFooterMenu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:UseHeaderFooterMenu</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="MenuEdit-separator7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
<object class="GtkMenuItem" id="MenuEdit-PageDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -987,6 +1055,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
+ <object class="GtkMenuItem" id="MenuDrawEdit-FontWork">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:FontWork</property>
+ </object>
+ </child>
+ <child>
<object class="GtkMenuItem" id="MenuFontwork-FontworkSameLetterHeights">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -998,6 +1073,19 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
+ <object class="GtkMenuItem" id="MenuForm-SwitchControlDesignMode">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:SwitchControlDesignMode</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="MenuForm-separator1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
<object class="GtkMenuItem" id="MenuForm-Label">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1471,16 +1559,16 @@
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="MenuGraphic-separator3">
+ <object class="GtkMenuItem" id="MenuGraphic-InsertCaptionDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="action_name">.uno:InsertCaptionDialog</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuGraphic-InsertCaptionDialog">
+ <object class="GtkSeparatorMenuItem" id="MenuGraphic-separator3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertCaptionDialog</property>
</object>
</child>
<child>
@@ -1942,16 +2030,23 @@
</object>
</child>
<child>
+ <object class="GtkMenuItem" id="MenuOLE-InsertCaptionDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:InsertCaptionDialog</property>
+ </object>
+ </child>
+ <child>
<object class="GtkSeparatorMenuItem" id="MenuOLE-separator1">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuOLE-InsertCaptionDialog">
+ <object class="GtkMenuItem" id="MenuOLE-FrameDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertCaptionDialog</property>
+ <property name="action_name">.uno:FrameDialog</property>
</object>
</child>
</object>
@@ -2175,6 +2270,12 @@
</object>
</child>
<child>
+ <object class="GtkSeparatorMenuItem" id="MenuParagraph-separator10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
<object class="GtkMenuItem" id="MenuParagraph-ParagraphDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -2264,6 +2365,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
+ <object class="GtkMenuItem" id="MenuReference-InsertMultiIndex">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:InsertMultiIndex</property>
+ </object>
+ </child>
+ <child>
<object class="GtkMenuItem" id="MenuReference-InsertIndexesEntry">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -2271,16 +2379,16 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuReference-InsertMultiIndex">
+ <object class="GtkSeparatorMenuItem" id="MenuReference-separator1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertMultiIndex</property>
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="MenuReference-separator1">
+ <object class="GtkMenuItem" id="MenuReference-InsertFootnote">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="action_name">.uno:InsertFootnote</property>
</object>
</child>
<child>
@@ -2304,6 +2412,33 @@
</object>
</child>
<child>
+ <object class="GtkMenuItem" id="MenuReference-InsertReferenceField">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:InsertReferenceField</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuReference-InsertBookmark">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:InsertBookmark</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuReference-InsertCaptionDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:InsertCaptionDialog</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="MenuReference-separator3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
<object class="GtkMenuItem" id="MenuReference-InsertPageNumberField">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -2311,6 +2446,13 @@
</object>
</child>
<child>
+ <object class="GtkMenuItem" id="MenuReference-InsertPageCountField">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:InsertPageCountField</property>
+ </object>
+ </child>
+ <child>
<object class="GtkMenuItem" id="MenuReference-InsertFieldCtrl">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -2318,7 +2460,7 @@
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="MenuReference-separator3">
+ <object class="GtkSeparatorMenuItem" id="MenuReference-separator4">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@@ -2338,16 +2480,23 @@
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="MenuReference-separator4">
+ <object class="GtkMenuItem" id="MenuReference-ViewDataSourceBrowser">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="action_name">.uno:ViewDataSourceBrowser</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuReference-UpdateAll">
+ <object class="GtkSeparatorMenuItem" id="MenuReference-separator5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:UpdateAll</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuReference-Repaginate">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:Repaginate</property>
</object>
</child>
<child>
@@ -2357,6 +2506,41 @@
<property name="action_name">.uno:UpdateFields</property>
</object>
</child>
+ <child>
+ <object class="GtkMenuItem" id="MenuReference-UpdateAllIndexes">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:UpdateAllIndexes</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuReference-UpdateCurIndex">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:UpdateCurIndex</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuReference-UpdateAllLinks">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:UpdateAllLinks</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuReference-UpdateCharts">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:UpdateCharts</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuReference-UpdateAll">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:UpdateAll</property>
+ </object>
+ </child>
</object>
<object class="GtkMenu" id="MenuReview">
<property name="visible">True</property>
@@ -2487,44 +2671,37 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuReview-InsertAnnotation">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:InsertAnnotation</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuReview-ShowAnnotations">
+ <object class="GtkMenuItem" id="MenuReview-ProtectTraceChangeMode">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ShowAnnotations</property>
+ <property name="action_name">.uno:ProtectTraceChangeMode</property>
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="MenuReview-separator5">
+ <object class="GtkMenuItem" id="MenuReview-CompareDocuments">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="action_name">.uno:CompareDocuments</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuReview-ProtectTraceChangeMode">
+ <object class="GtkMenuItem" id="MenuReview-MergeDocuments">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ProtectTraceChangeMode</property>
+ <property name="action_name">.uno:MergeDocuments</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuReview-CompareDocuments">
+ <object class="GtkSeparatorMenuItem" id="MenuReview-separator5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:CompareDocuments</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuReview-MergeDocuments">
+ <object class="GtkMenuItem" id="MenuReview-RedactDoc">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:MergeDocuments</property>
+ <property name="action_name">.uno:RedactDoc</property>
</object>
</child>
</object>
@@ -2718,6 +2895,20 @@
</object>
</child>
<child>
+ <object class="GtkMenuItem" id="MenuStyles-QuoteParaStyle">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:QuoteParaStyle</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuStyles-PreformattedParaStyle">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:PreformattedParaStyle</property>
+ </object>
+ </child>
+ <child>
<object class="GtkSeparatorMenuItem" id="MenuStyles-separator2">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -2858,37 +3049,37 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkMenuItem" id="MenuTable-SplitTable">
+ <object class="GtkMenuItem" id="MenuTable-AutoFormat">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:SplitTable</property>
+ <property name="action_name">.uno:AutoFormat</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTable-SplitCell">
+ <object class="GtkSeparatorMenuItem" id="MenuTable-separator1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:SplitCell</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTable-MergeCells">
+ <object class="GtkMenuItem" id="MenuTable-SplitTable">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:MergeCells</property>
+ <property name="action_name">.uno:SplitTable</property>
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="MenuTable-separator1">
+ <object class="GtkMenuItem" id="MenuTable-SplitCell">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="action_name">.uno:SplitCell</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTable-AutoFormat">
+ <object class="GtkMenuItem" id="MenuTable-MergeCells">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:AutoFormat</property>
+ <property name="action_name">.uno:MergeCells</property>
</object>
</child>
<child>
@@ -2946,16 +3137,16 @@
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="MenuTable-separator4">
+ <object class="GtkMenuItem" id="MenuTable-InsertCaptionDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="action_name">.uno:InsertCaptionDialog</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTable-InsertCaptionDialog">
+ <object class="GtkSeparatorMenuItem" id="MenuTable-separator4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertCaptionDialog</property>
</object>
</child>
<child>
@@ -2966,140 +3157,110 @@
</object>
</child>
</object>
- <object class="GtkMenu" id="MenuTools">
+ <object class="GtkMenu" id="MenuView">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkMenuItem" id="MenuTools-MacroRecorder">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:MacroRecorder</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuTools-RunMacro">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:RunMacro</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuTools-BasicIDEAppear">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:BasicIDEAppear</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuTools-MacroOrganizer">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:MacroOrganizer?TabId:short=1</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuTools-ScriptOrganizer">
+ <object class="GtkMenuItem" id="MenuView-PrintLayout">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ScriptOrganizer</property>
+ <property name="action_name">.uno:PrintLayout</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-MacroSignature">
+ <object class="GtkMenuItem" id="MenuView-BrowseView">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:MacroSignature</property>
+ <property name="action_name">.uno:BrowseView</property>
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="MenuTools-separator1">
+ <object class="GtkSeparatorMenuItem" id="MenuView-separator1">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-MailMergeWizard">
+ <object class="GtkMenuItem" id="MenuView-Menubar">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:MailMergeWizard</property>
+ <property name="action_name">.uno:Menubar</property>
+ <property name="label" translatable="yes"
context="notebookbar_groupedbar_compact|MenubarView">Menubar</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-InsertEnvelope">
+ <object class="GtkMenuItem" id="MenuView-Sidebar">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertEnvelope</property>
+ <property name="action_name">.uno:Sidebar</property>
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="MenuTools-separator2">
+ <object class="GtkMenuItem" id="MenuView-StatusBarVisible">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="action_name">.uno:StatusBarVisible</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-AddressBookSource">
+ <object class="GtkSeparatorMenuItem" id="MenuView-separator2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:AddressBookSource</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-BibliographyComponent">
+ <object class="GtkMenuItem" id="MenuView-Ruler">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:BibliographyComponent</property>
+ <property name="action_name">.uno:Ruler</property>
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="MenuTools-separator3">
+ <object class="GtkMenuItem" id="MenuView-GridVisible">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="action_name">.uno:GridVisible</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-ChangeDatabaseField">
+ <object class="GtkMenuItem" id="MenuView-GridUse">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ChangeDatabaseField</property>
+ <property name="action_name">.uno:GridUse</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-ViewDataSourceBrowser">
+ <object class="GtkSeparatorMenuItem" id="MenuView-separator3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ViewDataSourceBrowser</property>
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="MenuTools-separator4">
+ <object class="GtkMenuItem" id="MenuView-ControlCodes">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="action_name">.uno:ControlCodes</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-OpenXMLFilterSettings">
+ <object class="GtkMenuItem" id="MenuView-ViewBounds">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:OpenXMLFilterSettings</property>
+ <property name="action_name">.uno:ViewBounds</property>
</object>
</child>
- </object>
- <object class="GtkMenu" id="MenuView">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
- <object class="GtkMenuItem" id="MenuView-PrintLayout">
+ <object class="GtkMenuItem" id="MenuView-TableBoundaries">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:PrintLayout</property>
+ <property name="action_name">.uno:TableBoundaries</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuView-BrowseView">
+ <object class="GtkMenuItem" id="MenuView-ShowGraphics">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:BrowseView</property>
+ <property name="action_name">.uno:ShowGraphics</property>
</object>
</child>
<child>
@@ -3110,125 +3271,76 @@
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="MenuView-separator1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuView-Menubar">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Menubar</property>
- <property name="label" translatable="yes"
context="notebookbar_groupedbar_compact|MenubarView">Menubar</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuView-Sidebar">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Sidebar</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuView-StatusBarVisible">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:StatusBarVisible</property>
- </object>
- </child>
- <child>
- <object class="GtkSeparatorMenuItem" id="MenuView-separator2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuView-Ruler">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Ruler</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuView-GridVisible">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:GridVisible</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuView-GridUse">
+ <object class="GtkSeparatorMenuItem" id="MenuView-separator4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:GridUse</property>
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="MenuView-separator3">
+ <object class="GtkMenuItem" id="MenuView-ViewTrackChanges">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="action_name">.uno:ViewTrackChanges</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuView-ViewBounds">
+ <object class="GtkMenuItem" id="MenuView-ShowAnnotations">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ViewBounds</property>
+ <property name="action_name">.uno:ShowAnnotations</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuView-TableBoundaries">
+ <object class="GtkSeparatorMenuItem" id="MenuView-separator5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:TableBoundaries</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuView-ShowGraphics">
+ <object class="GtkMenuItem" id="MenuView-Marks">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ShowGraphics</property>
+ <property name="action_name">.uno:Marks</property>
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="MenuView-separator4">
+ <object class="GtkMenuItem" id="MenuView-Fieldnames">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="action_name">.uno:Fieldnames</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuView-Marks">
+ <object class="GtkSeparatorMenuItem" id="MenuView-separator6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:Marks</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuView-Fieldnames">
+ <object class="GtkMenuItem" id="MenuView-ZoomPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:Fieldnames</property>
+ <property name="action_name">.uno:ZoomPage</property>
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="MenuView-separator5">
+ <object class="GtkMenuItem" id="MenuView-ZoomPageWidth">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="action_name">.uno:ZoomPageWidth</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuView-ZoomPage">
+ <object class="GtkMenuItem" id="MenuView-Zoom100Percent">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ZoomPage</property>
+ <property name="action_name">.uno:Zoom100Percent</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuView-ZoomPageWidth">
+ <object class="GtkSeparatorMenuItem" id="MenuView-separator7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ZoomPageWidth</property>
</object>
</child>
<child>
@@ -3719,6 +3831,9 @@
<property name="position">1</property>
</packing>
</child>
+ <style>
+ <class name="priority-7"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
@@ -3940,9 +4055,6 @@
<property name="position">1</property>
</packing>
</child>
- <style>
- <class name="priority-7"/>
- </style>
</object>
<packing>
<property name="expand">False</property>
@@ -5333,17 +5445,6 @@
<property
name="homogeneous">True</property>
</packing>
</child>
- <child>
- <object class="GtkMenuToolButton"
id="Default-BackgroundColor1">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="action_name">.uno:BackgroundColor</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -6230,9 +6331,11 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox"
id="Draw-Section-FormatLineArea">
+ <object class="sfxlo-OptionalBox"
id="Draw-Section-FormatLineArea2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<child>
<object class="GtkSeparator" id="separator29">
<property name="visible">True</property>
@@ -6245,7 +6348,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>
@@ -6254,20 +6357,20 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="third1">
+ <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="Draw-FormatLine">
+ <object class="GtkToolButton"
id="Draw-FormatLine1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:FormatLine</property>
</object>
<packing>
- <property name="expand">True</property>
- <property
name="homogeneous">True</property>
+ <property name="expand">False</property>
+ <property
name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -6278,20 +6381,20 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="third9">
+ <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="Draw-FormatArea">
+ <object class="GtkToolButton"
id="Draw-FormatArea1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:FormatArea</property>
</object>
<packing>
- <property name="expand">True</property>
- <property
name="homogeneous">True</property>
+ <property name="expand">False</property>
+ <property
name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -6305,9 +6408,22 @@
<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-FormatLineArea3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<child>
<object class="GtkBox" id="box9">
<property name="visible">True</property>
@@ -6318,13 +6434,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="first2">
+ <object class="sfxlo-NotebookbarToolBox"
id="first16">
<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-XLineStyle1">
<property
name="width_request">100</property>
<property
name="visible">True</property>
<property
name="can_focus">False</property>
@@ -6336,20 +6452,41 @@
<property
name="homogeneous">False</property>
</packing>
</child>
+ <child>
+ <object class="GtkToolButton"
id="Draw-LineWidth">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:LineWidth</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">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-LineEndStyle1">
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:LineEndStyle</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkToolButton"
id="Draw-XLineColor">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
@@ -6375,26 +6512,26 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom12">
- <property name="width_request">200</property>
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom45">
<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-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="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>
@@ -6406,14 +6543,11 @@
<property name="position">2</property>
</packing>
</child>
- <style>
- <class name="priority-8"/>
- </style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -6659,7 +6793,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>
@@ -6793,7 +6927,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>
@@ -7029,7 +7163,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>
@@ -7143,7 +7277,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>
@@ -7327,7 +7461,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>
@@ -7441,7 +7575,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>
@@ -7555,7 +7689,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">8</property>
+ <property name="position">9</property>
</packing>
</child>
<style>
@@ -11601,10 +11735,9 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox"
id="Form-Section-Property">
+ <object class="sfxlo-OptionalBox"
id="Form-Section-Form2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="baseline_position">bottom</property>
<child>
<object class="GtkSeparator" id="separator12">
<property name="visible">True</property>
@@ -11621,14 +11754,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>
@@ -11639,7 +11774,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property
name="homogeneous">False</property>
+ <property
name="homogeneous">True</property>
</packing>
</child>
</object>
@@ -11650,9 +11785,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>
@@ -11663,7 +11798,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property
name="homogeneous">False</property>
+ <property
name="homogeneous">True</property>
</packing>
</child>
</object>
@@ -11680,9 +11815,6 @@
<property name="position">1</property>
</packing>
</child>
- <style>
- <class name="priority-5"/>
- </style>
</object>
<packing>
<property name="expand">False</property>
@@ -11691,30 +11823,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="Section43">
+ <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="SectionBottom53">
+ <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>
@@ -11725,20 +11858,20 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom54">
+ <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-OpenReadOnly1">
<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>
@@ -11755,9 +11888,6 @@
<property name="position">1</property>
</packing>
</child>
- <style>
- <class name="priority-4"/>
- </style>
</object>
<packing>
<property name="expand">False</property>
@@ -11766,30 +11896,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="Section44">
+ <object class="GtkSeparator" id="separator35">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="GroupB82">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom57">
+ <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>
@@ -11800,20 +11946,20 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom58">
+ <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>
@@ -11831,7 +11977,7 @@
</packing>
</child>
<style>
- <class name="priority-3"/>
+ <class name="priority-4"/>
</style>
</object>
<packing>
@@ -11841,10 +11987,9 @@
</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">
<property name="visible">True</property>
@@ -11861,18 +12006,20 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="Section37">
+ <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>
@@ -11883,7 +12030,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>
@@ -11894,7 +12041,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>
@@ -11904,8 +12051,21 @@
<property
name="homogeneous">True</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom53">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Form-RadioButton">
+ <object class="GtkToolButton"
id="Tools-RadioButton2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:RadioButton</property>
@@ -11916,7 +12076,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>
@@ -11927,7 +12087,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>
@@ -11941,20 +12101,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="separator40">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="GroupB96">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom111">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom54">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="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>
@@ -11962,10 +12165,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>
@@ -11973,21 +12176,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>
@@ -11995,10 +12211,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>
@@ -12006,10 +12222,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>
@@ -12037,16 +12253,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="separator32">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -12061,14 +12276,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>
@@ -12114,7 +12331,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>
@@ -12171,7 +12388,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/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
index e63c383ba0db..cc4aa6c191d2 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
@@ -379,72 +379,72 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuDraw-Freeline_Unfilled">
+ <object class="GtkMenuItem" id="MenuDraw-BasicShapes.rectangle">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:Freeline_Unfilled</property>
+ <property name="action_name">.uno:BasicShapes.rectangle</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuDraw-Freeline">
+ <object class="GtkMenuItem" id="MenuDraw-BasicShapes.ellipse">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:Freeline</property>
+ <property name="action_name">.uno:BasicShapes.ellipse</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuDraw-Bezier_Unfilled">
+ <object class="GtkMenuItem" id="MenuDraw-DrawCaption">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:Bezier_Unfilled</property>
+ <property name="action_name">.uno:DrawCaption</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuDraw-BezierFill">
+ <object class="GtkMenuItem" id="MenuDraw-VerticalCaption">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:BezierFill</property>
+ <property name="action_name">.uno:VerticalCaption</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuDraw-Polygon_Unfilled">
+ <object class="GtkMenuItem" id="MenuDraw-DrawText">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:Polygon_Unfilled</property>
+ <property name="action_name">.uno:DrawText</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuDraw-Polygon_Diagonal_Unfilled">
+ <object class="GtkMenuItem" id="MenuDraw-VerticalText">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:Polygon_Diagonal_Unfilled</property>
+ <property name="action_name">.uno:VerticalText</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuDraw-Polygon_Diagonal">
+ <object class="GtkSeparatorMenuItem" id="MenuDraw-separator1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:Polygon_Diagonal</property>
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="MenuDraw-separator1">
+ <object class="GtkMenuItem" id="MenuDraw-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-BasicShapes">
+ <object class="GtkMenuItem" id="MenuDraw-ArrowsToolbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:BasicShapes</property>
+ <property name="action_name">.uno:ArrowsToolbox</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuDraw-SymbolShapes">
+ <object class="GtkMenuItem" id="MenuDraw-BasicShapes">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:SymbolShapes</property>
+ <property name="action_name">.uno:BasicShapes</property>
</object>
</child>
<child>
@@ -455,6 +455,13 @@
</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-StarShapes">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -482,26 +489,6 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuDraw-DrawCaption">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:DrawCaption</property>
- </object>
- </child>
- <child>
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
