sw/uiconfig/swriter/ui/notebookbar.ui | 5 - sw/uiconfig/swriter/ui/notebookbar_compact.ui | 33 ------ sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 72 ++++----------- 3 files changed, 27 insertions(+), 83 deletions(-)
New commits: commit ebdb8a832aca93d295b9115363e15d0f2e2a18f6 Author: Sumit Chauhan <[email protected]> AuthorDate: Tue Sep 10 15:17:34 2019 +0530 Commit: Szymon Kłos <[email protected]> CommitDate: Mon Sep 16 17:30:34 2019 +0200 Modified writer's notebookbar*.ui file to display extension Change-Id: I52793cec017939bf525cae11cc5eff0693620cf7 Reviewed-on: https://gerrit.libreoffice.org/78799 Tested-by: Jenkins Reviewed-by: Szymon Kłos <[email protected]> diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui index 06149f4798ce..eaf946e40253 100644 --- a/sw/uiconfig/swriter/ui/notebookbar.ui +++ b/sw/uiconfig/swriter/ui/notebookbar.ui @@ -17440,11 +17440,14 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="NotebookBarAddonsToolMergePoint" id="AddonCommands"> + <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> + <property name="toolbar_style">both</property> + <property name="show_arrow">False</property> + <property name="icon_size">3</property> </object> <packing> <property name="expand">False</property> diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_compact.ui index 4b55ff931b06..e57604ff8a6f 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui @@ -17505,45 +17505,16 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="AddonSections"> + <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> - <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> + <property name="position">1</property> </packing> </child> </object> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui index 7813098dd1b2..c511dae7226e 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui @@ -4982,48 +4982,21 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-Extension"> + <object class="GtkBox" id="ExtensionSection1"> <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> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="Section54"> + <object class="GtkBox" id="ExtensionSection2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom58"> + <object class="NotebookBarAddonsToolMergePoint" id="AddonCommand"> <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> @@ -5031,33 +5004,30 @@ <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">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> - <style> - <class name="priority-1"/> - </style> </object> <packing> <property name="expand">False</property> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
