[Libreoffice-commits] core.git: sw/uiconfig
andreas kainz (via logerrit)
logerrit at kemper.freedesktop.org
Thu May 2 18:30:03 UTC 2019
sw/uiconfig/sglobal/toolbar/previewobjectbar.xml | 2
sw/uiconfig/sweb/toolbar/previewobjectbar.xml | 2
sw/uiconfig/swform/toolbar/previewobjectbar.xml | 2
sw/uiconfig/swreport/toolbar/previewobjectbar.xml | 17
sw/uiconfig/swriter/toolbar/previewobjectbar.xml | 2
sw/uiconfig/swriter/ui/notebookbar_compact.ui | 37
sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 14
sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 609 ++++++++++-----
sw/uiconfig/swriter/ui/notebookbar_single.ui | 61 +
sw/uiconfig/swxform/toolbar/previewobjectbar.xml | 2
10 files changed, 493 insertions(+), 255 deletions(-)
New commits:
commit 1e05ac0e10a4bfb30d4311a99e969945eb5e2bd3
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Thu May 2 09:21:42 2019 +0200
Commit: andreas_kainz <kainz.a at gmail.com>
CommitDate: Thu May 2 20:29:00 2019 +0200
writer: sync global and print toolbars between dif UI layouts
Change-Id: I226db3f1a9cd6bed12db8edcb37ae6a6dcc999bc
Reviewed-on: https://gerrit.libreoffice.org/71656
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
diff --git a/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml b/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml
index 13956996e79e..0585f459f708 100644
--- a/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml
@@ -34,8 +34,8 @@
<toolbar:toolbaritem xlink:href=".uno:PreviewZoom"/>
<toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Print"/>
<toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print" toolbar:style="image text"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:style="image text"/>
</toolbar:toolbar>
diff --git a/sw/uiconfig/sweb/toolbar/previewobjectbar.xml b/sw/uiconfig/sweb/toolbar/previewobjectbar.xml
index 13956996e79e..0585f459f708 100644
--- a/sw/uiconfig/sweb/toolbar/previewobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/previewobjectbar.xml
@@ -34,8 +34,8 @@
<toolbar:toolbaritem xlink:href=".uno:PreviewZoom"/>
<toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Print"/>
<toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print" toolbar:style="image text"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:style="image text"/>
</toolbar:toolbar>
diff --git a/sw/uiconfig/swform/toolbar/previewobjectbar.xml b/sw/uiconfig/swform/toolbar/previewobjectbar.xml
index 13956996e79e..0585f459f708 100644
--- a/sw/uiconfig/swform/toolbar/previewobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/previewobjectbar.xml
@@ -34,8 +34,8 @@
<toolbar:toolbaritem xlink:href=".uno:PreviewZoom"/>
<toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Print"/>
<toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print" toolbar:style="image text"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:style="image text"/>
</toolbar:toolbar>
diff --git a/sw/uiconfig/swreport/toolbar/previewobjectbar.xml b/sw/uiconfig/swreport/toolbar/previewobjectbar.xml
index 95bd3293e3ca..0585f459f708 100644
--- a/sw/uiconfig/swreport/toolbar/previewobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/previewobjectbar.xml
@@ -18,23 +18,24 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <toolbar:toolbaritem xlink:href=".uno:PageUp"/>
- <toolbar:toolbaritem xlink:href=".uno:PageDown"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc"/>
- <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ShowSinglePage"/>
<toolbar:toolbaritem xlink:href=".uno:ShowTwoPages"/>
- <toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages"/>
<toolbar:toolbaritem xlink:href=".uno:ShowBookview"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc"/>
+ <toolbar:toolbaritem xlink:href=".uno:PageUp"/>
+ <toolbar:toolbaritem xlink:href=".uno:JumpToSpecificPage"/>
+ <toolbar:toolbaritem xlink:href=".uno:PageDown"/>
+ <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ZoomMinus"/>
<toolbar:toolbaritem xlink:href=".uno:PreviewZoom"/>
<toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintPagePreview"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print" toolbar:style="image text"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ClosePreview"/>
+ <toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:style="image text"/>
</toolbar:toolbar>
diff --git a/sw/uiconfig/swriter/toolbar/previewobjectbar.xml b/sw/uiconfig/swriter/toolbar/previewobjectbar.xml
index 13956996e79e..0585f459f708 100644
--- a/sw/uiconfig/swriter/toolbar/previewobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/previewobjectbar.xml
@@ -34,8 +34,8 @@
<toolbar:toolbaritem xlink:href=".uno:PreviewZoom"/>
<toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Print"/>
<toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print" toolbar:style="image text"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:style="image text"/>
</toolbar:toolbar>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
index d0bdcf91e0fb..573ed8f30f91 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
@@ -3690,8 +3690,6 @@
<object class="GtkToolButton" id="Home-BackgroundColor">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">center</property>
- <property name="hexpand">True</property>
<property name="action_name">.uno:BackgroundColor</property>
</object>
<packing>
@@ -10599,29 +10597,24 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="MediaSection1">
+ <object class="sfxlo-OptionalBox" id="Media-Section-AVMediaToolBox">
+ <property name="width_request">148</property>
<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="first1">
- <property name="width_request">800</property>
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom132">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="toolbar_style">both-horiz</property>
+ <property name="can_focus">False</property>
<property name="show_arrow">False</property>
<child>
<object class="GtkToolButton" id="Media-AVMediaToolBox">
- <property name="width_request">600</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="action_name">.uno:AVMediaToolBox</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -10632,24 +10625,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkSeparator" id="separator32">
- <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">2</property>
- </packing>
- </child>
- <style>
- <class name="priority-3"/>
- </style>
</object>
<packing>
<property name="expand">False</property>
@@ -10952,7 +10927,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-DropdownBox" id="ObjectSection1">
+ <object class="sfxlo-DropdownBox" id="MediaSectio">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index 7a5f533f8ba8..2447b54ba658 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -2162,6 +2162,19 @@
</object>
</child>
<child>
+ <object class="GtkMenuItem" id="MenuPrint-FullScreen">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:FullScreen</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="MenuPrint-separator3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
<object class="GtkMenuItem" id="MenuPrint-Print">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -10203,6 +10216,7 @@
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom48">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="halign">center</property>
<property name="hexpand">True</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
index 8c6ba67dcf39..c8c2e08bff43 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
@@ -2128,6 +2128,19 @@
</object>
</child>
<child>
+ <object class="GtkMenuItem" id="MenuPrint-FullScreen">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:FullScreen</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="MenuPrint-separator3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
<object class="GtkMenuItem" id="MenuPrint-Print">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -4554,6 +4567,17 @@
<property name="homogeneous">False</property>
</packing>
</child>
+ <child>
+ <object class="GtkMenuToolButton" id="Default-SetOutline">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:SetOutline</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -4591,28 +4615,6 @@
<property name="homogeneous">True</property>
</packing>
</child>
- <child>
- <object class="GtkToolButton" id="MoveUp1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:MoveUp</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="MoveDown1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:MoveDown</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -7304,6 +7306,17 @@
<property name="homogeneous">False</property>
</packing>
</child>
+ <child>
+ <object class="GtkMenuToolButton" id="SetOutline1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:SetOutline</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -7341,28 +7354,6 @@
<property name="homogeneous">True</property>
</packing>
</child>
- <child>
- <object class="GtkToolButton" id="MoveUp2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:MoveUp</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="MoveDown2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:MoveDown</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -13711,15 +13702,15 @@
<object class="sfxlo-PriorityMergedHBox" id="PrintBox">
<property name="can_focus">False</property>
<child>
- <object class="sfxlo-OptionalBox" id="PrintPreviewSection">
+ <object class="sfxlo-OptionalBox" id="PrintLayouot">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkBox" id="horizontal42">
+ <object class="GtkBox" id="horizontal44">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkSeparator" id="separator38">
+ <object class="GtkSeparator" id="separator69">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
@@ -13732,51 +13723,39 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="vertical43">
+ <object class="GtkBox" id="vertical44">
<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="GtkBox" id="first14">
+ <object class="GtkBox" id="first51">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="first43">
+ <object class="sfxlo-NotebookbarToolBox" id="first53">
<property name="visible">True</property>
<property name="can_focus">True</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="print-Print">
+ <object class="GtkToolButton" id="Print-ShowSinglePage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:Print</property>
+ <property name="action_name">.uno:ShowSinglePage</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="second53">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">both-horiz</property>
- <property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="print-ClosePreview">
+ <object class="GtkToolButton" id="Print-ShowTwoPages">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ClosePreview</property>
+ <property name="action_name">.uno:ShowTwoPages</property>
</object>
<packing>
<property name="expand">False</property>
@@ -13787,7 +13766,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -13798,90 +13777,34 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="second46">
+ <object class="GtkBox" id="second48">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="second52">
+ <object class="sfxlo-NotebookbarToolBox" id="first52">
<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="resize_mode">immediate</property>
+ <property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="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="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="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="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="GoToEndOfDoc">
+ <object class="GtkToolButton" id="Print-ShowBookview">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:GoToEndOfDoc</property>
+ <property name="action_name">.uno:ShowBookview</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>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom68">
- <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="PrintPreview-ZoomPlus">
+ <object class="GtkMenuToolButton" id="Print-ShowMultiplePages">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ZoomPlus</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>
@@ -13891,8 +13814,8 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
@@ -13903,12 +13826,12 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="third16">
+ <object class="GtkBox" id="third18">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="svtlo-ManagedMenuButton" id="print:MenuPrint">
- <property name="label" translatable="yes" context="notebookbar_groupedbar_full|PrintMenuButton">_Print</property>
+ <object class="svtlo-ManagedMenuButton" id="prints:SlidelayoutMenu">
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|PrintMenuButton">Slide Layout</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
@@ -13922,71 +13845,345 @@
<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">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-2"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="PrintPreviewSection">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkBox" id="horizontal42">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkSeparator" id="separator38">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="vertical43">
+ <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-OptionalBox" id="Print-Section-Navigate">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="baseline_position">bottom</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="third3Ext4">
+ <object class="GtkBox" id="Section42">
<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>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40">
+ <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="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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <object class="GtkToolButton" id="PrintPreview-ZoomMinus">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom39">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ZoomMinus</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>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">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">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="Section13">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkToolButton" id="PrintPreview-ZoomPlu">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom17">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ZoomPlus</property>
+ <property name="hexpand">True</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <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">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkToolButton" id="PrintPreview-FullScreen">
+ <object class="GtkBox" id="Section2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:FullScreen</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom15">
+ <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="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>
+ </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="SectionBottom48">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="hexpand">True</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom49">
+ <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="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>
+ </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="homogeneous">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">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="Section14">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkToolButton" id="print-PageDialog">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom47">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:PageDialog</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <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>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom18">
+ <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="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">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
+ <style>
+ <class name="priority-1"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="third3Ext6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="PrintPreview-FullScreen1">
+ <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">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -14003,23 +14200,26 @@
<property name="position">0</property>
</packing>
</child>
+ <style>
+ <class name="priority-1"/>
+ </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>
<child>
- <object class="sfxlo-OptionalBox" id="PrintPreviewSection1">
+ <object class="sfxlo-OptionalBox" id="PrintLayouot1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkBox" id="horizontal44">
+ <object class="GtkBox" id="horizontal45">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkSeparator" id="separator69">
+ <object class="GtkSeparator" id="separator2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
@@ -14032,39 +14232,28 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="vertical44">
+ <object class="GtkBox" id="vertical46">
<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="GtkBox" id="first51">
+ <object class="GtkBox" id="first50">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="first53">
+ <object class="sfxlo-NotebookbarToolBox" id="first54">
<property name="visible">True</property>
- <property name="can_focus">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="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">
+ <object class="GtkToolButton" id="print-Print">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ShowTwoPages</property>
+ <property name="action_name">.uno:Print</property>
</object>
<packing>
<property name="expand">False</property>
@@ -14086,40 +14275,27 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="second48">
+ <object class="GtkBox" id="second54">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="first52">
+ <object class="sfxlo-NotebookbarToolBox" id="first55">
<property name="visible">True</property>
- <property name="can_focus">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="Print-ShowBookview">
+ <object class="GtkToolButton" id="print-ClosePreview">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ShowBookview</property>
+ <property name="action_name">.uno:ClosePreview</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>
@@ -14135,12 +14311,12 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="third18">
+ <object class="GtkBox" id="third16">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="svtlo-ManagedMenuButton" id="prints:SlidelayoutMenu">
- <property name="label" translatable="yes" context="notebookbar_groupedbar_full|PrintMenuButton">Slide Layout</property>
+ <object class="svtlo-ManagedMenuButton" id="print:MenuPrint">
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|PrintMenuButton">_Print</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
@@ -14154,6 +14330,33 @@
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="third3Ext4">
+ <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="print-PageDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:PageDialog</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>
@@ -14179,7 +14382,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<style>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_single.ui b/sw/uiconfig/swriter/ui/notebookbar_single.ui
index c3d41329d92d..865dc6fd48b1 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_single.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_single.ui
@@ -6254,6 +6254,9 @@
<property name="position">1</property>
</packing>
</child>
+ <style>
+ <class name="priority-12"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
@@ -6291,7 +6294,7 @@
</packing>
</child>
<style>
- <class name="priority-12"/>
+ <class name="priority-11"/>
</style>
</object>
<packing>
@@ -6330,7 +6333,7 @@
</packing>
</child>
<style>
- <class name="priority-11"/>
+ <class name="priority-10"/>
</style>
</object>
<packing>
@@ -6368,9 +6371,6 @@
<property name="position">0</property>
</packing>
</child>
- <style>
- <class name="priority-10"/>
- </style>
</object>
<packing>
<property name="expand">False</property>
@@ -6384,6 +6384,21 @@
<property name="can_focus">False</property>
<property name="valign">center</property>
<child>
+ <object class="GtkSeparator" id="separator53">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-NotebookbarToolBox" id="ExtTop14">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -6414,7 +6429,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<style>
@@ -6520,6 +6535,21 @@
<property name="can_focus">False</property>
<property name="valign">center</property>
<child>
+ <object class="GtkSeparator" id="separator56">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-NotebookbarToolBox" id="ExtTop13">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -6561,7 +6591,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<style>
@@ -6659,6 +6689,21 @@
<property name="can_focus">False</property>
<property name="valign">center</property>
<child>
+ <object class="GtkSeparator" id="separator57">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom77">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -6679,7 +6724,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
diff --git a/sw/uiconfig/swxform/toolbar/previewobjectbar.xml b/sw/uiconfig/swxform/toolbar/previewobjectbar.xml
index 13956996e79e..0585f459f708 100644
--- a/sw/uiconfig/swxform/toolbar/previewobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/previewobjectbar.xml
@@ -34,8 +34,8 @@
<toolbar:toolbaritem xlink:href=".uno:PreviewZoom"/>
<toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Print"/>
<toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print" toolbar:style="image text"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:style="image text"/>
</toolbar:toolbar>
More information about the Libreoffice-commits
mailing list