[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/uiconfig sd/uiconfig
andreas kainz (via logerrit)
logerrit at kemper.freedesktop.org
Wed Dec 4 09:35:34 UTC 2019
sc/uiconfig/scalc/ui/notebookbar.ui | 1341 ++++++++++++-------------
sd/uiconfig/sdraw/ui/notebookbar.ui | 1628 +++++++++++++++---------------
sd/uiconfig/simpress/ui/notebookbar.ui | 1734 ++++++++++++++++-----------------
3 files changed, 2332 insertions(+), 2371 deletions(-)
New commits:
commit d2948f8ae7e3442762c4ce9c3d7b7aa0c0beff86
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Wed Dec 4 00:12:46 2019 +0100
Commit: andreas_kainz <kainz.a at gmail.com>
CommitDate: Wed Dec 4 10:34:47 2019 +0100
tdf#101513 arrangement of customizeable items in NB tabbed
Change-Id: I1cef677fcc91403dbaa92fd8dcf8a5fcc5bc6b03
Reviewed-on: https://gerrit.libreoffice.org/84383
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
(cherry picked from commit 2f0eed452c95484144016a33231adfc8144fa8bc)
Reviewed-on: https://gerrit.libreoffice.org/84387
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index e4b8c1950d76..6fb79734ef27 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -3,7 +3,7 @@
<interface domain="sc">
<requires lib="gtk+" version="3.18"/>
<requires lib="LibreOffice" version="1.0"/>
- <object class="GtkMenu" id="MenuData">
+ <object class="GtkMenu" id="Menu Data">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -245,7 +245,7 @@
</object>
</child>
</object>
- <object class="GtkMenu" id="MenuDraw">
+ <object class="GtkMenu" id="Menu Draw">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -310,7 +310,7 @@
</object>
</child>
</object>
- <object class="GtkMenu" id="MenuField">
+ <object class="GtkMenu" id="Menu Field">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -355,7 +355,7 @@
</object>
</child>
</object>
- <object class="GtkMenu" id="MenuFile">
+ <object class="GtkMenu" id="Menu File">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -535,7 +535,7 @@
</object>
</child>
</object>
- <object class="GtkMenu" id="MenuForm">
+ <object class="GtkMenu" id="Menu Form">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -695,7 +695,7 @@
</object>
</child>
</object>
- <object class="GtkMenu" id="MenuHelp">
+ <object class="GtkMenu" id="Menu Help">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -799,7 +799,7 @@
</object>
</child>
</object>
- <object class="GtkMenu" id="MenuHome">
+ <object class="GtkMenu" id="Menu Home">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -987,7 +987,7 @@
</object>
</child>
</object>
- <object class="GtkMenu" id="MenuImage">
+ <object class="GtkMenu" id="Menu Image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -1114,7 +1114,7 @@
</object>
</child>
</object>
- <object class="GtkMenu" id="MenuInsert">
+ <object class="GtkMenu" id="Menu Insert">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -1267,7 +1267,7 @@
</object>
</child>
</object>
- <object class="GtkMenu" id="MenuMedia">
+ <object class="GtkMenu" id="Menu Media">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -1332,7 +1332,7 @@
</object>
</child>
</object>
- <object class="GtkMenu" id="MenuPage">
+ <object class="GtkMenu" id="Menu Page">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -1431,7 +1431,7 @@
</object>
</child>
</object>
- <object class="GtkMenu" id="MenuPrint">
+ <object class="GtkMenu" id="Menu Print">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -1482,7 +1482,7 @@
</object>
</child>
</object>
- <object class="GtkMenu" id="MenuReview">
+ <object class="GtkMenu" id="Menu Review">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -1628,7 +1628,7 @@
</object>
</child>
</object>
- <object class="GtkMenu" id="MenuStatistic">
+ <object class="GtkMenu" id="Menu Statistic">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -1723,7 +1723,7 @@
</object>
</child>
</object>
- <object class="GtkMenu" id="MenuTools">
+ <object class="GtkMenu" id="Menu Tools">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -1909,7 +1909,7 @@
</object>
</child>
</object>
- <object class="GtkMenu" id="MenuView">
+ <object class="GtkMenu" id="Menu View">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -2090,148 +2090,11 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child>
- <object class="sfxlo-PriorityHBox" id="FileBox">
+ <object class="sfxlo-PriorityHBox" id="File Tab">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="sfxlo-DropdownBox" id="File-Menu">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <child>
- <object class="GtkBox" id="GroupB8">
- <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="SectionBottom80">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">end</property>
- <property name="hexpand">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
- <property name="icon_size">1</property>
- <child>
- <object class="GtkToolButton" id="File-CloseDoc">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:CloseDoc</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="SectionBottom1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">end</property>
- <property name="hexpand">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
- <property name="icon_size">1</property>
- <child>
- <object class="GtkToolButton" id="File-HelpIndex">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:HelpIndex</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="GroupB7">
- <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="svtlo-ManagedMenuButton" id="File-FileButton:MenuFile">
- <property name="label" translatable="yes" context="CalcNotebookbar|FileMenuButton">_File</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="focus_on_click">False</property>
- <property name="receives_default">False</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <property name="resize_mode">immediate</property>
- <property name="relief">none</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="svtlo-ManagedMenuButton" id="File-HelpButton:MenuHelp">
- <property name="label" translatable="yes" context="CalcNotebookbar|HelpMenuButton">_Help</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="focus_on_click">False</property>
- <property name="receives_default">False</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <property name="resize_mode">immediate</property>
- <property name="relief">none</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-PriorityMergedHBox" id="File-Container">
+ <object class="sfxlo-PriorityMergedHBox" id="File">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -3025,6 +2888,143 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-DropdownBox" id="File-Menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <child>
+ <object class="GtkBox" id="GroupB8">
+ <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="SectionBottom80">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
+ <property name="hexpand">True</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <property name="icon_size">1</property>
+ <child>
+ <object class="GtkToolButton" id="File-CloseDoc">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:CloseDoc</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="SectionBottom1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
+ <property name="hexpand">True</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <property name="icon_size">1</property>
+ <child>
+ <object class="GtkToolButton" id="File-HelpIndex">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:HelpIndex</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="GroupB7">
+ <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="svtlo-ManagedMenuButton" id="File-FileButton:Menu File">
+ <property name="label" translatable="yes" context="CalcNotebookbar|FileMenuButton">_File</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
+ <property name="receives_default">False</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="resize_mode">immediate</property>
+ <property name="relief">none</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="svtlo-ManagedMenuButton" id="File-HelpButton:Menu Help">
+ <property name="label" translatable="yes" context="CalcNotebookbar|HelpMenuButton">_Help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
+ <property name="receives_default">False</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="resize_mode">immediate</property>
+ <property name="relief">none</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
@@ -3059,18 +3059,18 @@
</packing>
</child>
<child>
- <object class="sfxlo-PriorityHBox" id="HomeBox">
+ <object class="sfxlo-PriorityHBox" id="Home Tab">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <object class="GtkBox" id="Home-PasteBox">
+ <object class="sfxlo-PriorityMergedHBox" id="Home">
<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-OptionalBox" id="FileSection7">
+ <object class="sfxlo-OptionalBox" id="Home-Section-Clipboard">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -3163,26 +3163,16 @@
<property name="position">1</property>
</packing>
</child>
+ <style>
+ <class name="priority-10"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</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-PriorityMergedHBox" id="Home-Container">
- <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-OptionalBox" id="Home-Section-Style">
<property name="visible">True</property>
@@ -3272,7 +3262,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -3594,7 +3584,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -3754,7 +3744,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>
@@ -3940,7 +3930,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>
@@ -4132,7 +4122,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>
@@ -4190,7 +4180,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>
@@ -4311,7 +4301,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>
@@ -4580,7 +4570,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>
@@ -4638,7 +4628,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">8</property>
+ <property name="position">9</property>
</packing>
</child>
<child>
@@ -4696,7 +4686,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">9</property>
+ <property name="position">10</property>
</packing>
</child>
<child>
@@ -4775,14 +4765,14 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">10</property>
+ <property name="position">11</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -4800,7 +4790,7 @@
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="svtlo-ManagedMenuButton" id="Home-HomeButton:MenuHome">
+ <object class="svtlo-ManagedMenuButton" id="Home-HomeButton:Menu Home">
<property name="label" translatable="yes" context="CalcNotebookbar|HomeMenuButton">_Home</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -4881,7 +4871,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -4898,7 +4888,7 @@
<property name="fill">True</property>
<property name="padding">5</property>
<property name="pack_type">end</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -4925,11 +4915,11 @@
</packing>
</child>
<child>
- <object class="sfxlo-PriorityHBox" id="InsertBox">
+ <object class="sfxlo-PriorityHBox" id="Insert Tab">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="sfxlo-PriorityMergedHBox" id="Insert-Container">
+ <object class="sfxlo-PriorityMergedHBox" id="Insert">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -5468,7 +5458,7 @@
</packing>
</child>
<child>
- <object class="svtlo-ManagedMenuButton" id="Insert-FieldButton:MenuField">
+ <object class="svtlo-ManagedMenuButton" id="Insert-FieldButton:Menu Field">
<property name="label" translatable="yes" context="CalcNotebookbar|FieldMenuButton">Fiel_d</property>
<property name="width_request">70</property>
<property name="visible">True</property>
@@ -5989,7 +5979,7 @@
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="svtlo-ManagedMenuButton" id="Insert-InsertButton:MenuInsert">
+ <object class="svtlo-ManagedMenuButton" id="Insert-InsertButton:Menu Insert">
<property name="label" translatable="yes" context="CalcNotebookbar|InsertMenuButton">_Insert</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -6069,7 +6059,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -6086,126 +6076,34 @@
<property name="fill">True</property>
<property name="padding">5</property>
<property name="pack_type">end</property>
- <property name="position">6</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="InsertLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="CalcNotebookbar|InsertLabel">~Insert</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-PriorityHBox" id="LayoutBox">
- <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-DropdownBox" id="Layout-Menu">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <child>
- <object class="GtkBox" id="GroupB28">
- <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="svtlo-ManagedMenuButton" id="Layout-LayoutButton:MenuPage">
- <property name="label" translatable="yes" context="CalcNotebookbar|reviewb">_Layout</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="focus_on_click">False</property>
- <property name="receives_default">False</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <property name="relief">none</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom15">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">end</property>
- <property name="hexpand">True</property>
- <property name="toolbar_style">both-horiz</property>
- <property name="show_arrow">False</property>
- <property name="icon_size">1</property>
- <child>
- <object class="GtkToolButton" id="Layout-PageFormatDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:PageFormatDialog</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</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="halign">end</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="pack_type">end</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="InsertLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="CalcNotebookbar|InsertLabel">~Insert</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-PriorityHBox" id="Layout Tab">
+ <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-PriorityMergedHBox" id="Layout-Container">
+ <object class="sfxlo-PriorityMergedHBox" id="Layout">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -7274,6 +7172,98 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-DropdownBox" id="Layout-Menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <child>
+ <object class="GtkBox" id="GroupB28">
+ <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="svtlo-ManagedMenuButton" id="Layout-LayoutButton:Menu Page">
+ <property name="label" translatable="yes" context="CalcNotebookbar|reviewb">_Layout</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
+ <property name="receives_default">False</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="relief">none</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom15">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
+ <property name="hexpand">True</property>
+ <property name="toolbar_style">both-horiz</property>
+ <property name="show_arrow">False</property>
+ <property name="icon_size">1</property>
+ <child>
+ <object class="GtkToolButton" id="Layout-PageFormatDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:PageFormatDialog</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparator" id="separator12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
@@ -7295,12 +7285,12 @@
</packing>
</child>
<child>
- <object class="sfxlo-PriorityHBox" id="DataBox">
+ <object class="sfxlo-PriorityHBox" id="Data Tab">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <object class="sfxlo-PriorityMergedHBox" id="Data-Container">
+ <object class="sfxlo-PriorityMergedHBox" id="Data">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -8391,7 +8381,7 @@
</packing>
</child>
<child>
- <object class="svtlo-ManagedMenuButton" id="Data-StatisticsMenu:MenuStatistic">
+ <object class="svtlo-ManagedMenuButton" id="Data-StatisticsMenu:Menu Statistic">
<property name="label" translatable="yes" context="CalcNotebookbar|Statistics">_Statistics</property>
<property name="width_request">80</property>
<property name="visible">True</property>
@@ -8442,7 +8432,7 @@
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="svtlo-ManagedMenuButton" id="Data-DataButton:MenuData">
+ <object class="svtlo-ManagedMenuButton" id="Data-DataButton:Menu Data">
<property name="label" translatable="yes" context="CalcNotebookbar|DataMenuButton">_Data</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -8523,7 +8513,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
- <property name="position">10</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -8540,7 +8530,7 @@
<property name="fill">True</property>
<property name="padding">5</property>
<property name="pack_type">end</property>
- <property name="position">14</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -8561,11 +8551,11 @@
</packing>
</child>
<child>
- <object class="sfxlo-PriorityHBox" id="ReviewBox">
+ <object class="sfxlo-PriorityHBox" id="Review Tab">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="sfxlo-PriorityMergedHBox" id="Review-Container">
+ <object class="sfxlo-PriorityMergedHBox" id="Review">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -9373,7 +9363,7 @@
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="svtlo-ManagedMenuButton" id="Review-ReviewButton:MenuReview">
+ <object class="svtlo-ManagedMenuButton" id="Review-ReviewButton:Menu Review">
<property name="label" translatable="yes" context="CalcNotebookbar|ReviewMenuButton">_Review</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -9448,7 +9438,7 @@
<property name="fill">True</property>
<property name="padding">5</property>
<property name="pack_type">end</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -9469,11 +9459,11 @@
</packing>
</child>
<child>
- <object class="sfxlo-PriorityHBox" id="ViewBox">
+ <object class="sfxlo-PriorityHBox" id="View Tab">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="sfxlo-PriorityMergedHBox" id="View-Container">
+ <object class="sfxlo-PriorityMergedHBox" id="View">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -10365,7 +10355,7 @@
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="svtlo-ManagedMenuButton" id="View-ViewButton:MenuView">
+ <object class="svtlo-ManagedMenuButton" id="View-ViewButton:Menu View">
<property name="label" translatable="yes" context="CalcNotebookbar|ViewMenuButton">_View</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -10423,164 +10413,49 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
- <property name="position">3</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkSeparator" id="separator32">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
- <property name="orientation">vertical</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">5</property>
- <property name="pack_type">end</property>
- <property name="position">5</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">6</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="ViewLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="CalcNotebookbar|ViewLabel">~View</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="position">6</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-PriorityHBox" id="ImageBox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="sfxlo-DropdownBox" id="Image-Menu">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <child>
- <object class="GtkBox" id="GroupB67">
- <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="svtlo-ManagedMenuButton" id="Image-GraphicButton:MenuImage">
- <property name="label" translatable="yes" context="CalcNotebookbar|GraphicMenuButton">Ima_ge</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="focus_on_click">False</property>
- <property name="receives_default">False</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- <property name="relief">none</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom83">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">end</property>
- <property name="hexpand">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
- <property name="icon_size">1</property>
- <child>
- <object class="GtkToolButton" id="Image-SaveGraphic">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <property name="action_name">.uno:SaveGraphic</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="Image-FormatArea">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <property name="action_name">.uno:FormatArea</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="Image-FormatLine">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <property name="action_name">.uno:FormatLine</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="Image-TransformDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <property name="action_name">.uno:TransformDialog</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
<property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="position">2</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="position">6</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="ViewLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="CalcNotebookbar|ViewLabel">~View</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="position">6</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-PriorityHBox" id="Image Tab">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
- <object class="sfxlo-PriorityMergedHBox" id="Image-Container">
+ <object class="sfxlo-PriorityMergedHBox" id="Image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -11602,6 +11477,121 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-DropdownBox" id="Image-Menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <child>
+ <object class="GtkBox" id="GroupB67">
+ <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="svtlo-ManagedMenuButton" id="Image-GraphicButton:Menu Image">
+ <property name="label" translatable="yes" context="CalcNotebookbar|GraphicMenuButton">Ima_ge</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
+ <property name="receives_default">False</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ <property name="relief">none</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom83">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
+ <property name="hexpand">True</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <property name="icon_size">1</property>
+ <child>
+ <object class="GtkToolButton" id="Image-SaveGraphic">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="action_name">.uno:SaveGraphic</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Image-FormatArea">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="action_name">.uno:FormatArea</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Image-FormatLine">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="action_name">.uno:FormatLine</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Image-TransformDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="action_name">.uno:TransformDialog</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
@@ -11643,11 +11633,11 @@
</packing>
</child>
<child>
- <object class="sfxlo-PriorityHBox" id="DrawBox">
+ <object class="sfxlo-PriorityHBox" id="Draw Tab">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="sfxlo-PriorityMergedHBox" id="Draw-Container">
+ <object class="sfxlo-PriorityMergedHBox" id="Draw">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -12849,7 +12839,7 @@
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="svtlo-ManagedMenuButton" id="Draw-DrawButton:MenuDraw">
+ <object class="svtlo-ManagedMenuButton" id="Draw-DrawButton:Menu Draw">
<property name="label" translatable="yes" context="CalcNotebookbar|DrawMenuButton">_Draw</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -12931,7 +12921,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -12948,7 +12938,7 @@
<property name="fill">True</property>
<property name="padding">5</property>
<property name="pack_type">end</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -12975,11 +12965,11 @@
</packing>
</child>
<child>
- <object class="sfxlo-PriorityHBox" id="ObjectBox">
+ <object class="sfxlo-PriorityHBox" id="Object Tab">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="sfxlo-PriorityMergedHBox" id="Object-Container">
+ <object class="sfxlo-PriorityMergedHBox" id="Object">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -13431,7 +13421,7 @@
</packing>
</child>
<child>
- <object class="svtlo-ManagedMenuButton" id="Object-ConvertButton:MenuConvert">
+ <object class="svtlo-ManagedMenuButton" id="Object-ConvertButton:Menu Convert">
<property name="label" translatable="yes" context="CalcNotebookbar|ConvertMenuButton">Convert</property>
<property name="width_request">70</property>
<property name="visible">True</property>
@@ -13731,8 +13721,8 @@
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="svtlo-ManagedMenuButton" id="Object-DrawMenu:MenuDraw">
- <property name="label" translatable="yes" context="CalcNotebookbar|frame:MenuDraw">_Object</property>
+ <object class="svtlo-ManagedMenuButton" id="Object-DrawMenu:Menu Draw">
+ <property name="label" translatable="yes" context="CalcNotebookbar|frame:Menu Draw">_Object</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
@@ -13813,7 +13803,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -13830,7 +13820,7 @@
<property name="fill">True</property>
<property name="padding">5</property>
<property name="pack_type">end</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -13855,11 +13845,11 @@
</packing>
</child>
<child>
- <object class="sfxlo-PriorityHBox" id="MediaBox">
+ <object class="sfxlo-PriorityHBox" id="Media Tab">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="sfxlo-PriorityMergedHBox" id="Media-Container">
+ <object class="sfxlo-PriorityMergedHBox" id="Media">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -14416,7 +14406,7 @@
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="svtlo-ManagedMenuButton" id="media:MenuMedia">
+ <object class="svtlo-ManagedMenuButton" id="media:Menu Media">
<property name="label" translatable="yes" context="CalcNotebookbar|MediaMenuButton">_Media</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -14496,7 +14486,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -14513,7 +14503,7 @@
<property name="fill">True</property>
<property name="padding">5</property>
<property name="pack_type">end</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -14537,11 +14527,11 @@
</packing>
</child>
<child>
- <object class="sfxlo-PriorityHBox" id="PrintBox">
+ <object class="sfxlo-PriorityHBox" id="Print Tab">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="sfxlo-PriorityMergedHBox" id="Print-Container">
+ <object class="sfxlo-PriorityMergedHBox" id="Print">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -14885,193 +14875,77 @@
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-DropdownBox" id="Print-Menu">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <child>
- <object class="GtkBox" id="GroupB33">
- <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="svtlo-ManagedMenuButton" id="print:MenuPrint">
- <property name="label" translatable="yes" context="CalcNotebookbar|PrintMenuButton">_Print</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="focus_on_click">False</property>
- <property name="receives_default">False</property>
- <property name="halign">end</property>
- <property name="hexpand">True</property>
- <property name="relief">none</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom79">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">end</property>
- <property name="hexpand">True</property>
- <property name="toolbar_style">both-horiz</property>
- <property name="show_arrow">False</property>
- <property name="icon_size">1</property>
- <child>
- <object class="GtkToolButton" id="Print-FullScreen">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:FullScreen</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator45">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
- <property name="orientation">vertical</property>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
- <property name="padding">5</property>
- <property name="pack_type">end</property>
- <property name="position">3</property>
+ <property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="position">11</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="PrintLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="CalcNotebookbar|PrintLabel">~Print</property>
- <property name="use_underline">True</property>
- <style>
- <class name="context-Printpreview"/>
- </style>
- </object>
- <packing>
- <property name="position">11</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-PriorityHBox" id="FormBox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
- <object class="sfxlo-DropdownBox" id="Form-Menu">
+ <object class="sfxlo-DropdownBox" id="Print-Menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="GtkBox" id="Form-Section">
+ <object class="GtkBox" id="GroupB33">
<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="svtlo-ManagedMenuButton" id="Form-FormButton:MenuForm">
- <property name="label" translatable="yes" context="CalcNotebookbar|FormMenuButton">Fo_rm</property>
+ <object class="svtlo-ManagedMenuButton" id="print:Menu Print">
+ <property name="label" translatable="yes" context="CalcNotebookbar|PrintMenuButton">_Print</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="halign">end</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
+ <property name="hexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom34">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom79">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="halign">end</property>
<property name="hexpand">True</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<property name="icon_size">1</property>
<child>
- <object class="GtkToolButton" id="FormMenu-FormProperties">
+ <object class="GtkToolButton" id="Print-FullScreen">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:FormProperties</property>
+ <property name="action_name">.uno:FullScreen</property>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -15094,11 +14968,11 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator44">
+ <object class="GtkSeparator" id="separator45">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
@@ -15111,11 +14985,35 @@
<property name="fill">True</property>
<property name="padding">5</property>
<property name="pack_type">end</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="position">11</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="PrintLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="CalcNotebookbar|PrintLabel">~Print</property>
+ <property name="use_underline">True</property>
+ <style>
+ <class name="context-Printpreview"/>
+ </style>
+ </object>
+ <packing>
+ <property name="position">11</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-PriorityHBox" id="Form Tab">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
- <object class="sfxlo-PriorityMergedHBox" id="Form-Container">
+ <object class="sfxlo-PriorityMergedHBox" id="Form">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -15915,50 +15813,26 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="position">12</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="FormLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="CalcNotebookbar|FormLabel">Fo~rm</property>
- <property name="use_underline">True</property>
- <style>
- <class name="context-Form"/>
- </style>
- </object>
- <packing>
- <property name="position">12</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-PriorityHBox" id="ToolBox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
- <object class="sfxlo-DropdownBox" id="Tools-Menu">
+ <object class="sfxlo-DropdownBox" id="Form-Menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="GtkBox" id="ViewMenu1">
+ <object class="GtkBox" id="Form-Section">
<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="svtlo-ManagedMenuButton" id="Tools-ToolsButton:MenuTools">
- <property name="label" translatable="yes" context="CalcNotebookbar|ToolsMenuButton">_Tools</property>
+ <object class="svtlo-ManagedMenuButton" id="Form-FormButton:Menu Form">
+ <property name="label" translatable="yes" context="CalcNotebookbar|FormMenuButton">Fo_rm</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
@@ -15976,19 +15850,19 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom34">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="halign">end</property>
<property name="hexpand">True</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<property name="icon_size">1</property>
<child>
- <object class="GtkToolButton" id="Tools-ShowFmExplorer">
+ <object class="GtkToolButton" id="FormMenu-FormProperties">
<property name="visible">True</property>
<property name="can_focus">False</property>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list