sd/uiconfig/sdraw/ui/notebookbar.ui | 185 +++++-
sd/uiconfig/sdraw/ui/notebookbar_compact.ui | 183 +++++-
sd/uiconfig/simpress/ui/notebookbar.ui | 175 +++++
sd/uiconfig/simpress/ui/notebookbar_compact.ui | 761 +++++++++++++++----------
4 files changed, 974 insertions(+), 330 deletions(-)
New commits:
commit df42f27f3d455451e46a15d60e39e924a8d57ff7
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Tue Dec 10 22:00:00 2019 +0100
Commit: andreas_kainz <kain...@gmail.com>
CommitDate: Fri Dec 13 21:02:30 2019 +0100
Draw/Impress add Extension support to Tabbed NB
Change-Id: I44ab4107a826ed14bec770a4367cfb8eee09d316
Reviewed-on: https://gerrit.libreoffice.org/84900
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kain...@gmail.com>
(cherry picked from commit d755b2d4a3340f42a90d15d4795cc947a0b18e4a)
Reviewed-on: https://gerrit.libreoffice.org/85088
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui
b/sd/uiconfig/sdraw/ui/notebookbar.ui
index ff79272ca427..af2f48afa31b 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -82,6 +82,30 @@
</object>
</child>
</object>
+ <object class="GtkMenu" id="Menu Addons">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="NotebookBarAddonsMenuMergePoint" id="AddonCommands-Menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">AddonCommand</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="AddonSection-Separator">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="Menu-Extension-PackageManagerDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property>
+ </object>
+ </child>
+ </object>
<object class="GtkMenu" id="Menu Convert">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -17298,7 +17322,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom68">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom76">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
@@ -18076,6 +18100,145 @@
<property name="tab_fill">False</property>
</packing>
</child>
+ <child>
+ <object class="sfxlo-PriorityHBox" id="Extension Tab">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="sfxlo-PriorityMergedHBox" id="Extension">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <child>
+ <object class="NotebookBarAddonsToolMergePoint"
id="AddonCommand">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-DropdownBox" id="Extension-Menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <child>
+ <object class="GtkBox" id="Extension-Section">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="svtlo-ManagedMenuButton"
id="Extension-ExtensionButton:Menu Addons">
+ <property name="label" translatable="yes"
context="drawnotebookbar|FormMenuButton">E_xtension</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
+ <property name="receives_default">False</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="relief">none</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom68">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
+ <property name="hexpand">True</property>
+ <property
name="toolbar_style">both-horiz</property>
+ <property name="show_arrow">False</property>
+ <property name="icon_size">1</property>
+ <child>
+ <object class="GtkToolButton"
id="ExtensionMenu-ExtensionDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparator" id="separator50">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="pack_type">end</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">15</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="ExtensionLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="drawnotebookbar|ExtensionLabel">E~xtension</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="position">15</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
<child>
<object class="sfxlo-PriorityHBox" id="Tools Tab">
<property name="visible">True</property>
@@ -18516,7 +18679,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom76">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom77">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
@@ -18607,7 +18770,7 @@
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom77">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom89">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
@@ -18653,7 +18816,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom89">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom95">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
@@ -18744,7 +18907,7 @@
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom95">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom104">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
@@ -18790,7 +18953,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom104">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom118">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
@@ -18859,7 +19022,7 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="GtkSeparator" id="separator50">
+ <object class="GtkSeparator" id="separator58">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -18881,7 +19044,7 @@
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom118">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom121">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
@@ -18927,7 +19090,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom121">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom129">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
@@ -19030,7 +19193,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom129">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom147">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
@@ -19072,7 +19235,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator58">
+ <object class="GtkSeparator" id="separator67">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
index 9d3c8e517ea5..2b30487e5c78 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
@@ -82,6 +82,30 @@
</object>
</child>
</object>
+ <object class="GtkMenu" id="Menu Addons">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="NotebookBarAddonsMenuMergePoint" id="AddonCommands-Menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">AddonCommand</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="AddonSection-Separator">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="Menu-Extension-PackageManagerDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property>
+ </object>
+ </child>
+ </object>
<object class="GtkMenu" id="Menu Draw">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -18223,7 +18247,7 @@
<property name="can_focus">False</property>
<property name="valign">center</property>
<child>
- <object class="GtkSeparator" id="separator45">
+ <object class="GtkSeparator" id="separator86">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -18397,7 +18421,7 @@
<property name="can_focus">False</property>
<property name="valign">center</property>
<child>
- <object class="GtkSeparator" id="separator86">
+ <object class="GtkSeparator" id="separator89">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -18494,7 +18518,7 @@
<property name="can_focus">False</property>
<property name="valign">center</property>
<child>
- <object class="GtkSeparator" id="separator89">
+ <object class="GtkSeparator" id="separator95">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -18715,7 +18739,7 @@
<property name="can_focus">False</property>
<property name="valign">center</property>
<child>
- <object class="GtkSeparator" id="separator95">
+ <object class="GtkSeparator" id="separator98">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -18830,7 +18854,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator98">
+ <object class="GtkSeparator" id="separator103">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
@@ -19560,7 +19584,7 @@
<property name="can_focus">False</property>
<property name="valign">center</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom122">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom123">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -19599,7 +19623,7 @@
<property name="can_focus">False</property>
<property name="valign">center</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom123">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom124">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -19665,7 +19689,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom124">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom125">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -19818,7 +19842,7 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom125">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom126">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
@@ -19912,6 +19936,141 @@
<property name="tab_fill">False</property>
</packing>
</child>
+ <child>
+ <object class="sfxlo-PriorityHBox" id="Extension Tab">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="sfxlo-PriorityMergedHBox" id="Extension">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <child>
+ <object class="NotebookBarAddonsToolMergePoint"
id="AddonCommand">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-DropdownBox" id="Extension-Menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <child>
+ <object class="GtkBox" id="Extension-Section">
+ <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="SectionBottom122">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="ExtensionMenu-ExtensionDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="svtlo-ManagedMenuButton"
id="Extension-ExtensionButton:Menu Addons">
+ <property name="label" translatable="yes"
context="notebookbar_draw_compact|ExtensionMenuButton">E_xtension</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
+ <property name="receives_default">False</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="relief">none</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparator" id="separator45">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="pack_type">end</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">15</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="ExtensionLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="notebookbar_draw_compact|ExtensionLabel">E~xtension</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="position">15</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
<child>
<object class="sfxlo-PriorityHBox" id="Tools Tab">
<property name="visible">True</property>
@@ -20144,7 +20303,7 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="GtkSeparator" id="separator103">
+ <object class="GtkSeparator" id="separator123">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
@@ -20910,7 +21069,7 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom126">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom184">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
@@ -20962,7 +21121,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator123">
+ <object class="GtkSeparator" id="separator137">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui
b/sd/uiconfig/simpress/ui/notebookbar.ui
index 55fafb21fb42..712e9a9fbc12 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -4,6 +4,30 @@
<requires lib="gtk+" version="3.18"/>
<requires lib="LibreOffice" version="1.0"/>
<!-- interface-local-resource-path ../../../icon-themes/colibre/cmd/ -->
+ <object class="GtkMenu" id="Menu Addons">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="NotebookBarAddonsMenuMergePoint" id="AddonCommands-Menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">AddonCommand</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="AddonSection-Separator">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="Menu-Extension-PackageManagerDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property>
+ </object>
+ </child>
+ </object>
<object class="GtkMenu" id="Menu Convert">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -17971,7 +17995,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom41">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom74">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
@@ -18513,7 +18537,7 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="GtkSeparator" id="separator50">
+ <object class="GtkSeparator" id="separator47">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -18869,7 +18893,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom74">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom119">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
@@ -18936,7 +18960,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator47">
+ <object class="GtkSeparator" id="separator65">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
@@ -18972,6 +18996,145 @@
<property name="tab_fill">False</property>
</packing>
</child>
+ <child>
+ <object class="sfxlo-PriorityHBox" id="Extension Tab">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="sfxlo-PriorityMergedHBox" id="Extension">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <child>
+ <object class="NotebookBarAddonsToolMergePoint"
id="AddonCommand">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-DropdownBox" id="Extension-Menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <child>
+ <object class="GtkBox" id="Extension-Section">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="svtlo-ManagedMenuButton"
id="Extension-ExtensionButton:Menu Addons">
+ <property name="label" translatable="yes"
context="impressnotebookbar|FormMenuButton">E_xtension</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
+ <property name="receives_default">False</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="relief">none</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom41">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
+ <property name="hexpand">True</property>
+ <property
name="toolbar_style">both-horiz</property>
+ <property name="show_arrow">False</property>
+ <property name="icon_size">1</property>
+ <child>
+ <object class="GtkToolButton"
id="ExtensionMenu-ExtensionDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparator" id="separator50">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="pack_type">end</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">16</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="ExtensionLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="impressnotebookbar|ExtensionLabel">E~xtension</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="position">16</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
<child>
<object class="sfxlo-PriorityHBox" id="Tools Tab">
<property name="visible">True</property>
@@ -19978,7 +20141,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom119">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom149">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
@@ -20020,7 +20183,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator65">
+ <object class="GtkSeparator" id="separator85">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_compact.ui
b/sd/uiconfig/simpress/ui/notebookbar_compact.ui
index b655e4136d1b..16218969fcd7 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_compact.ui
@@ -82,6 +82,30 @@
</object>
</child>
</object>
+ <object class="GtkMenu" id="Menu Addons">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="NotebookBarAddonsMenuMergePoint" id="AddonCommands-Menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">AddonCommand</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="AddonSection-Separator">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="Menu-Extension-PackageManagerDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property>
+ </object>
+ </child>
+ </object>
<object class="GtkMenu" id="Menu Draw">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -6704,45 +6728,31 @@
</packing>
</child>
<child>
- <object class="sfxlo-PriorityHBox" id="Slide Show Tab">
+ <object class="sfxlo-PriorityHBox" id="Review Tab">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
<child>
- <object class="sfxlo-PriorityMergedHBox" id="Slide Show">
+ <object class="sfxlo-PriorityMergedHBox" id="Review">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="sfxlo-OptionalBox"
id="SlideShow-Section-Presentation">
+ <object class="sfxlo-OptionalBox"
id="Review-Section-Language">
<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="SectionBottom16">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom26">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="SlideShow-Presentation">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:Presentation</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton"
id="SlideShow-PresentationCurrentSlide">
+ <object class="GtkToolButton"
id="Review-SpellDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:PresentationCurrentSlide</property>
+ <property
name="action_name">.uno:SpellDialog</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6764,26 +6774,24 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox"
id="SlideShow-Section-PresentationDialog1">
+ <object class="sfxlo-OptionalBox"
id="Review-Section-SpellOnline">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="Draw7">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom134">
<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="Default-PresentationDialog">
+ <object class="GtkToolButton"
id="Review-SpellOnline">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="visible_horizontal">False</property>
- <property
name="action_name">.uno:PresentationDialog</property>
- <property
name="icon_name">sfx2/res/symphony/open_more.png</property>
+ <property
name="action_name">.uno:SpellOnline</property>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -6791,7 +6799,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>
@@ -6802,40 +6810,24 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox"
id="SlideShow-Section-RehearseTimings">
+ <object class="sfxlo-OptionalBox"
id="Review-Section-ThesaurusDialog">
<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="separator24">
- <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="SectionBottom17">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom85">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="SlideShow-RehearseTimings">
+ <object class="GtkToolButton"
id="Review-ThesaurusDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:RehearseTimings</property>
+ <property
name="action_name">.uno:ThesaurusDialog</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -6843,7 +6835,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<style>
@@ -6857,25 +6849,24 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox"
id="SlideShow-Section-CustomShowDialog">
+ <object class="sfxlo-OptionalBox"
id="Review-Section-Hyphenation">
<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="SectionBottom18">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom155">
<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="SlideShow-CustomShowDialog">
+ <object class="GtkToolButton"
id="Review-Hyphenation">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:CustomShowDialog</property>
+ <property
name="action_name">.uno:Hyphenation</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -6883,7 +6874,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<style>
@@ -6897,13 +6888,12 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox"
id="SlideShow-Section-PresentationDialog">
+ <object class="sfxlo-OptionalBox"
id="Review-Section-InsertAnnotation">
<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="separator1">
+ <object class="GtkSeparator" id="separator28">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -6918,35 +6908,29 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="LeftParaMargin2">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom118">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="valign">center</property>
- <property name="vexpand">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="SlideShow-PresentationDialog">
+ <object class="GtkToolButton"
id="Review-InsertAnnotation">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">center</property>
- <property
name="action_name">.uno:PresentationDialog</property>
+ <property
name="action_name">.uno:InsertAnnotation</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
- <style>
- <class name="priority-6"/>
- </style>
</object>
<packing>
<property name="expand">False</property>
@@ -6955,39 +6939,21 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox"
id="SlideShow-Section-SlideChangeWindow">
+ <object class="sfxlo-OptionalBox"
id="Review-Section-PreviousAnnotation">
<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">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom28">
<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="belowspacing2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
<property
name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="SlideShow-SlideChangeWindow">
+ <object class="GtkToolButton"
id="Review-PreviousAnnotation">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:SlideChangeWindow</property>
+ <property
name="action_name">.uno:PreviousAnnotation</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6997,12 +6963,12 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<style>
- <class name="priority-5"/>
+ <class name="priority-6"/>
</style>
</object>
<packing>
@@ -7012,24 +6978,21 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox"
id="SlideShow-Section-CustomAnimation">
+ <object class="sfxlo-OptionalBox"
id="Review-Section-NextAnnotation">
<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="belowspacing3">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom119">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="valign">center</property>
- <property name="vexpand">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="SlideShow-CustomAnimation">
+ <object class="GtkToolButton"
id="Review-NextAnnotation">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:CustomAnimation</property>
+ <property
name="action_name">.uno:NextAnnotation</property>
</object>
<packing>
<property name="expand">False</property>
@@ -7040,11 +7003,11 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<style>
- <class name="priority-4"/>
+ <class name="priority-5"/>
</style>
</object>
<packing>
@@ -7054,38 +7017,60 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox"
id="SlideShow-Section-PresentationMinimizer">
+ <object class="sfxlo-OptionalBox"
id="Review-Section-DeleteAnnotation">
<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="separator22">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom120">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
- <property name="orientation">vertical</property>
+ <property
name="toolbar_style">both-horiz</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Review-DeleteAnnotation">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:DeleteAnnotation</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="padding">5</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ <style>
+ <class name="priority-4"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox"
id="Review-Section-DeleteAllAnnotation">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="belowspacing4">
+ <object class="sfxlo-NotebookbarToolBox"
id="ExtBottom32">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <property
name="toolbar_style">both-horiz</property>
+ <property name="can_focus">False</property>
+ <property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="SlideShow-PresentationMinimizer">
+ <object class="GtkToolButton"
id="Review-DeleteAllAnnotation">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:PresentationMinimizer</property>
+ <property
name="visible_horizontal">False</property>
+ <property
name="action_name">.uno:DeleteAllAnnotation</property>
</object>
<packing>
<property name="expand">False</property>
@@ -7096,24 +7081,26 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">0</property>
</packing>
</child>
+ <style>
+ <class name="priority-3"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">7</property>
+ <property name="position">8</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox"
id="SlideShow-Section-OutputQualityColor">
+ <object class="sfxlo-OptionalBox"
id="Review-Section-ShowAnnotations">
<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="separator23">
+ <object class="GtkSeparator" id="separator97">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -7128,16 +7115,16 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom19">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom35">
<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>
- <object class="GtkToolButton"
id="SlideShow-OutputQualityColor">
+ <object class="GtkToolButton"
id="Review-ShowAnnotations">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:OutputQualityColor</property>
+ <property
name="action_name">.uno:ShowAnnotations</property>
</object>
<packing>
<property name="expand">False</property>
@@ -7158,26 +7145,41 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">8</property>
+ <property name="position">9</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox"
id="SlideShow-Section-OutputQualityGrayscale">
+ <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="sfxlo-NotebookbarToolBox"
id="SectionBottom20">
+ <object class="GtkSeparator" id="separator130">
<property name="visible">True</property>
- <property name="can_focus">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="SectionBottom220">
+ <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="SlideShow-OutputQualityGrayscale">
+ <object class="GtkToolButton"
id="Review-RedactDoc">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:OutputQualityGrayscale</property>
+ <property
name="action_name">.uno:RedactDoc</property>
</object>
<packing>
<property name="expand">False</property>
@@ -7198,7 +7200,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">9</property>
+ <property name="position">10</property>
</packing>
</child>
</object>
@@ -7209,14 +7211,14 @@
</packing>
</child>
<child>
- <object class="sfxlo-DropdownBox" id="SlideShow-Menu">
+ <object class="sfxlo-DropdownBox" id="Review-Menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom25">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom36">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
@@ -7224,11 +7226,11 @@
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="SlideShowMenu-Presentation">
+ <object class="GtkToolButton"
id="Review-AcceptTrackedChanges">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
- <property
name="action_name">.uno:Presentation</property>
+ <property
name="action_name">.uno:InsertAnnotation</property>
</object>
<packing>
<property name="expand">True</property>
@@ -7243,8 +7245,8 @@
</packing>
</child>
<child>
- <object class="svtlo-ManagedMenuButton"
id="SlideShow-SlideShowButton:Menu Slide Show">
- <property name="label" translatable="yes"
context="notebookbar_impress_compact|LayoutMenuButton">_Slide Show</property>
+ <object class="svtlo-ManagedMenuButton"
id="Review-ReviewButton:Menu Review">
+ <property name="label" translatable="yes"
context="notebookbar_impress_compact|ReviewMenuButton">_Review</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
@@ -7269,7 +7271,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator26">
+ <object class="GtkSeparator" id="separator150">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
@@ -7289,47 +7291,61 @@
</child>
</object>
<packing>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="SlideShowLabel">
+ <object class="GtkLabel" id="ReviewLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="notebookbar_impress_compact|LayoutLabel">~Slide Show</property>
+ <property name="label" translatable="yes"
context="notebookbar_impress_compact|ReviewLabel">~Review</property>
<property name="use_underline">True</property>
</object>
<packing>
- <property name="position">3</property>
+ <property name="position">4</property>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
- <object class="sfxlo-PriorityHBox" id="Review Tab">
+ <object class="sfxlo-PriorityHBox" id="Slide Show Tab">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<child>
- <object class="sfxlo-PriorityMergedHBox" id="Review">
+ <object class="sfxlo-PriorityMergedHBox" id="Slide Show">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="sfxlo-OptionalBox"
id="Review-Section-Language">
+ <object class="sfxlo-OptionalBox"
id="SlideShow-Section-Presentation">
<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="SectionBottom26">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom16">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Review-SpellDialog">
+ <object class="GtkToolButton"
id="SlideShow-Presentation">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:SpellDialog</property>
+ <property
name="action_name">.uno:Presentation</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="SlideShow-PresentationCurrentSlide">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:PresentationCurrentSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -7351,24 +7367,26 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox"
id="Review-Section-SpellOnline">
+ <object class="sfxlo-OptionalBox"
id="SlideShow-Section-PresentationDialog1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom134">
+ <object class="sfxlo-NotebookbarToolBox" id="Draw7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="toolbar_style">both-horiz</property>
+ <property name="valign">center</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Review-SpellOnline">
+ <object class="GtkToolButton"
id="Default-PresentationDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:SpellOnline</property>
+ <property
name="visible_horizontal">False</property>
+ <property
name="action_name">.uno:PresentationDialog</property>
+ <property
name="icon_name">sfx2/res/symphony/open_more.png</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -7376,7 +7394,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -7387,24 +7405,40 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox"
id="Review-Section-ThesaurusDialog">
+ <object class="sfxlo-OptionalBox"
id="SlideShow-Section-RehearseTimings">
<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="SectionBottom85">
+ <object class="GtkSeparator" id="separator24">
+ <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="SectionBottom17">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Review-ThesaurusDialog">
+ <object class="GtkToolButton"
id="SlideShow-RehearseTimings">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:ThesaurusDialog</property>
+ <property
name="action_name">.uno:RehearseTimings</property>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -7412,7 +7446,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>
@@ -7426,24 +7460,25 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox"
id="Review-Section-Hyphenation">
+ <object class="sfxlo-OptionalBox"
id="SlideShow-Section-CustomShowDialog">
<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="SectionBottom155">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom18">
<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-Hyphenation">
+ <object class="GtkToolButton"
id="SlideShow-CustomShowDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:Hyphenation</property>
+ <property
name="action_name">.uno:CustomShowDialog</property>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -7451,7 +7486,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>
@@ -7465,12 +7500,13 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox"
id="Review-Section-InsertAnnotation">
+ <object class="sfxlo-OptionalBox"
id="SlideShow-Section-PresentationDialog">
<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="separator28">
+ <object class="GtkSeparator" id="separator1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -7485,29 +7521,35 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom118">
+ <object class="sfxlo-NotebookbarToolBox"
id="LeftParaMargin2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<property
name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Review-InsertAnnotation">
+ <object class="GtkToolButton"
id="SlideShow-PresentationDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertAnnotation</property>
+ <property name="valign">center</property>
+ <property
name="action_name">.uno:PresentationDialog</property>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="homogeneous">True</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
+ <style>
+ <class name="priority-6"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
@@ -7516,60 +7558,39 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox"
id="Review-Section-PreviousAnnotation">
+ <object class="sfxlo-OptionalBox"
id="SlideShow-Section-SlideChangeWindow">
<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="SectionBottom28">
+ <object class="GtkSeparator" id="separator25">
<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-PreviousAnnotation">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:PreviousAnnotation</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="margin_top">5</property>
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
