[Libreoffice-commits] core.git: sw/uiconfig
andreas kainz (via logerrit)
logerrit at kemper.freedesktop.org
Wed Jul 31 23:22:59 UTC 2019
sw/uiconfig/swriter/ui/notebookbar.ui | 310 +++++++--------
sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 263 ++++++++----
2 files changed, 331 insertions(+), 242 deletions(-)
New commits:
commit 5c30c20101f72d973ff28c228f755e635cad14d5
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Wed Jul 31 23:29:47 2019 +0200
Commit: andreas_kainz <kainz.a at gmail.com>
CommitDate: Thu Aug 1 01:22:12 2019 +0200
NB writer: start with visibility support
Change-Id: Ib2b930b596a361e4999153b8f9d7b984cd3864d8
Reviewed-on: https://gerrit.libreoffice.org/76770
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index c2ea3f405612..c7c8ac3976c1 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sw">
<requires lib="gtk+" version="3.18"/>
<requires lib="LibreOffice" version="1.0"/>
@@ -2131,160 +2131,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="sfxlo-DropdownBox" id="File-Menu">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <child>
- <object class="GtkBox" id="GroupB8">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom80">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">end</property>
- <property name="hexpand">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
- <property name="icon_size">1</property>
- <child>
- <object class="GtkToolButton" id="File-CloseDoc">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:CloseDoc</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">end</property>
- <property name="hexpand">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
- <property name="icon_size">1</property>
- <child>
- <object class="GtkToolButton" id="File-HelpIndex">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:HelpIndex</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="GroupB7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="svtlo-ManagedMenuButton" id="File-FileButton:MenuFile">
- <property name="label" translatable="yes" context="WriterNotebookbar|FileMenuButton">_File</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="focus_on_click">False</property>
- <property name="receives_default">False</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <property name="resize_mode">immediate</property>
- <property name="relief">none</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="svtlo-ManagedMenuButton" id="File-HelpButton:MenuHelp">
- <property name="label" translatable="yes" context="WriterNotebookbar|HelpMenuButton">_Help</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="focus_on_click">False</property>
- <property name="receives_default">False</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <property name="resize_mode">immediate</property>
- <property name="relief">none</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator3">
- <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="File-Container">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -3079,6 +2925,160 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparator" id="separator3">
+ <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-DropdownBox" id="File-Menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <child>
+ <object class="GtkBox" id="GroupB8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom80">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="hexpand">True</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <property name="icon_size">1</property>
+ <child>
+ <object class="GtkToolButton" id="File-CloseDoc">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:CloseDoc</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="hexpand">True</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <property name="icon_size">1</property>
+ <child>
+ <object class="GtkToolButton" id="File-HelpIndex">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:HelpIndex</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="GroupB7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="svtlo-ManagedMenuButton" id="File-FileButton:MenuFile">
+ <property name="label" translatable="yes" context="WriterNotebookbar|FileMenuButton">_File</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
+ <property name="receives_default">False</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="resize_mode">immediate</property>
+ <property name="relief">none</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="svtlo-ManagedMenuButton" id="File-HelpButton:MenuHelp">
+ <property name="label" translatable="yes" context="WriterNotebookbar|HelpMenuButton">_Help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
+ <property name="receives_default">False</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="resize_mode">immediate</property>
+ <property name="relief">none</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index 07361a834dc8..7813098dd1b2 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -3411,28 +3411,27 @@
<property name="margin_right">5</property>
<property name="baseline_position">bottom</property>
<child>
- <object class="sfxlo-DropdownBox" id="ToolsSection">
+ <object class="sfxlo-DropdownBox" id="FileSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_right">5</property>
+ <property name="margin_left">5</property>
<property name="baseline_position">bottom</property>
<child>
- <object class="GtkBox" id="Ext2">
+ <object class="GtkBox" id="Section">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="baseline_position">top</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom2">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Tools-SearchDialog">
- <property name="visible">True</property>
+ <object class="GtkMenuToolButton" id="File-AddDirect">
<property name="can_focus">False</property>
- <property name="action_name">.uno:SearchDialog</property>
+ <property name="action_name">.uno:AddDirect</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3440,10 +3439,20 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Tools-HelpIndex">
+ <object class="GtkToolButton" id="File-NewDoc">
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:NewDoc</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkMenuToolButton" id="File-Open">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:HelpIndex</property>
+ <property name="action_name">.uno:Open</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3451,10 +3460,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Tools-CloseDoc">
+ <object class="GtkMenuToolButton" id="File-Save">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:CloseDoc</property>
+ <property name="action_name">.uno:Save</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3462,9 +3471,9 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Edit-Undo1">
+ <object class="GtkToolButton" id="File-SaveAs">
<property name="can_focus">False</property>
- <property name="action_name">.uno:Undo</property>
+ <property name="action_name">.uno:SaveAs</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3472,89 +3481,29 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Edit-Redo1">
+ <object class="GtkToolButton" id="File-ExportTo">
<property name="can_focus">False</property>
- <property name="action_name">.uno:Redo</property>
+ <property name="action_name">.uno:ExportTo</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="GtkBox" id="box34">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
- <object class="svtlo-ManagedMenuButton" id="Tools-Menu:MenuSettings">
- <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|MenuButton">_Menu</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="focus_on_click">False</property>
- <property name="receives_default">False</property>
- <property name="halign">end</property>
- <property name="hexpand">True</property>
- <property name="relief">none</property>
- <property name="use_underline">True</property>
+ <object class="GtkToolButton" id="File-ExportDirectToPDF">
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ExportDirectToPDF</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</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>
- </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="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-DropdownBox" id="FileSection">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">5</property>
- <property name="baseline_position">bottom</property>
- <child>
- <object class="GtkBox" id="Section">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="baseline_position">top</property>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
<child>
- <object class="GtkMenuToolButton" id="File-Open">
- <property name="visible">True</property>
+ <object class="GtkToolButton" id="File-ExportDirectToEPUB">
<property name="can_focus">False</property>
- <property name="action_name">.uno:Open</property>
+ <property name="action_name">.uno:ExportDirectToEPUB</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3562,10 +3511,9 @@
</packing>
</child>
<child>
- <object class="GtkMenuToolButton" id="File-Save">
- <property name="visible">True</property>
+ <object class="GtkToolButton" id="File-PrintPreview">
<property name="can_focus">False</property>
- <property name="action_name">.uno:Save</property>
+ <property name="action_name">.uno:PrintPreview</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3583,6 +3531,46 @@
<property name="homogeneous">True</property>
</packing>
</child>
+ <child>
+ <object class="GtkToolButton" id="File-PrintDefault">
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:PrintDefault</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="File-Signature">
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:Signature</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="File-SignPDF">
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:SignPDF</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="File-SetDocumentProperties">
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:SetDocumentProperties</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -3630,7 +3618,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -3744,7 +3732,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -12971,7 +12959,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -12986,6 +12974,107 @@
<property name="fill">False</property>
<property name="padding">5</property>
<property name="pack_type">end</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-DropdownBox" id="ToolsSection">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="baseline_position">bottom</property>
+ <child>
+ <object class="GtkBox" id="Ext2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="baseline_position">top</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom2">
+ <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-SearchDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:SearchDialog</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Tools-HelpIndex">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:HelpIndex</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Tools-CloseDoc">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:CloseDoc</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box34">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="svtlo-ManagedMenuButton" id="Tools-Menu:MenuSettings">
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|MenuButton">_Menu</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
+ <property name="receives_default">False</property>
+ <property name="halign">end</property>
+ <property name="hexpand">True</property>
+ <property name="relief">none</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</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">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
<property name="position">4</property>
</packing>
</child>
More information about the Libreoffice-commits
mailing list