sw/uiconfig/swriter/ui/notebookbar_compact.ui | 286 +++++++++++++++++---------
1 file changed, 192 insertions(+), 94 deletions(-)
New commits:
commit 533ea2620148cce78961c76399850db8e7d1ef7c
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Thu May 2 23:30:02 2019 +0200
Commit: andreas_kainz <kain...@gmail.com>
CommitDate: Fri May 3 08:30:08 2019 +0200
NB Tabbed compact writer update print tab
Change-Id: I0ff8c4cb5e0ebc408e827e852d6e6134c42a3382
Reviewed-on: https://gerrit.libreoffice.org/71707
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kain...@gmail.com>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
index 573ed8f30f91..e74ae2f75182 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
@@ -11031,7 +11031,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="sfxlo-PriorityMergedHBox"
id="ObjectContainer2">
+ <object class="sfxlo-PriorityMergedHBox" id="PrintContainer">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -11046,7 +11046,7 @@
<object class="sfxlo-NotebookbarToolBox"
id="SectionBottom62">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="toolbar_style">icons</property>
+ <property
name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
<object class="GtkToolButton"
id="PrintPreview-ShowSinglePage1">
@@ -11059,8 +11059,37 @@
<property name="homogeneous">False</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-7"/>
+ </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="PageLayoutsSection1">
+ <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="SectionBottom133">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="toolbar_style">both-horiz</property>
+ <property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="PrintPreview-ShowTwoPages1">
+ <object class="GtkToolButton"
id="PrintPreview-ShowTwoPages2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:ShowTwoPages</property>
@@ -11070,8 +11099,37 @@
<property name="homogeneous">False</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-6"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox"
id="PageLayoutsSection2">
+ <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="SectionBottom135">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="toolbar_style">both-horiz</property>
+ <property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="PrintPreview-ShowBookview1">
+ <object class="GtkToolButton"
id="PrintPreview-ShowBookview3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:ShowBookview</property>
@@ -11081,8 +11139,37 @@
<property name="homogeneous">False</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-5"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox"
id="PageLayoutsSection3">
+ <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="SectionBottom136">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="toolbar_style">both-horiz</property>
+ <property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="PrintPreview-ShowMultiplePages1">
+ <object class="GtkToolButton"
id="PrintPreview-ShowMultiplePages4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:ShowMultiplePages</property>
@@ -11099,8 +11186,21 @@
<property name="position">0</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="NavigationSection">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<child>
- <object class="GtkSeparator" id="separator84">
+ <object class="GtkSeparator" id="separator86">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -11111,25 +11211,9 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">2</property>
+ <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>
- </packing>
- </child>
- <child>
- <object class="sfxlo-OptionalBox" id="NavigationSection">
- <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="SectionBottom63">
<property name="visible">True</property>
@@ -11195,32 +11279,17 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator86">
- <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>
+ <property name="position">1</property>
</packing>
</child>
<style>
- <class name="priority-2"/>
+ <class name="priority-3"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
@@ -11230,6 +11299,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator89">
+ <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="SectionBottom68">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -11268,8 +11352,37 @@
<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>
+ <style>
+ <class name="priority-2"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="ZoomFullScreen">
+ <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="SectionBottom137">
+ <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="PrintPreview-FullScreen">
+ <object class="GtkToolButton"
id="PrintPreview-FullScreen1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:FullScreen</property>
@@ -11283,32 +11396,17 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator89">
- <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>
+ <property name="position">1</property>
</packing>
</child>
<style>
- <class name="priority-3"/>
+ <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">6</property>
</packing>
</child>
<child>
@@ -11318,6 +11416,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator95">
+ <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="SectionBottom75">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -11338,11 +11451,24 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="CloseSection">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<child>
- <object class="GtkSeparator" id="separator95">
+ <object class="GtkSeparator" id="separator97">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -11353,22 +11479,9 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-OptionalBox" id="CloseSection">
- <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="SectionBottom77">
<property name="visible">True</property>
@@ -11390,29 +11503,14 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator97">
- <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>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">8</property>
</packing>
</child>
</object>
@@ -11423,7 +11521,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-DropdownBox" id="ObjectSection2">
+ <object class="sfxlo-DropdownBox" id="PrinSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
