sw/uiconfig/swriter/ui/notebookbar.ui | 667 +-
sw/uiconfig/swriter/ui/notebookbar_compact.ui | 123
sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 4525 ++++++++-------
sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 569 +
4 files changed, 3862 insertions(+), 2022 deletions(-)
New commits:
commit e15ef2649d6aa15452a4be1f9e841ea8b349e908
Author: andreas kainz <kain...@gmail.com>
Date: Wed Jul 4 17:04:09 2018 +0200
NB writer: add printpreview to all NB implementations
Change-Id: I763811ba4f0a5a9096be0b5d7f139a3acdb0086a
Reviewed-on: https://gerrit.libreoffice.org/56955
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kain...@gmail.com>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui
b/sw/uiconfig/swriter/ui/notebookbar.ui
index f7fd0a5b5d99..a2a609ef8bf5 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -1098,6 +1098,92 @@
</object>
</child>
</object>
+ <object class="GtkMenu" id="MenuPrint">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="ShowSinglePageD">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ShowSinglePage</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="ShowTwoPagesD">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ShowTwoPages</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="ShowBookviewD">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ShowBookview</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="ShowMultiplePagesD">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ShowMultiplePages</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separator137">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="GoToStartOfDocD">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:GoToStartOfDoc</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="PageUpD">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:PageUp</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="PageDownD">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:PageDown</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="GoToEndOfDocD">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:GoToEndOfDoc</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separator147">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="PrintD">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:Print</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="ClosePreviewD">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ClosePreview</property>
+ </object>
+ </child>
+ </object>
<object class="GtkMenu" id="MenuReference">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -12249,6 +12335,447 @@
</packing>
</child>
<child>
+ <object class="sfxlo-PriorityHBox" id="PrintBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="sfxlo-PriorityMergedHBox"
id="PrintPreviewContainer">
+ <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="ShowPageGroup">
+ <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="first22">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="resize_mode">immediate</property>
+ <property name="toolbar_style">both</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Print-ShowSinglePage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:ShowSinglePage</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Print-ShowTwoPages">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:ShowTwoPages</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Print-ShowBookview">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:ShowBookview</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkMenuToolButton"
id="Print-ShowMultiplePages">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property
name="action_name">.uno:ShowMultiplePages</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparator" id="separator74">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-1"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="ArrangeGroup">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <child>
+ <object class="GtkBox" id="box4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="first6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="resize_mode">immediate</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Print-GoToStartOfDoc">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:GoToStartOfDoc</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Print-PageUp">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:PageUp</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Print-JumpToSpecificPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:JumpToSpecificPage</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Print-PageDown">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:PageDown</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Print-GoToEndOfDoc">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:GoToEndOfDoc</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">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="second7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="resize_mode">immediate</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Print-ZoomMinus">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:ZoomMinus</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Print-PreviewZoom">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:PreviewZoom</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Print-ZoomPlus">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:ZoomPlus</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Print-FullScreen">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:FullScreen</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">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="GtkSeparator" id="separator75">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="PrintGroup">
+ <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="first3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="resize_mode">immediate</property>
+ <property name="toolbar_style">both</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="Print-Print">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:Print</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">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparator" id="separator105">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</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="Printmenu">
+ <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="GroupB78">
+ <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="print:MenuPrint">
+ <property name="label" translatable="yes"
context="notebookbar|PrintMenuButton">_Print</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</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>
+ <property name="focus_on_click">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom79">
+ <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">both-horiz</property>
+ <property name="show_arrow">False</property>
+ <property name="icon_size">1</property>
+ <child>
+ <object class="GtkToolButton"
id="Print-ClosePreview">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:ClosePreview</property>
+ </object>
+ <packing>
+ <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="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>
+ <child>
+ <object class="GtkSeparator" id="separator114">
+ <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">3</property>
+ </packing>
+ </child>
+ <style>
+ <class name="context-Printpreview"/>
+ </style>
+ </object>
+ <packing>
+ <property name="position">10</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="PrintLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="notebookbar|PrintLabel">Print</property>
+ <style>
+ <class name="context-Printpreview"/>
+ </style>
+ </object>
+ <packing>
+ <property name="position">12</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-PriorityHBox" id="MediaBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -12265,14 +12792,14 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="first22">
+ <object class="sfxlo-NotebookbarToolBox" id="first4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="resize_mode">immediate</property>
<property
name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Media-AVMediaPlayer">
+ <object class="GtkToolButton"
id="Media-AVMediaPlayer1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:AVMediaPlayer</property>
@@ -12290,7 +12817,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator74">
+ <object class="GtkSeparator" id="separator25">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -12312,13 +12839,13 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="MediaGroup1">
+ <object class="sfxlo-OptionalBox" id="MediaGroup2">
<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="first3">
+ <object class="sfxlo-NotebookbarToolBox" id="first5">
<property name="width_request">1000</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -12326,7 +12853,7 @@
<property
name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Media-AVMediaToolBox1">
+ <object class="GtkToolButton"
id="Media-AVMediaToolBox2">
<property name="width_request">800</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -12346,7 +12873,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator137">
+ <object class="GtkSeparator" id="separator31">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -12371,25 +12898,25 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="WrapGroupe">
+ <object class="sfxlo-OptionalBox" id="WrapGroupe1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="GtkBox" id="GroupB76">
+ <object class="GtkBox" id="GroupB49">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="Wrap6">
+ <object class="sfxlo-NotebookbarToolBox"
id="Wrap9">
<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="Media-WrapLeft">
+ <object class="GtkToolButton"
id="Media-WrapLeft1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:WrapLeft</property>
@@ -12400,7 +12927,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="Media-WrapThrough">
+ <object class="GtkToolButton"
id="Media-WrapThrough1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:WrapThrough</property>
@@ -12411,7 +12938,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="Media-WrapRight">
+ <object class="GtkToolButton"
id="Media-WrapRight1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:WrapRight</property>
@@ -12422,7 +12949,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="Media-WrapContour">
+ <object class="GtkToolButton"
id="Media-WrapContour1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:WrapContour</property>
@@ -12440,13 +12967,13 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="Wrap5">
+ <object class="sfxlo-NotebookbarToolBox"
id="Wrap10">
<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="Media-WrapOff">
+ <object class="GtkToolButton"
id="Media-WrapOff1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:WrapOff</property>
@@ -12457,7 +12984,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="Media-WrapOn">
+ <object class="GtkToolButton"
id="Media-WrapOn1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:WrapOn</property>
@@ -12468,7 +12995,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="Media-WrapIdeal">
+ <object class="GtkToolButton"
id="Media-WrapIdeal1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:WrapIdeal</property>
@@ -12493,7 +13020,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator75">
+ <object class="GtkSeparator" id="separator32">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -12518,25 +13045,25 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="AlignGroup">
+ <object class="sfxlo-OptionalBox" id="AlignGroup2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="GtkBox" id="GroupB75">
+ <object class="GtkBox" id="GroupB52">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="Align5">
+ <object class="sfxlo-NotebookbarToolBox"
id="Align1">
<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="Media-AlignTop">
+ <object class="GtkToolButton"
id="Media-AlignTop1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:AlignTop</property>
@@ -12547,7 +13074,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="Media-AlignVerticalCenter">
+ <object class="GtkToolButton"
id="Media-AlignVerticalCenter1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:AlignVerticalCenter</property>
@@ -12558,7 +13085,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="Media-AlignBottom">
+ <object class="GtkToolButton"
id="Media-AlignBottom1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:AlignBottom</property>
@@ -12576,13 +13103,13 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="Align6">
+ <object class="sfxlo-NotebookbarToolBox"
id="Align2">
<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="Media-AlignLeft">
+ <object class="GtkToolButton"
id="Media-AlignLeft1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:AlignLeft</property>
@@ -12593,7 +13120,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="Media-AlignHorizontalCenter">
+ <object class="GtkToolButton"
id="Media-AlignHorizontalCenter1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:AlignHorizontalCenter</property>
@@ -12604,7 +13131,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="Media-AlignRight">
+ <object class="GtkToolButton"
id="Media-AlignRight1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:AlignRight</property>
@@ -12629,7 +13156,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator105">
+ <object class="GtkSeparator" id="separator37">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -12661,14 +13188,14 @@
</packing>
</child>
<child>
- <object class="sfxlo-DropdownBox" id="Mediamenu">
+ <object class="sfxlo-DropdownBox" id="Mediamenu1">
<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="GroupB78">
+ <object class="GtkBox" id="GroupB53">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -12692,7 +13219,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom79">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom25">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
@@ -12701,7 +13228,7 @@
<property name="show_arrow">False</property>
<property name="icon_size">1</property>
<child>
- <object class="GtkToolButton"
id="Media-TransformDialog">
+ <object class="GtkToolButton"
id="Media-TransformDialog1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:TransformDialog</property>
@@ -12712,7 +13239,7 @@
</packing>
</child>
<child>
- <object class="GtkMenuToolButton"
id="Media-AnchorMenu">
+ <object class="GtkMenuToolButton"
id="Media-AnchorMenu1">
<property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -12746,7 +13273,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator114">
+ <object class="GtkSeparator" id="separator38">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
@@ -12801,7 +13328,7 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom25">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom26">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -12831,7 +13358,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="GroupB49">
+ <object class="GtkBox" id="GroupB54">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -12841,7 +13368,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom26">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom27">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="toolbar_style">both-horiz</property>
@@ -12865,7 +13392,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom27">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom28">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="toolbar_style">icons</property>
@@ -12935,7 +13462,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom28">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom30">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="toolbar_style">text</property>
@@ -12974,7 +13501,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator25">
+ <object class="GtkSeparator" id="separator41">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -13002,7 +13529,7 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom30">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom31">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -13040,7 +13567,7 @@
<property name="can_focus">False</property>
<property
name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="Wrap9">
+ <object class="sfxlo-NotebookbarToolBox"
id="Wrap11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="toolbar_style">icons</property>
@@ -13086,7 +13613,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="Wrap10">
+ <object class="sfxlo-NotebookbarToolBox"
id="Wrap12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="toolbar_style">icons</property>
@@ -13139,7 +13666,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator31">
+ <object class="GtkSeparator" id="separator81">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="orientation">vertical</property>
@@ -13157,7 +13684,7 @@
<property name="can_focus">False</property>
<property
name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="Align1">
+ <object class="sfxlo-NotebookbarToolBox"
id="Align9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="toolbar_style">icons</property>
@@ -13203,7 +13730,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="Align2">
+ <object class="sfxlo-NotebookbarToolBox"
id="Align10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="toolbar_style">icons</property>
@@ -13256,7 +13783,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator32">
+ <object class="GtkSeparator" id="separator82">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="orientation">vertical</property>
@@ -13358,7 +13885,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator37">
+ <object class="GtkSeparator" id="separator83">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -13389,13 +13916,13 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="GtkBox" id="GroupB52">
+ <object class="GtkBox" id="GroupB55">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom31">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom54">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -13454,7 +13981,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator38">
+ <object class="GtkSeparator" id="separator84">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -13512,7 +14039,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="GroupB53">
+ <object class="GtkBox" id="GroupB56">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -13577,7 +14104,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator41">
+ <object class="GtkSeparator" id="separator86">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -13619,7 +14146,7 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="GtkBox" id="GroupB54">
+ <object class="GtkBox" id="GroupB71">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -13687,7 +14214,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator81">
+ <object class="GtkSeparator" id="separator88">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
@@ -13806,7 +14333,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator82">
+ <object class="GtkSeparator" id="separator89">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
@@ -13874,7 +14401,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="GroupB55">
+ <object class="GtkBox" id="GroupB77">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -13936,7 +14463,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator83">
+ <object class="GtkSeparator" id="separator115">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -13991,7 +14518,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="GroupB56">
+ <object class="GtkBox" id="GroupB85">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -14057,7 +14584,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator84">
+ <object class="GtkSeparator" id="separator140">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -14115,7 +14642,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="GroupB71">
+ <object class="GtkBox" id="GroupB86">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -14181,7 +14708,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator86">
+ <object class="GtkSeparator" id="separator141">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -14212,7 +14739,7 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="GtkBox" id="GroupB85">
+ <object class="GtkBox" id="GroupB88">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -14384,7 +14911,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator88">
+ <object class="GtkSeparator" id="separator142">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -14415,7 +14942,7 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="GtkBox" id="GroupB86">
+ <object class="GtkBox" id="GroupB89">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -14521,7 +15048,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator115">
+ <object class="GtkSeparator" id="separator144">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -14552,7 +15079,7 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="GtkBox" id="GroupB88">
+ <object class="GtkBox" id="GroupB91">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -14658,7 +15185,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator89">
+ <object class="GtkSeparator" id="separator145">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
index 33371db745fa..3c2bb16b9efb 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
@@ -1214,6 +1214,92 @@
</object>
</child>
</object>
+ <object class="GtkMenu" id="MenuPrint">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="ShowSinglePageD">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ShowSinglePage</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="ShowTwoPagesD">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ShowTwoPages</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="ShowBookviewD">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ShowBookview</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="ShowMultiplePagesD">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ShowMultiplePages</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separator109">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="GoToStartOfDocD">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:GoToStartOfDoc</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="PageUpD">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:PageUp</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="PageDownD">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:PageDown</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="GoToEndOfDocD">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:GoToEndOfDoc</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separator110">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="PrintD">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:Print</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="ClosePreviewD">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ClosePreview</property>
+ </object>
+ </child>
+ </object>
<object class="GtkMenu" id="MenuReference">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -10335,7 +10421,7 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="sfxlo-OptionalBox"
id="PageLayoutsECTION1">
+ <object class="sfxlo-OptionalBox"
id="PageLayoutsSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -10412,6 +10498,9 @@
<property name="position">2</property>
</packing>
</child>
+ <style>
+ <class name="priority-1"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
@@ -10420,7 +10509,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox"
id="NavigationSection1">
+ <object class="sfxlo-OptionalBox" id="NavigationSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -10508,6 +10597,9 @@
<property name="position">2</property>
</packing>
</child>
+ <style>
+ <class name="priority-2"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
@@ -10528,7 +10620,7 @@
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="PrintPreview-ZoomMinus1">
+ <object class="GtkToolButton"
id="PrintPreview-ZoomMinus">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:ZoomMinus</property>
@@ -10539,7 +10631,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="PrintPreview-PreviewZoom1">
+ <object class="GtkToolButton"
id="PrintPreview-PreviewZoom">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:PreviewZoom</property>
@@ -10550,7 +10642,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="PrintPreview-ZoomPlus1">
+ <object class="GtkToolButton"
id="PrintPreview-ZoomPlus">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:ZoomPlus</property>
@@ -10561,7 +10653,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="PrintPreview-FullScreen1">
+ <object class="GtkToolButton"
id="PrintPreview-FullScreen">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:FullScreen</property>
@@ -10593,6 +10685,9 @@
<property name="position">2</property>
</packing>
</child>
+ <style>
+ <class name="priority-3"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
@@ -10653,7 +10748,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="CloseSection1">
+ <object class="sfxlo-OptionalBox" id="CloseSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -10704,12 +10799,6 @@
<property name="position">4</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="expand">True</property>
@@ -10752,8 +10841,8 @@
</packing>
</child>
<child>
- <object class="svtlo-ManagedMenuButton"
id="PrintPreview-PrintPreviewButton:MenuPrintPreview">
- <property name="label" translatable="yes"
context="notebookbar_compact|PrintPreviewButton">Print Preview</property>
+ <object class="svtlo-ManagedMenuButton"
id="print:MenuPrint">
+ <property name="label" translatable="yes"
context="notebookbar_compact|PrintPreviewButton">Print</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -10797,7 +10886,7 @@
</packing>
</child>
<style>
- <class name="Context-Printpreview"/>
+ <class name="context-Printpreview"/>
</style>
</object>
<packing>
@@ -10808,7 +10897,7 @@
<object class="GtkLabel" id="PrintPreviewLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="notebookbar_compact|PrintPreviewLabel">Print Preview</property>
+ <property name="label" translatable="yes"
context="notebookbar_compact|PrintPreviewLabel">Print</property>
<style>
<class name="context-Printpreview"/>
</style>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index 6f86c2533507..edecf7e0e297 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -1797,6 +1797,58 @@
</object>
</child>
</object>
+ <object class="GtkMenu" id="MenuNavigate">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="GoToStartOfDocD1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:GoToStartOfDoc</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="PageUpD1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:PageUp</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="PageDownD1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:PageDown</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="GoToEndOfDocD1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:GoToEndOfDoc</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separator102">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="PrintD1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:Print</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="ClosePreviewD1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ClosePreview</property>
+ </object>
+ </child>
+ </object>
<object class="GtkMenu" id="MenuOLE">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -2047,6 +2099,24 @@
</object>
</child>
</object>
+ <object class="GtkMenu" id="MenuPrint">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="PrintD">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:Print</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="ClosePreviewD">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ClosePreview</property>
+ </object>
+ </child>
+ </object>
<object class="GtkMenu" id="MenuReference">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -3206,6 +3276,31 @@
</object>
</child>
</object>
+ <object class="GtkMenu" id="MenuZoom">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="ZoomMinus">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ZoomMinus</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="ZoomPlus">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ZoomPlus</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="FullScreen">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:FullScreen</property>
+ </object>
+ </child>
+ </object>
<object class="GtkGrid" id="NotebookBar">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -4720,15 +4815,15 @@
</packing>
</child>
<child>
- <object class="sfxlo-PriorityMergedHBox" id="TableContainer">
+ <object class="sfxlo-PriorityMergedHBox" id="PrintContainer">
<property name="can_focus">False</property>
<child>
- <object class="sfxlo-OptionalBox" id="StylesSection1">
+ <object class="sfxlo-OptionalBox" id="PrintSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="baseline_position">bottom</property>
<child>
- <object class="GtkSeparator" id="separator3">
+ <object class="GtkSeparator" id="separator73">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
@@ -4741,27 +4836,39 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="Section10">
+ <object class="GtkBox" id="Section41">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom1">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom36">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="toolbar_style">icons</property>
+ <property name="valign">end</property>
+ <property
name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="StyleApply1">
+ <object class="GtkToolButton"
id="Print-Print">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:StyleApply</property>
+ <property
name="action_name">.uno:Print</property>
</object>
<packing>
<property name="expand">False</property>
<property
name="homogeneous">True</property>
</packing>
</child>
+ <child>
+ <object class="GtkToolButton"
id="Print-ClosePreview">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:ClosePreview</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -4770,12 +4877,12 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box17">
+ <object class="GtkBox" id="box50">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="svtlo-ManagedMenuButton"
id="paragraphstylet:MenuStyle">
- <property name="label" translatable="yes"
context="notebookbar_groupedbar_compact|StyleButton">St_yles</property>
+ <object class="svtlo-ManagedMenuButton"
id="print:MenuPrint">
+ <property name="label" translatable="yes"
context="notebookbar_groupedbar_compact|PrintMenuButton">_Print</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
@@ -4785,36 +4892,24 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="ExtTop1">
+ <object class="sfxlo-NotebookbarToolBox"
id="ExtTop9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="opacity">0.92156862745098034</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="FormatPaintbrush1">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="action_name">.uno:FormatPaintbrush</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton"
id="ResetAttributes1">
+ <object class="GtkToolButton"
id="Print-PageDialog">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="action_name">.uno:ResetAttributes</property>
+ <property
name="action_name">.uno:PageDialog</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -4823,7 +4918,7 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
@@ -4842,9 +4937,6 @@
<property name="position">1</property>
</packing>
</child>
- <style>
- <class name="priority-8"/>
- </style>
</object>
<packing>
<property name="expand">False</property>
@@ -4853,12 +4945,12 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="FormatSection1">
+ <object class="sfxlo-OptionalBox"
id="SlideLayoutSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="baseline_position">bottom</property>
<child>
- <object class="GtkSeparator" id="separator123">
+ <object class="GtkSeparator" id="separator110">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
@@ -4871,74 +4963,61 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="Section34">
+ <object class="GtkBox" id="Section45">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkBox" id="box18">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom42">
<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>
- <object class="sfxlo-NotebookbarToolBox"
id="ExtBottom1">
+ <object class="GtkToolButton"
id="Print-ShowSinglePage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property
name="toolbar_style">icons</property>
- <property
name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton"
id="CharFontName1">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="hexpand">True</property>
- <property
name="action_name">.uno:CharFontName</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
+ <property
name="action_name">.uno:ShowSinglePage</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="expand">False</property>
+ <property
name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom10">
+ <object class="GtkToolButton"
id="Print-ShowTwoPages">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">5</property>
- <property
name="toolbar_style">icons</property>
- <property
name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton"
id="FontHeight1">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="action_name">.uno:FontHeight</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkMenuToolButton"
id="BackColor1">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="action_name">.uno:BackColor</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
+ <property
name="action_name">.uno:ShowTwoPages</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Print-ShowBookview">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:ShowBookview</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkMenuToolButton"
id="Print-ShowMultiplePages">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property
name="action_name">.uno:ShowMultiplePages</property>
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
