sc/uiconfig/scalc/ui/notebookbar.ui | 222 ++++++++++++++++++++++++++++++++----
1 file changed, 200 insertions(+), 22 deletions(-)
New commits:
commit 06226de0ccebfc80d2a2acf9eb37ca919f3dd3e3
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Fri Nov 2 22:34:53 2018 +0100
Commit: andreas_kainz <kain...@gmail.com>
CommitDate: Tue Nov 6 15:06:14 2018 +0100
tabbed notebookbar calc: update print tab with additional functions
Change-Id: Iad363da3955625c696de843d0a859904e189376c
Reviewed-on: https://gerrit.libreoffice.org/62792
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kain...@gmail.com>
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui
b/sc/uiconfig/scalc/ui/notebookbar.ui
index de1c182856d8..39eafb505603 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -12544,45 +12544,98 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="first22">
+ <object class="sfxlo-NotebookbarToolBox"
id="first28">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
- <property name="margin_left">5</property>
<property name="vexpand">True</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-PreviousPage">
+ <object class="GtkToolButton"
id="Print-PageFormatDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:PreviousPage</property>
+ <property
name="action_name">.uno:PageFormatDialog</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="GtkBox" id="box19">
+ <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="GtkToolButton"
id="Print-NextPage">
+ <object class="sfxlo-NotebookbarToolBox"
id="first27">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:NextPage</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-Margins">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:Margins</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">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="second11">
+ <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="Print-EditHeaderAndFooter">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:EditHeaderAndFooter</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">False</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator74">
+ <object class="GtkSeparator" id="separator8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -12593,7 +12646,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
<style>
@@ -12613,33 +12666,158 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="first23">
+ <object class="GtkBox" id="box21">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
- <property name="resize_mode">immediate</property>
- <property name="toolbar_style">both</property>
- <property name="show_arrow">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkToolButton"
id="Print-PageFormatDialog">
+ <object class="sfxlo-NotebookbarToolBox"
id="first29">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:PageFormatDialog</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-FirstPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:FirstPage</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Print-PreviousPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:PreviousPage</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Print-NextPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:NextPage</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Print-LastPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:LastPage</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">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box9">
+ <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="second13">
+ <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-ZoomOut">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:ZoomOut</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="second10">
+ <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-ZoomIn">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:ZoomIn</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="pack_type">end</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="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
+ <object class="sfxlo-NotebookbarToolBox"
id="first23">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="resize_mode">immediate</property>
+ <property name="toolbar_style">both</property>
+ <property name="show_arrow">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkBox" id="box20">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -12700,7 +12878,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -12715,7 +12893,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
@@ -12755,7 +12933,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
