sw/uiconfig/swriter/ui/notebookbar_compact.ui | 220 +++++++++++++--
sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 133 ++++++++-
2 files changed, 327 insertions(+), 26 deletions(-)
New commits:
commit 517df6f02f396fafa04c00d0b17743c59105bb7b
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Tue Jul 30 01:27:18 2019 +0200
Commit: andreas_kainz <kain...@gmail.com>
CommitDate: Tue Jul 30 13:57:25 2019 +0200
NB Extension support for tabbed_compact and groupedbar_compact
Change-Id: I00265a60f5a66c044bf2eafb627dd3af1c09e3ca
Reviewed-on: https://gerrit.libreoffice.org/76570
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kain...@gmail.com>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
index 3ad0789f58c4..4b55ff931b06 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_compact.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="MenuAddons">
+ <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="MenuDraw">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -17383,6 +17407,170 @@
</packing>
</child>
<child>
+ <object class="sfxlo-PriorityHBox" id="ExtensionBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <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">False</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:MenuAddons">
+ <property name="label" translatable="yes"
context="notebookbar_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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparator" id="separator94">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-PriorityMergedHBox"
id="Extension-Container">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <child>
+ <object class="sfxlo-OptionalBox" id="AddonSections">
+ <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="SectionBottom123">
+ <property name="visible">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>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="NotebookBarAddonsToolMergePoint"
id="AddonCommand">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">AddonCommand</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-30"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">14</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_compact|ExtensionLabel">E~xtension</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="position">14</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-PriorityHBox" id="ToolBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -17394,7 +17582,7 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom122">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom124">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
@@ -17477,7 +17665,7 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom123">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom125">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="toolbar_style">both-horiz</property>
@@ -17576,7 +17764,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom124">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom141">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="toolbar_style">both-horiz</property>
@@ -17692,7 +17880,7 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="GtkSeparator" id="separator94">
+ <object class="GtkSeparator" id="separator131">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
@@ -17710,7 +17898,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom125">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom142">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="toolbar_style">both-horiz</property>
@@ -17747,7 +17935,7 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom141">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom143">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
@@ -17802,7 +17990,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom142">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom144">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
@@ -17941,7 +18129,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom143">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom145">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
@@ -18007,7 +18195,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom144">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom147">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
@@ -18146,7 +18334,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom145">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom148">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
@@ -18186,7 +18374,7 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="GtkSeparator" id="separator131">
+ <object class="GtkSeparator" id="separator152">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -18201,7 +18389,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom147">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom149">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="toolbar_style">icons</property>
@@ -18252,7 +18440,7 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="GtkSeparator" id="separator152">
+ <object class="GtkSeparator" id="separator154">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -18318,7 +18506,7 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="GtkSeparator" id="separator154">
+ <object class="GtkSeparator" id="separator157">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -18333,7 +18521,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom148">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom189">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
@@ -18399,7 +18587,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom149">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom190">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index df45ffe7880d..07361a834dc8 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -48,6 +48,30 @@
</object>
</child>
</object>
+ <object class="GtkMenu" id="MenuAddons">
+ <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="MenuArrange">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -3791,6 +3815,7 @@
<property name="can_focus">True</property>
<property
name="focus_on_click">False</property>
<property
name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="relief">none</property>
<property
name="use_underline">True</property>
</object>
@@ -3852,7 +3877,7 @@
</packing>
</child>
<style>
- <class name="priority-8"/>
+ <class name="priority-9"/>
</style>
</object>
<packing>
@@ -3982,12 +4007,13 @@
<property name="can_focus">True</property>
<property
name="focus_on_click">False</property>
<property
name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="relief">none</property>
<property
name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -4201,6 +4227,7 @@
<property name="can_focus">True</property>
<property
name="focus_on_click">False</property>
<property
name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="relief">none</property>
<property
name="use_underline">True</property>
</object>
@@ -4225,7 +4252,7 @@
</packing>
</child>
<style>
- <class name="priority-7"/>
+ <class name="priority-8"/>
</style>
</object>
<packing>
@@ -4345,7 +4372,7 @@
</packing>
</child>
<style>
- <class name="priority-6"/>
+ <class name="priority-7"/>
</style>
</object>
<packing>
@@ -4446,6 +4473,7 @@
<property name="can_focus">True</property>
<property
name="focus_on_click">False</property>
<property
name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="relief">none</property>
<property
name="use_underline">True</property>
</object>
@@ -4496,7 +4524,7 @@
</packing>
</child>
<style>
- <class name="priority-5"/>
+ <class name="priority-6"/>
</style>
</object>
<packing>
@@ -4597,6 +4625,7 @@
<property name="can_focus">True</property>
<property
name="focus_on_click">False</property>
<property
name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="relief">none</property>
<property
name="use_underline">True</property>
</object>
@@ -4621,7 +4650,7 @@
</packing>
</child>
<style>
- <class name="priority-4"/>
+ <class name="priority-5"/>
</style>
</object>
<packing>
@@ -4711,6 +4740,7 @@
<property name="can_focus">True</property>
<property
name="focus_on_click">False</property>
<property
name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="relief">none</property>
<property
name="use_underline">True</property>
</object>
@@ -4735,7 +4765,7 @@
</packing>
</child>
<style>
- <class name="priority-3"/>
+ <class name="priority-4"/>
</style>
</object>
<packing>
@@ -4849,7 +4879,7 @@
</packing>
</child>
<style>
- <class name="priority-2"/>
+ <class name="priority-3"/>
</style>
</object>
<packing>
@@ -4887,7 +4917,6 @@
<object class="sfxlo-NotebookbarToolBox"
id="SectionBottom52">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">end</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
@@ -4955,7 +4984,7 @@
</packing>
</child>
<style>
- <class name="priority-1"/>
+ <class name="priority-2"/>
</style>
</object>
<packing>
@@ -4964,6 +4993,90 @@
<property name="position">8</property>
</packing>
</child>
+ <child>
+ <object class="sfxlo-OptionalBox"
id="Default-Section-Extension">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="baseline_position">bottom</property>
+ <child>
+ <object class="GtkSeparator" id="separator47">
+ <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="Section54">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom58">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <property name="icon_size">2</property>
+ <child>
+ <object
class="NotebookBarAddonsToolMergePoint" id="AddonCommand">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">AddonCommand</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:MenuAddons">
+ <property name="label" translatable="yes"
context="notebookbar_groupedbar_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">start</property>
+ <property name="relief">none</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</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-1"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">9</property>
+ </packing>
+ </child>
<style>
<class name="context-default"/>
<class name="context-Text"/>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
