summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorandreas kainz <kainz.a@gmail.com>2019-07-01 09:23:35 +0200
committerandreas_kainz <kainz.a@gmail.com>2019-07-01 19:43:38 +0200
commitb81589eb21d25a521cb5e147437526da9035e944 (patch)
treef2fa42b4503bf79a4b40e0a876e2bedd716710a5 /sc
parent157fd297127081abfa11f205d378bdabacf2f8df (diff)
sync NB master with 6.3 branch
Change-Id: I178fd555db878dcf89a905b6eb36599a539df10d Reviewed-on: https://gerrit.libreoffice.org/74965 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
Diffstat (limited to 'sc')
-rw-r--r--sc/uiconfig/scalc/ui/notebookbar.ui402
-rw-r--r--sc/uiconfig/scalc/ui/notebookbar_compact.ui1291
-rw-r--r--sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui2
-rw-r--r--sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui4
4 files changed, 1332 insertions, 367 deletions
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index e4e839710b05..e4b8c1950d76 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -3288,21 +3288,6 @@
<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="GtkBox" id="GroupB10">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -3510,20 +3495,6 @@
<property name="homogeneous">True</property>
</packing>
</child>
- <child>
- <object class="GtkMenuToolButton" id="Home-SetBorderStyle">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes" context="CalcNotebookbar|bordertype|tooltip_text">Specify the borders of the selected cells.</property>
- <property name="halign">start</property>
- <property name="action_name">.uno:SetBorderStyle</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -3555,6 +3526,20 @@
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
+ <object class="GtkMenuToolButton" id="Home-SetBorderStyle">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes" context="CalcNotebookbar|bordertype|tooltip_text">Specify the borders of the selected cells.</property>
+ <property name="halign">start</property>
+ <property name="action_name">.uno:SetBorderStyle</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkMenuToolButton" id="Home-BackgroundColor">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -9526,10 +9511,23 @@
<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="View-Section-View1">
+ <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="SectionBottom78">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both</property>
@@ -9553,10 +9551,23 @@
<property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="View-Section-View2">
+ <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="SectionBottom81">
+ <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="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both</property>
@@ -9580,6 +9591,22 @@
<property name="position">2</property>
</packing>
</child>
+ <style>
+ <class name="priority-8"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="View-Section-View3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<child>
<object class="GtkBox" id="GroupB61">
<property name="visible">True</property>
@@ -9590,7 +9617,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineA22">
<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>
@@ -9614,7 +9641,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineB23">
<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>
@@ -9642,8 +9669,24 @@
<property name="position">3</property>
</packing>
</child>
+ <style>
+ <class name="priority-7"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="View-Section-Zoom">
+ <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="separator20">
+ <object class="GtkSeparator" id="separator120">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -9654,22 +9697,9 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">4</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="View-Section-Zoom">
- <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="SectionBottom24">
<property name="visible">True</property>
@@ -9694,9 +9724,22 @@
<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">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="View-Section-Zoom1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<child>
<object class="GtkBox" id="GroupB51">
<property name="visible">True</property>
@@ -9707,7 +9750,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineA28">
<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>
@@ -9731,7 +9774,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineB29">
<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>
@@ -9756,9 +9799,25 @@
<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">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="View-Section-Zoom2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<child>
<object class="GtkBox" id="GroupB50">
<property name="visible">True</property>
@@ -9769,7 +9828,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineA26">
<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>
@@ -9793,7 +9852,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineB27">
<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>
@@ -9818,32 +9877,17 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator120">
- <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">4</property>
+ <property name="position">3</property>
</packing>
</child>
<style>
- <class name="priority-4"/>
+ <class name="priority-5"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">6</property>
</packing>
</child>
<child>
@@ -9853,6 +9897,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator22">
+ <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="SectionBottom23">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -9876,9 +9935,22 @@
<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">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="View-Section-Split1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<child>
<object class="GtkBox" id="GroupB36">
<property name="visible">True</property>
@@ -9889,7 +9961,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="belowspacing3">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -9921,7 +9993,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="belowspacing2">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">icons</property>
@@ -9947,7 +10019,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin4">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -9981,32 +10053,17 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator22">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
- <property name="orientation">vertical</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">5</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
<style>
- <class name="priority-3"/>
+ <class name="priority-4"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">8</property>
</packing>
</child>
<child>
@@ -10016,6 +10073,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator21">
+ <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="SectionBottom22">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -10039,9 +10111,22 @@
<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">9</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="View-Section-Visible1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<child>
<object class="GtkBox" id="GroupB48">
<property name="visible">True</property>
@@ -10052,7 +10137,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin5">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -10078,7 +10163,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="belowspacing4">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -10105,20 +10190,36 @@
<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-3"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">10</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="View-Section-Visible2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<child>
- <object class="GtkBox" id="GroupB46">
+ <object class="GtkBox" id="GroupB55">
<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="LeftParaMargin6">
+ <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin13">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -10142,9 +10243,9 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="belowspacing6">
+ <object class="sfxlo-NotebookbarToolBox" id="belowspacing14">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -10174,21 +10275,6 @@
<property name="position">3</property>
</packing>
</child>
- <child>
- <object class="GtkSeparator" id="separator21">
- <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">4</property>
- </packing>
- </child>
<style>
<class name="priority-2"/>
</style>
@@ -10196,7 +10282,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">11</property>
</packing>
</child>
<child>
@@ -10206,6 +10292,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator40">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom38">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -10229,7 +10330,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<style>
@@ -10239,7 +10340,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">12</property>
</packing>
</child>
</object>
@@ -12933,10 +13034,10 @@
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Object-ToggleObjectBezierMode">
+ <object class="GtkToolButton" id="Object-OriginalSize">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:AdvancedMode</property>
+ <property name="action_name">.uno:OriginalSize</property>
</object>
<packing>
<property name="expand">False</property>
@@ -12970,17 +13071,6 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Object-FlipHorizontal">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:FlipHorizontal</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
<object class="GtkToolButton" id="Object-FlipVertical">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -12992,21 +13082,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Object-Shear">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Shear</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="Object-CrookSlant">
+ <object class="GtkToolButton" id="Object-FlipHorizontal">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:CrookSlant</property>
+ <property name="action_name">.uno:FlipHorizontal</property>
</object>
<packing>
<property name="expand">False</property>
@@ -14363,13 +14442,38 @@
<property name="show_arrow">False</property>
<property name="icon_size">1</property>
<child>
+ <object class="GtkToolButton" id="Media-FormatArea">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="action_name">.uno:FormatArea</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Media-FormatLine">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="action_name">.uno:FormatLine</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkToolButton" id="Media-TransformDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
<property name="action_name">.uno:TransformDialog</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
index c360e751161d..6cdef38e6f6b 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
@@ -3502,10 +3502,11 @@
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<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>
@@ -3513,11 +3514,10 @@
</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>
@@ -6369,7 +6369,7 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="sfxlo-OptionalBox" id="SourcesSection">
+ <object class="sfxlo-OptionalBox" id="Data-Section-Source">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -6417,7 +6417,58 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="CalculateSection">
+ <object class="sfxlo-OptionalBox" id="Data-Section-Source1">
+ <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="SectionBottom169">
+ <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="Data-DataProvider">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:DataProvider</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Data-ManageXMLSource">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ManageXMLSource</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-12"/>
+ </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="Data-Section-Calculation">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -6461,6 +6512,54 @@
<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>
+ <child>
+ <object class="sfxlo-OptionalBox" id="Data-Section-Calculation1">
+ <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="SectionBottom170">
+ <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="Data-DataProvider1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:DataProvider</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Data-ManageXMLSource1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ManageXMLSource</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-11"/>
</style>
@@ -6468,11 +6567,11 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="SortSection">
+ <object class="sfxlo-OptionalBox" id="Data-Section-Sort">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -6520,11 +6619,11 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="SortSection1">
+ <object class="sfxlo-OptionalBox" id="Data-Section-Sort1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -6571,11 +6670,11 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">5</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="FilterSection">
+ <object class="sfxlo-OptionalBox" id="Data-Section-Filter">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -6623,11 +6722,11 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">6</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="FilterSection1">
+ <object class="sfxlo-OptionalBox" id="Data-Section-Filter1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -6674,11 +6773,11 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">5</property>
+ <property name="position">7</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="SubtotalSection">
+ <object class="sfxlo-OptionalBox" id="Data-Section-Subtotal">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -6726,11 +6825,11 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">6</property>
+ <property name="position">8</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="SubtotalSection1">
+ <object class="sfxlo-OptionalBox" id="Data-Section-Subtotal1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -6777,11 +6876,11 @@
<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="GroupSection">
+ <object class="sfxlo-OptionalBox" id="Data-Section-Group">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -6832,11 +6931,11 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">8</property>
+ <property name="position">10</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="GroupSection1">
+ <object class="sfxlo-OptionalBox" id="Data-Section-Group1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -6872,11 +6971,11 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">9</property>
+ <property name="position">11</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="DefineSection">
+ <object class="sfxlo-OptionalBox" id="Data-Section-Define">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -6927,11 +7026,11 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">10</property>
+ <property name="position">12</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="DefineSection1">
+ <object class="sfxlo-OptionalBox" id="Data-Section-Define1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -6978,11 +7077,11 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">11</property>
+ <property name="position">13</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="TextToColumnSection">
+ <object class="sfxlo-OptionalBox" id="Data-Section-TextToColumn">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -7033,11 +7132,11 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">12</property>
+ <property name="position">14</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="TextToColumnSection1">
+ <object class="sfxlo-OptionalBox" id="Data-Section-TextToColumn1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -7084,11 +7183,11 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">13</property>
+ <property name="position">15</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="StatisticSection">
+ <object class="sfxlo-OptionalBox" id="Data-Section-Statistics">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -7132,7 +7231,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">14</property>
+ <property name="position">16</property>
</packing>
</child>
</object>
@@ -7251,7 +7350,7 @@
</packing>
</child>
<style>
- <class name="priority-10"/>
+ <class name="priority-11"/>
</style>
</object>
<packing>
@@ -7290,7 +7389,7 @@
</packing>
</child>
<style>
- <class name="priority-9"/>
+ <class name="priority-10"/>
</style>
</object>
<packing>
@@ -7382,7 +7481,7 @@
</packing>
</child>
<style>
- <class name="priority-8"/>
+ <class name="priority-9"/>
</style>
</object>
<packing>
@@ -7421,7 +7520,7 @@
</packing>
</child>
<style>
- <class name="priority-7"/>
+ <class name="priority-8"/>
</style>
</object>
<packing>
@@ -7476,7 +7575,7 @@
</packing>
</child>
<style>
- <class name="priority-6"/>
+ <class name="priority-7"/>
</style>
</object>
<packing>
@@ -7515,7 +7614,7 @@
</packing>
</child>
<style>
- <class name="priority-5"/>
+ <class name="priority-6"/>
</style>
</object>
<packing>
@@ -7607,7 +7706,7 @@
</packing>
</child>
<style>
- <class name="priority-4"/>
+ <class name="priority-5"/>
</style>
</object>
<packing>
@@ -7617,6 +7716,61 @@
</packing>
</child>
<child>
+ <object class="sfxlo-OptionalBox" id="Review-Section-Redact">
+ <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="separator66">
+ <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="SectionBottom171">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">both-horiz</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="Review-RedactDoc">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:RedactDoc</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-4"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">10</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-OptionalBox" id="Review-Section-Compare">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -7668,7 +7822,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">10</property>
+ <property name="position">11</property>
</packing>
</child>
<child>
@@ -7708,7 +7862,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">11</property>
+ <property name="position">12</property>
</packing>
</child>
<child>
@@ -7748,7 +7902,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">12</property>
+ <property name="position">13</property>
</packing>
</child>
</object>
@@ -8612,7 +8766,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-PriorityMergedHBox" id="GraphicContainer">
+ <object class="sfxlo-PriorityMergedHBox" id="ImageContainer">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -9166,6 +9320,367 @@
</packing>
</child>
<child>
+ <object class="sfxlo-OptionalBox" id="Draw-Section-Area3">
+ <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="separator25">
+ <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="SectionBottom166">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">text</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="Draw-FormatArea3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:FormatArea</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">11</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="Draw-Section-Area4">
+ <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="SectionBottom167">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">both-horiz</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="Draw-FillStyle2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:FillStyle</property>
+ </object>
+ <packing>
+ <property name="expand">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>
+ <style>
+ <class name="priority-21"/>
+ </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="Draw-Section-Shadow1">
+ <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="SectionBottom168">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="Draw-FillShadow2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:FillShadow</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-20"/>
+ </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="Draw-Section-AreaDialog1">
+ <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="Draw6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="Draw-FormatArea4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="visible_horizontal">False</property>
+ <property name="action_name">.uno:FormatArea</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">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">14</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="Draw-Section-Line6">
+ <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="ExtBottom17">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">text</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="Draw-FormatLine4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:FormatLine</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">15</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="Draw-Section-Line7">
+ <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="ExtBottom20">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="Draw-XLineColor2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:XLineColor</property>
+ </object>
+ <packing>
+ <property name="expand">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-18"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">16</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="Draw-Section-Line8">
+ <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="ExtBottom22">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkMenuToolButton" id="Draw-XLineStyle3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:XLineStyle</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-17"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">17</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="Draw-Section-Line9">
+ <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="ExtBottom29">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="Draw-LineWidth3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:LineWidth</property>
+ </object>
+ <packing>
+ <property name="expand">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-16"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">18</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="Draw-Section-LineDialog1">
+ <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="Draw7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="Draw-FormatLine5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="visible_horizontal">False</property>
+ <property name="action_name">.uno:FormatLine</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">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">19</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-OptionalBox" id="Graphic-Section-Crop">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -9214,7 +9729,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">11</property>
+ <property name="position">20</property>
</packing>
</child>
<child>
@@ -9272,7 +9787,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">12</property>
+ <property name="position">21</property>
</packing>
</child>
<child>
@@ -9310,7 +9825,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">13</property>
+ <property name="position">22</property>
</packing>
</child>
<child>
@@ -9365,7 +9880,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">14</property>
+ <property name="position">23</property>
</packing>
</child>
<child>
@@ -9405,7 +9920,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">15</property>
+ <property name="position">24</property>
</packing>
</child>
<child>
@@ -9444,7 +9959,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">16</property>
+ <property name="position">25</property>
</packing>
</child>
<child>
@@ -9483,7 +9998,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">17</property>
+ <property name="position">26</property>
</packing>
</child>
<child>
@@ -9534,7 +10049,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">18</property>
+ <property name="position">27</property>
</packing>
</child>
<child>
@@ -9581,7 +10096,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">19</property>
+ <property name="position">28</property>
</packing>
</child>
</object>
@@ -9628,7 +10143,7 @@
</child>
<child>
<object class="svtlo-ManagedMenuButton" id="Image-GraphicButton:MenuGraphic">
- <property name="label" translatable="yes" context="notebookbar_compact|GraphicMenuButton">_Graphic</property>
+ <property name="label" translatable="yes" context="notebookbar_compact|GraphicMenuButton">Im_age</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
@@ -10325,6 +10840,45 @@
</packing>
</child>
<child>
+ <object class="sfxlo-OptionalBox" id="Draw-Section-Shadow">
+ <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="SectionBottom39">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="Draw-FillShadow">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:FillShadow</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-20"/>
+ </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="Draw-Section-AreaDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -10359,7 +10913,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">13</property>
+ <property name="position">14</property>
</packing>
</child>
<child>
@@ -10396,7 +10950,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">14</property>
+ <property name="position">15</property>
</packing>
</child>
<child>
@@ -10435,7 +10989,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">15</property>
+ <property name="position">16</property>
</packing>
</child>
<child>
@@ -10474,7 +11028,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">16</property>
+ <property name="position">17</property>
</packing>
</child>
<child>
@@ -10513,7 +11067,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">17</property>
+ <property name="position">18</property>
</packing>
</child>
<child>
@@ -10552,7 +11106,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">18</property>
+ <property name="position">19</property>
</packing>
</child>
<child>
@@ -10590,7 +11144,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">19</property>
+ <property name="position">20</property>
</packing>
</child>
<child>
@@ -10652,7 +11206,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">20</property>
+ <property name="position">21</property>
</packing>
</child>
<child>
@@ -10699,7 +11253,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">21</property>
+ <property name="position">22</property>
</packing>
</child>
<child>
@@ -10737,7 +11291,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">22</property>
+ <property name="position">23</property>
</packing>
</child>
<child>
@@ -10813,7 +11367,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">23</property>
+ <property name="position">24</property>
</packing>
</child>
<child>
@@ -10863,7 +11417,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">24</property>
+ <property name="position">25</property>
</packing>
</child>
<child>
@@ -10928,7 +11482,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">25</property>
+ <property name="position">26</property>
</packing>
</child>
<child>
@@ -10989,18 +11543,9 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">26</property>
+ <property name="position">27</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="expand">True</property>
@@ -11763,23 +12308,21 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Object-Section-AreaDialog">
+ <object class="sfxlo-OptionalBox" id="Object-Section-Shadow">
<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="Object4">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom90">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Draw-FormatArea1">
+ <object class="GtkToolButton" id="Draw-FillShadow1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="visible_horizontal">False</property>
- <property name="action_name">.uno:FormatArea</property>
- <property name="icon_name">sfx2/res/symphony/open_more.png</property>
+ <property name="action_name">.uno:FillShadow</property>
</object>
<packing>
<property name="expand">False</property>
@@ -11793,6 +12336,9 @@
<property name="position">0</property>
</packing>
</child>
+ <style>
+ <class name="priority-17"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
@@ -11801,22 +12347,23 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Object-Section-Line1">
+ <object class="sfxlo-OptionalBox" id="Object-Section-AreaDialog">
<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="ExtBottom25">
+ <object class="sfxlo-NotebookbarToolBox" id="Object4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="toolbar_style">text</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Draw-FormatLine2">
+ <object class="GtkToolButton" id="Draw-FormatArea1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:FormatLine</property>
+ <property name="visible_horizontal">False</property>
+ <property name="action_name">.uno:FormatArea</property>
+ <property name="icon_name">sfx2/res/symphony/open_more.png</property>
</object>
<packing>
<property name="expand">False</property>
@@ -11827,7 +12374,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
@@ -11838,21 +12385,22 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Object-Section-Line2">
+ <object class="sfxlo-OptionalBox" id="Object-Section-Line1">
<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="ExtBottom26">
+ <object class="sfxlo-NotebookbarToolBox" id="ExtBottom25">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="toolbar_style">text</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Draw-XLineColor1">
+ <object class="GtkToolButton" id="Draw-FormatLine2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:XLineColor</property>
+ <property name="action_name">.uno:FormatLine</property>
</object>
<packing>
<property name="expand">False</property>
@@ -11866,9 +12414,6 @@
<property name="position">1</property>
</packing>
</child>
- <style>
- <class name="priority-18"/>
- </style>
</object>
<packing>
<property name="expand">False</property>
@@ -11877,21 +12422,21 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Object-Section-Line3">
+ <object class="sfxlo-OptionalBox" id="Object-Section-Line2">
<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="ExtBottom27">
+ <object class="sfxlo-NotebookbarToolBox" id="ExtBottom26">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkMenuToolButton" id="Draw-XLineStyle2">
+ <object class="GtkToolButton" id="Draw-XLineColor1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:XLineStyle</property>
+ <property name="action_name">.uno:XLineColor</property>
</object>
<packing>
<property name="expand">False</property>
@@ -11906,7 +12451,7 @@
</packing>
</child>
<style>
- <class name="priority-17"/>
+ <class name="priority-18"/>
</style>
</object>
<packing>
@@ -11916,21 +12461,21 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Object-Section-Line4">
+ <object class="sfxlo-OptionalBox" id="Object-Section-Line3">
<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="ExtBottom23">
+ <object class="sfxlo-NotebookbarToolBox" id="ExtBottom27">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Draw-LineWidth2">
+ <object class="GtkMenuToolButton" id="Draw-XLineStyle2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:LineWidth</property>
+ <property name="action_name">.uno:XLineStyle</property>
</object>
<packing>
<property name="expand">False</property>
@@ -11945,7 +12490,7 @@
</packing>
</child>
<style>
- <class name="priority-16"/>
+ <class name="priority-17"/>
</style>
</object>
<packing>
@@ -11955,21 +12500,21 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Object-Section-Line5">
+ <object class="sfxlo-OptionalBox" id="Object-Section-Line4">
<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="ExtBottom24">
+ <object class="sfxlo-NotebookbarToolBox" id="ExtBottom23">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Draw-LineEndStyle1">
+ <object class="GtkToolButton" id="Draw-LineWidth2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:LineEndStyle</property>
+ <property name="action_name">.uno:LineWidth</property>
</object>
<packing>
<property name="expand">False</property>
@@ -11984,7 +12529,7 @@
</packing>
</child>
<style>
- <class name="priority-15"/>
+ <class name="priority-16"/>
</style>
</object>
<packing>
@@ -12028,7 +12573,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">19</property>
+ <property name="position">20</property>
</packing>
</child>
</object>
@@ -13556,7 +14101,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
- <property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
<object class="GtkToolButton" id="Form-SwitchControlDesignMode">
@@ -13653,7 +14197,7 @@
</packing>
</child>
<style>
- <class name="priority-10"/>
+ <class name="priority-15"/>
</style>
</object>
<packing>
@@ -13692,7 +14236,7 @@
</packing>
</child>
<style>
- <class name="priority-8"/>
+ <class name="priority-14"/>
</style>
</object>
<packing>
@@ -13733,7 +14277,7 @@
</packing>
</child>
<style>
- <class name="priority-7"/>
+ <class name="priority-13"/>
</style>
</object>
<packing>
@@ -13834,7 +14378,7 @@
</packing>
</child>
<style>
- <class name="priority-6"/>
+ <class name="priority-12"/>
</style>
</object>
<packing>
@@ -13895,7 +14439,7 @@
</packing>
</child>
<style>
- <class name="priority-5"/>
+ <class name="priority-11"/>
</style>
</object>
<packing>
@@ -13959,7 +14503,7 @@
</packing>
</child>
<style>
- <class name="priority-4"/>
+ <class name="priority-10"/>
</style>
</object>
<packing>
@@ -14008,7 +14552,7 @@
</packing>
</child>
<style>
- <class name="priority-3"/>
+ <class name="priority-9"/>
</style>
</object>
<packing>
@@ -14018,15 +14562,15 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Form-Section-Label2">
+ <object class="sfxlo-OptionalBox" id="Form-Section-ControlProperties">
<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="separator139">
+ <object class="GtkSeparator" id="separator30">
<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="orientation">vertical</property>
@@ -14039,37 +14583,17 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="ExtBottom28">
+ <object class="sfxlo-NotebookbarToolBox" id="ExtBottom30">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Form-Label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Label</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="Form-Edit">
+ <object class="GtkToolButton" id="Form-ControlProperties">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:Edit</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="Form-CheckBox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:CheckBox</property>
+ <property name="action_name">.uno:ControlProperties</property>
</object>
<packing>
<property name="expand">False</property>
@@ -14091,43 +14615,99 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Form-Section-RadioButton">
+ <object class="sfxlo-OptionalBox" id="Form-Section-Properties">
<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="ExtBottom32">
+ <object class="sfxlo-NotebookbarToolBox" id="ExtBottom31">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Form-RadioButton">
+ <object class="GtkToolButton" id="Form-FormProperties1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:RadioButton</property>
+ <property name="action_name">.uno:FormProperties</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">10</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="Form-Section-ShowFmExplorer">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="ExtBottom33">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="toolbar_style">both-horiz</property>
+ <property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Form-ListBox1">
+ <object class="GtkToolButton" id="Form-ShowFmExplorer">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ListBox</property>
+ <property name="action_name">.uno:ShowFmExplorer</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-19"/>
+ </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="Form-Section-TabDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="ExtBottom37">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="toolbar_style">both-horiz</property>
+ <property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Form-ComboBox1">
+ <object class="GtkToolButton" id="Form-TabDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ComboBox</property>
+ <property name="action_name">.uno:TabDialog</property>
</object>
<packing>
<property name="expand">False</property>
@@ -14141,23 +14721,26 @@
<property name="position">1</property>
</packing>
</child>
+ <style>
+ <class name="priority-18"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">10</property>
+ <property name="position">12</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Form-Section-ControlProperties">
+ <object class="sfxlo-OptionalBox" id="Form-Section-OpenReadOnly">
<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="separator140">
+ <object class="GtkSeparator" id="separator67">
<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="orientation">vertical</property>
@@ -14170,16 +14753,17 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="ExtBottom34">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom31">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Form-ControlProperties1">
+ <object class="GtkToolButton" id="Form-OpenReadOnly">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ControlProperties</property>
+ <property name="action_name">.uno:OpenReadOnly</property>
</object>
<packing>
<property name="expand">False</property>
@@ -14193,30 +14777,33 @@
<property name="position">1</property>
</packing>
</child>
+ <style>
+ <class name="priority-17"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">11</property>
+ <property name="position">13</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Form-Section-Properties">
+ <object class="sfxlo-OptionalBox" id="Form-Section-AutoControlFocus">
<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="ExtBottom38">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom176">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Form-FormProperties2">
+ <object class="GtkToolButton" id="Form-AutoControlFocus">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:FormProperties</property>
+ <property name="action_name">.uno:AutoControlFocus</property>
</object>
<packing>
<property name="expand">False</property>
@@ -14227,37 +14814,77 @@
<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-16"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">12</property>
+ <property name="position">14</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Form-Section-ShowFmExplorer">
+ <object class="sfxlo-OptionalBox" id="Form-Section-LabelCheckbox">
<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="ExtBottom39">
+ <object class="GtkSeparator" id="separator75">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="toolbar_style">both-horiz</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="SectionBottom213">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Form-ShowFmExplorer1">
+ <object class="GtkToolButton" id="Tools-Label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ShowFmExplorer</property>
+ <property name="action_name">.uno:Label</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Tools-Edit1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:Edit</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Tools-CheckBox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:CheckBox</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -14268,36 +14895,58 @@
</packing>
</child>
<style>
- <class name="priority-14"/>
+ <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">15</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Form-Section-TabDialog">
+ <object class="sfxlo-OptionalBox" id="Form-Section-LabelCheckbox1">
<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="ExtBottom40">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom214">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="toolbar_style">both-horiz</property>
+ <property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Form-TabDialog1">
+ <object class="GtkToolButton" id="Tools-RadioButton1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:TabDialog</property>
+ <property name="action_name">.uno:RadioButton</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Tools-ListBox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ListBox</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Tools-ComboBox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ComboBox</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -14308,23 +14957,23 @@
</packing>
</child>
<style>
- <class name="priority-13"/>
+ <class name="priority-7"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">14</property>
+ <property name="position">16</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Form-Section-OpenReadOnly">
+ <object class="sfxlo-OptionalBox" id="Form-Section-Buttons">
<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="separator142">
+ <object class="GtkSeparator" id="separator107">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -14339,30 +14988,31 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom139">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom215">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Form-OpenReadOnly1">
+ <object class="GtkToolButton" id="Tools-Pushbutton1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:OpenReadOnly</property>
+ <property name="action_name">.uno:Pushbutton</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Form-AutoControlFocus1">
+ <object class="GtkToolButton" id="Tools-Imagebutton1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:AutoControlFocus</property>
+ <property name="action_name">.uno:Imagebutton</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -14373,23 +15023,23 @@
</packing>
</child>
<style>
- <class name="priority-12"/>
+ <class name="priority-6"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">15</property>
+ <property name="position">17</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Form-Section-Form-Farmatted1">
+ <object class="sfxlo-OptionalBox" id="Form-Section-Farmatted">
<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="separator30">
+ <object class="GtkSeparator" id="separator109">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -14404,13 +15054,13 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom31">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom216">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Form-FormattedField">
+ <object class="GtkToolButton" id="Tools-FormattedField1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:FormattedField</property>
@@ -14421,7 +15071,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Form-DateField">
+ <object class="GtkToolButton" id="Tools-DateField1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:DateField</property>
@@ -14432,7 +15082,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Form-TimeField">
+ <object class="GtkToolButton" id="Tools-TimeField1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:TimeField</property>
@@ -14450,29 +15100,29 @@
</packing>
</child>
<style>
- <class name="priority-2"/>
+ <class name="priority-5"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">16</property>
+ <property name="position">18</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Form-Section-Form-Farmatted2">
+ <object class="sfxlo-OptionalBox" id="Form-Section-Farmatted1">
<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="SectionBottom37">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom217">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Form-NumericField">
+ <object class="GtkToolButton" id="Tools-NumericField1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:NumericField</property>
@@ -14483,7 +15133,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Form-CurrencyField">
+ <object class="GtkToolButton" id="Tools-CurrencyField1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:CurrencyField</property>
@@ -14494,7 +15144,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Form-PatternField">
+ <object class="GtkToolButton" id="Tools-PatternField1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:PatternField</property>
@@ -14512,15 +15162,226 @@
</packing>
</child>
<style>
+ <class name="priority-4"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">19</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="Form-Section-GroupBox">
+ <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">
+ <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="SectionBottom218">
+ <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="Tools-GroupBox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:GroupBox</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-3"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">20</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="Form-Section-Controls">
+ <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="separator149">
+ <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">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom219">
+ <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="Tools-ImageControl1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ImageControl</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Tools-FileControl1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:FileControl</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-2"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">21</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="Form-Section-GridNavigationBar">
+ <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">
+ <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">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom177">
+ <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="Tools-Grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:Grid</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Tools-NavigationBar1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:NavigationBar</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <style>
<class name="priority-1"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">17</property>
+ <property name="position">22</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">True</property>
@@ -14986,7 +15847,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Tools-Section-Form-Wizzard">
+ <object class="sfxlo-OptionalBox" id="Tools-Section-Form-Wizard">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
index 0ba84e295b23..8accaa28262c 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
@@ -7027,7 +7027,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="Image-Image:MenuGraphic">
- <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ImageButton">_Image</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ImageButton">Im_age</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
index 85c5e7507dd0..a42ce9fd3e72 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!-- <?xml version="1.0" encoding="UTF-8"?> -->
<!-- Generated with glade 3.22.1 -->
<interface domain="sc">
<requires lib="gtk+" version="3.18"/>
@@ -5601,7 +5601,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="graphicB:MenuGraphic">
- <property name="label" translatable="yes" context="notebookbar_groupedbar_full|graphicB">_Graphic</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|graphicB">Im_age</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
generated by cgit (git 2.34.1) at 2024-08-04 16:32:35 +0000