officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu | 4
sc/uiconfig/scalc/ui/notebookbar.ui | 63
sc/uiconfig/scalc/ui/notebookbar_compact.ui | 4871
++++++++--
sd/uiconfig/sdraw/ui/notebookbar_compact.ui | 168
sw/uiconfig/swriter/ui/notebookbar_compact.ui | 1017 +-
5 files changed, 4652 insertions(+), 1471 deletions(-)
New commits:
commit 9a00f42f704dbda4a18c6055d760638202dbbfa1
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Fri Jun 7 15:32:25 2019 +0200
Commit: andreas_kainz <kain...@gmail.com>
CommitDate: Sat Jun 8 17:13:44 2019 +0200
notebookbar_compact update
Change-Id: I256c2ec3934d728b5b68fbca8b7ba99a50a840ff
Reviewed-on: https://gerrit.libreoffice.org/73661
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kain...@gmail.com>
(cherry picked from commit 42223dc7577e18f085592ae2cc06fa4bf3362631)
Reviewed-on: https://gerrit.libreoffice.org/73678
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu
index 998f0f46935b..28b38336294c 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu
@@ -369,7 +369,7 @@
<value>false</value>
</prop>
<prop oor:name="MenuPosition">
- <value>4</value>
+ <value>3</value>
</prop>
<prop oor:name="CommandArg">
<value>notebookbar.ui</value>
@@ -397,7 +397,7 @@
<value>false</value>
</prop>
<prop oor:name="MenuPosition">
- <value>3</value>
+ <value>4</value>
</prop>
<prop oor:name="CommandArg">
<value>notebookbar_compact.ui</value>
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui
b/sc/uiconfig/scalc/ui/notebookbar.ui
index 90369c808224..42032e62c55d 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -1486,135 +1486,142 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkMenuItem" id="MenuReview-SpellDialog">
+ <object class="GtkMenuItem" id="SpellDialogD">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:SpellDialog</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuReview-SpellOnline">
+ <object class="GtkMenuItem" id="SpellOnlineD">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:SpellOnline</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuReview-ThesaurusDialog">
+ <object class="GtkMenuItem" id="ThesaurusDialogD">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:ThesaurusDialog</property>
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="MenuReview-separator1">
+ <object class="GtkSeparatorMenuItem" id="separator23">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuReview-SetLanguageAllTextMenu">
+ <object class="GtkMenuItem" id="SetLanguageAllTextMenuD">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:SetLanguageAllTextMenu</property>
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="MenuReview-separator2">
+ <object class="GtkSeparatorMenuItem" id="separator90">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuReview-Hyphenate">
+ <object class="GtkMenuItem" id="HyphenateD">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:Hyphenate</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuReview-ChineseConversion">
+ <object class="GtkMenuItem" id="ChineseConversionD">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:ChineseConversion</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuReview-HangulHanjaConversion">
+ <object class="GtkMenuItem" id="HangulHanjaConversionD">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:HangulHanjaConversion</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuReview-MoreDictionaries">
+ <object class="GtkMenuItem" id="MoreDictionariesD">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:MoreDictionaries</property>
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="MenuReview-separator3">
+ <object class="GtkSeparatorMenuItem" id="separator73">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuReview-TraceChangeMode">
+ <object class="GtkMenuItem" id="TraceChangeModeD">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:TraceChangeMode</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuReview-AcceptChanges">
+ <object class="GtkMenuItem" id="AcceptChangesD">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:AcceptChanges</property>
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="MenuReview-separator4">
+ <object class="GtkSeparatorMenuItem" id="separator79">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuReview-InsertAnnotation">
+ <object class="GtkMenuItem" id="InsertAnnotationD">
<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-ShowAllNotes">
+ <object class="GtkMenuItem" id="ShowAllNotesD">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:ShowAllNotes</property>
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="MenuReview-separator5">
+ <object class="GtkMenuItem" id="HideAllNotesD">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="action_name">.uno:HideAllNotes</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuReview-Protect">
+ <object class="GtkSeparatorMenuItem" id="separator80">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="ProtectD">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:Protect</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuReview-CompareDocuments">
+ <object class="GtkMenuItem" id="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-MergeDocuments">
+ <object class="GtkMenuItem" id="MergeDocumentsD">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:MergeDocuments</property>
@@ -4159,10 +4166,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="Home-InsertRowsAfter">
+ <object class="GtkToolButton"
id="Home-DeleteRows">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertRowsAfter</property>
+ <property
name="action_name">.uno:DeleteRows</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4170,10 +4177,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="Home-DeleteRows">
+ <object class="GtkMenuToolButton"
id="Home-RowOperations">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:DeleteRows</property>
+ <property
name="action_name">.uno:RowOperations</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4205,10 +4212,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="Home-InsertColumnsAfter">
+ <object class="GtkToolButton"
id="Home-DeleteColumns">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertColumnsAfter</property>
+ <property
name="action_name">.uno:DeleteColumns</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4216,10 +4223,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="Home-DeleteColumns">
+ <object class="GtkMenuToolButton"
id="Home-ColumnOperations">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:DeleteColumns</property>
+ <property
name="action_name">.uno:ColumnOperations</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui
b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
index 09e39b768131..9c307b5df5eb 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
@@ -659,6 +659,166 @@
</object>
</child>
</object>
+ <object class="GtkMenu" id="MenuForm">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="MenuForm-Label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:Label</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuForm-Edit">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:Edit</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuForm-CheckBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:CheckBox</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuForm-RadioButton">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:RadioButton</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuForm-ListBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ListBox</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuForm-ComboBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ComboBox</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="MenuForm-separator2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuForm-Pushbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:Pushbutton</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuForm-Imagebutton">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:Imagebutton</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="MenuForm-separator3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuForm-FormattedField">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:FormattedField</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="MenuForm-separator4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuForm-DateField">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:DateField</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuForm-TimeField">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:TimeField</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuForm-NumericField">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:NumericField</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuForm-CurrencyField">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:CurrencyField</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuForm-PatternField">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:PatternField</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="MenuForm-separator5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuForm-ImageControl">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ImageControl</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuForm-FileControl">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:FileControl</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="MenuForm-separator7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuForm-Grid">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:Grid</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuForm-NavigationBar">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:NavigationBar</property>
+ </object>
+ </child>
+ </object>
<object class="GtkMenu" id="MenuGraphic">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1211,6 +1371,71 @@
</object>
</child>
</object>
+ <object class="GtkMenu" id="MenuMedia">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="MenuMedia-AVMediaPlayer">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:AVMediaPlayer</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="MenuMedia-separator1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuMedia-RenameObject">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:RenameObject</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuMedia-ObjectTitleDescription">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ObjectTitleDescription</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="MenuMedia-separator2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuMedia-EditShapeHyperlink">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:EditShapeHyperlink</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuMedia-DeleteShapeHyperlink">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:DeleteShapeHyperlink</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuMedia-OpenHyperlinkOnCursor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:OpenHyperlinkOnCursor</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuMedia-AssignMacro">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:AssignMacro</property>
+ </object>
+ </child>
+ </object>
<object class="GtkMenu" id="MenuPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1316,6 +1541,57 @@
</object>
</child>
</object>
+ <object class="GtkMenu" id="MenuPrint">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="MenuPrint-PreviousPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:PreviousPage</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuPrint-NextPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:NextPage</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="MenuPrint-separator1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuPrint-PageFormatDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:PageFormatDialog</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="MenuPrint-separator2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuPrint-Print">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:Print</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuPrint-ClosePreview">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ClosePreview</property>
+ </object>
+ </child>
+ </object>
<object class="GtkMenu" id="MenuReview">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1428,6 +1704,13 @@
</object>
</child>
<child>
+ <object class="GtkMenuItem" id="HideAllNotesD">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:HideAllNotes</property>
+ </object>
+ </child>
+ <child>
<object class="GtkSeparatorMenuItem" id="separator77">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1846,7 +2129,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
- <property name="vexpand">True</property>
<child>
<object class="sfxlo-PriorityHBox" id="FileBox">
<property name="visible">True</property>
@@ -1946,7 +2228,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox"
id="SectionBottom">
<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>
@@ -1983,7 +2265,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox"
id="SectionBottom101">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property
name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -2015,7 +2297,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="NewSection2">
+ <object class="sfxlo-OptionalBox" id="OpenSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -2032,26 +2314,13 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
- </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="OpenSection">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
<child>
<object class="sfxlo-NotebookbarToolBox"
id="SectionBottom4">
<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>
@@ -2069,14 +2338,14 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -2088,7 +2357,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox"
id="SectionBottom102">
<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>
@@ -2116,11 +2385,11 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="OpenSection2">
+ <object class="sfxlo-OptionalBox" id="SaveSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -2137,26 +2406,13 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-OptionalBox" id="SaveSection">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
<child>
<object class="sfxlo-NotebookbarToolBox"
id="SectionBottom86">
<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>
@@ -2174,18 +2430,18 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">6</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="SaveAsSection1">
+ <object class="sfxlo-OptionalBox" id="SaveAsSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -2193,7 +2449,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox"
id="SectionBottom103">
<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>
@@ -2221,11 +2477,11 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">7</property>
+ <property name="position">5</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="SaveSection2">
+ <object class="sfxlo-OptionalBox" id="ExportToSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -2242,26 +2498,13 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">8</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-OptionalBox" id="ExportToSection">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
<child>
<object class="sfxlo-NotebookbarToolBox"
id="SectionBottom87">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property
name="toolbar_style">both-horiz</property>
<child>
<object class="GtkToolButton"
id="Files-ExportTo">
@@ -2278,17 +2521,14 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
- <style>
- <class name="priority-4"/>
- </style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">9</property>
+ <property name="position">6</property>
</packing>
</child>
<child>
@@ -2300,7 +2540,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox"
id="SectionBottom104">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property
name="toolbar_style">both-horiz</property>
<child>
<object class="GtkToolButton"
id="Files-ExportDirectToPDF">
@@ -2320,15 +2560,18 @@
<property name="position">0</property>
</packing>
</child>
+ <style>
+ <class name="priority-4"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">10</property>
+ <property name="position">7</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox"
id="ExportToEPUBSection">
+ <object class="sfxlo-OptionalBox" id="SendMailSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -2336,13 +2579,13 @@
<child>
<object class="sfxlo-NotebookbarToolBox"
id="SectionBottom6">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property
name="toolbar_style">both-horiz</property>
<child>
- <object class="GtkToolButton"
id="Files-ExportDirectToEPUB">
+ <object class="GtkToolButton"
id="Files-SendMail">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:ExportDirectToEPUB</property>
+ <property
name="action_name">.uno:SendMail</property>
</object>
<packing>
<property name="expand">False</property>
@@ -2363,17 +2606,17 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">11</property>
+ <property name="position">8</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="ExportSection2">
+ <object class="sfxlo-OptionalBox"
id="PrintPreviewSection">
<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="separator147">
+ <object class="GtkSeparator" id="separator35">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -2384,26 +2627,13 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">12</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-OptionalBox"
id="PrintPreviewSection">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
<child>
<object class="sfxlo-NotebookbarToolBox"
id="SectionBottom2">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property
name="toolbar_style">both-horiz</property>
<child>
<object class="GtkToolButton"
id="Files-PrintPreview">
@@ -2420,17 +2650,14 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
- <style>
- <class name="priority-8"/>
- </style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">13</property>
+ <property name="position">9</property>
</packing>
</child>
<child>
@@ -2442,7 +2669,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox"
id="SectionBottom105">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property
name="toolbar_style">both-horiz</property>
<child>
<object class="GtkToolButton" id="Files-Print">
@@ -2462,11 +2689,14 @@
<property name="position">0</property>
</packing>
</child>
+ <style>
+ <class name="priority-2"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">14</property>
+ <property name="position">10</property>
</packing>
</child>
<child>
@@ -2478,7 +2708,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox"
id="SectionBottom106">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property
name="toolbar_style">both-horiz</property>
<child>
<object class="GtkToolButton"
id="Files-PrintDefault">
@@ -2505,35 +2735,46 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">15</property>
+ <property name="position">11</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="PrintSection3">
+ <object class="sfxlo-OptionalBox"
id="PrinterSetupSection">
<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="separator151">
+ <object class="sfxlo-NotebookbarToolBox" id="Draw5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
- <property name="orientation">vertical</property>
+ <property name="valign">center</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="PrinterSetup">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="visible_horizontal">False</property>
+ <property
name="action_name">.uno:PrinterSetup</property>
+ <property
name="icon_name">sfx2/res/symphony/open_more.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="padding">5</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">16</property>
+ <property name="position">12</property>
</packing>
</child>
<child>
@@ -2543,9 +2784,24 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator45">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-NotebookbarToolBox"
id="ExportGroup3">
<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>
@@ -2563,21 +2819,6 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator35">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
- <property name="orientation">vertical</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
@@ -2585,7 +2826,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">19</property>
+ <property name="position">13</property>
</packing>
</child>
</object>
@@ -2601,7 +2842,7 @@
<object class="GtkLabel" id="FileLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="notebookbar_compact|FileLabel">File</property>
+ <property name="label" translatable="yes"
context="notebookbar_compact|FileLabel">~File</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -2641,6 +2882,30 @@
<property name="homogeneous">False</property>
</packing>
</child>
+ <child>
+ <object class="GtkToolButton" id="Home-DataSort">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property
name="action_name">.uno:DataSort</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Home-DataFilterAutoFilter">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property
name="action_name">.uno:DataFilterAutoFilter</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -2699,21 +2964,6 @@
<property name="homogeneous">False</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom5">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
<child>
<object class="GtkToolButton" id="Home-Cut">
<property name="visible">True</property>
@@ -2740,24 +2990,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator8">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
- <property name="vexpand">True</property>
- <property name="orientation">vertical</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">5</property>
- <property name="position">3</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
@@ -2780,6 +3013,24 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator36">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-NotebookbarToolBox"
id="ExtTop1">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2813,11 +3064,24 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="TextSection1">
+ <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="separator36">
+ <object class="GtkSeparator" id="separator120">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
@@ -2831,23 +3095,9 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">5</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-OptionalBox" id="TextSection1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
<child>
<object class="sfxlo-NotebookbarToolBox"
id="ExtTop5">
<property name="visible">True</property>
@@ -2869,32 +3119,29 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator120">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
- <property name="vexpand">True</property>
- <property name="orientation">vertical</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
+ <property name="position">1</property>
</packing>
</child>
+ <style>
+ <class name="priority-16"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="TextSection2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="ExtTop6">
+ <object class="sfxlo-NotebookbarToolBox"
id="ExtTop7">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
@@ -2917,13 +3164,13 @@
</packing>
</child>
<style>
- <class name="priority-12"/>
+ <class name="priority-15"/>
</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>
@@ -2933,6 +3180,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-NotebookbarToolBox"
id="ExtTop4">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2988,32 +3250,17 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
- <property name="orientation">vertical</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
<style>
- <class name="priority-11"/>
+ <class name="priority-14"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -3023,6 +3270,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-NotebookbarToolBox"
id="ExtTop2">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -3056,32 +3318,17 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
- <property name="orientation">vertical</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
<style>
- <class name="priority-10"/>
+ <class name="priority-13"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
@@ -3091,6 +3338,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-NotebookbarToolBox"
id="ExtTop3">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -3108,16 +3370,15 @@
<property
name="action_name">.uno:SetBorderStyle</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="GtkMenuToolButton"
id="Home-BackgroundColor">
+ <object class="GtkMenuToolButton"
id="Home-FontColor">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:BackgroundColor</property>
- <property name="use_underline">True</property>
+ <property
name="action_name">.uno:Color</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3125,46 +3386,73 @@
</packing>
</child>
<child>
- <object class="GtkMenuToolButton"
id="Home-FontColor">
+ <object class="GtkMenuToolButton"
id="Home-BackgroundColor">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:Color</property>
+ <property
name="action_name">.uno:BackgroundColor</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">False</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ <style>
+ <class name="priority-12"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="FontDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<child>
- <object class="GtkSeparator" id="separator10">
+ <object class="sfxlo-NotebookbarToolBox"
id="ExtTop6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
- <property name="orientation">vertical</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Default-FontDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="visible_horizontal">False</property>
+ <property
name="action_name">.uno:FontDialog</property>
+ <property
name="icon_name">sfx2/res/symphony/open_more.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
<style>
- <class name="priority-9"/>
+ <class name="priority-15"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">6</property>
</packing>
</child>
<child>
@@ -3174,6 +3462,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator148">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-NotebookbarToolBox"
id="SectionBottom13">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -3227,32 +3530,17 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator148">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
- <property name="orientation">vertical</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
<style>
- <class name="priority-8"/>
+ <class name="priority-11"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">5</property>
+ <property name="position">7</property>
</packing>
</child>
<child>
@@ -3261,6 +3549,20 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator82">
+ <property name="can_focus">False</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-NotebookbarToolBox"
id="SectionBottom91">
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
@@ -3302,31 +3604,17 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator82">
- <property name="can_focus">False</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
- <property name="orientation">vertical</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
<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">6</property>
+ <property name="position">8</property>
</packing>
</child>
<child>
@@ -3336,6 +3624,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-NotebookbarToolBox"
id="SectionBottom9">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -3382,32 +3685,58 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator12">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
- <property name="orientation">vertical</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
<style>
- <class name="priority-6"/>
+ <class name="priority-9"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">7</property>
+ <property name="position">9</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="CellDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="ExtTop10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Default-FormatCellDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="visible_horizontal">False</property>
+ <property
name="action_name">.uno:FormatCellDialog</property>
+ <property
name="icon_name">sfx2/res/symphony/open_more.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-15"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">10</property>
</packing>
</child>
<child>
@@ -3417,6 +3746,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator81">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-NotebookbarToolBox"
id="SectionBottom65">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -3437,31 +3781,76 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ <style>
+ <class name="priority-8"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">11</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="RowSection">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<child>
<object class="sfxlo-NotebookbarToolBox"
id="SectionBottom89">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Home-InsertRowsBefore">
+ <object class="GtkMenuToolButton"
id="Home-RowOperations">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertRowsBefore</property>
+ <property
name="action_name">.uno:RowOperations</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-7"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">12</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="ColumnSection">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Home-InsertColumnsBefore">
+ <object class="GtkMenuToolButton"
id="Home-ColumnOperations">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertColumnsBefore</property>
+ <property
name="action_name">.uno:ColumnOperations</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3472,32 +3861,58 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
+ <style>
+ <class name="priority-6"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">13</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="InsertCellDialog">
+ <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="separator81">
+ <object class="sfxlo-NotebookbarToolBox"
id="ExtTop8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
- <property name="orientation">vertical</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Default-InsertCell">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="visible_horizontal">False</property>
+ <property
name="action_name">.uno:InsertCell</property>
+ <property
name="icon_name">sfx2/res/symphony/open_more.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="padding">5</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<style>
- <class name="priority-5"/>
+ <class name="priority-15"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">8</property>
+ <property name="position">14</property>
</packing>
</child>
<child>
@@ -3507,6 +3922,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
