sd/uiconfig/sdraw/ui/notebookbar.ui | 62 +++++++++++-
sw/uiconfig/swriter/ui/notebookbar.ui | 175 +++++++++++++++++++---------------
2 files changed, 162 insertions(+), 75 deletions(-)
New commits:
commit d8860e492ea8a22804750eeb6dd80f0c009365c9
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Wed Sep 19 20:23:42 2018 +0200
Commit: andreas_kainz <kain...@gmail.com>
CommitDate: Mon Sep 24 00:23:36 2018 +0200
NB tabbed: graphic update writer and draw layout
open
calc and impress
and drop down graphic menu
Change-Id: I28f0e7b964a229320ede7accfd3a98e35ef113b5
Reviewed-on: https://gerrit.libreoffice.org/60778
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kain...@gmail.com>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui
b/sd/uiconfig/sdraw/ui/notebookbar.ui
index 48235203e91d..2febf56d8d76 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -10135,6 +10135,66 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkBox" id="SendToFrontGroup5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="BackgroundFront6">
+ <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="Image-BeforeObject1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:BeforeObject</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="BackgroundFront7">
+ <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="Image-BehindObject1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:BehindObject</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkBox" id="SendToFrontGroup3">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -10213,7 +10273,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui
b/sw/uiconfig/swriter/ui/notebookbar.ui
index b1f3684a3fe8..604a8d623a35 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -10483,16 +10483,16 @@
<property name="can_focus">False</property>
<property
name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="Align7">
+ <object class="sfxlo-NotebookbarToolBox"
id="Align5">
<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="Image-AlignLeft">
+ <object class="GtkToolButton"
id="Image-ObjectAlignLeft">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="action_name">.uno:AlignLeft</property>
+ <property
name="action_name">.uno:ObjectAlignLeft</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -10500,10 +10500,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="Image-AlignHorizontalCenter">
+ <object class="GtkToolButton"
id="Image-AlignCenter">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="action_name">.uno:AlignHorizontalCenter</property>
+ <property
name="action_name">.uno:AlignCenter</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -10511,10 +10511,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="Image-AlignRight">
+ <object class="GtkToolButton"
id="Image-ObjectAlignRight">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="action_name">.uno:AlignRight</property>
+ <property
name="action_name">.uno:ObjectAlignRight</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -10529,16 +10529,16 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="Align8">
+ <object class="sfxlo-NotebookbarToolBox"
id="Align6">
<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="Image-AlignTop">
+ <object class="GtkToolButton"
id="Image-AlignUp">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="action_name">.uno:AlignTop</property>
+ <property
name="action_name">.uno:AlignUp</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -10546,10 +10546,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="Image-AlignVerticalCenter">
+ <object class="GtkToolButton"
id="Image-AlignMiddle">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="action_name">.uno:AlignVerticalCenter</property>
+ <property
name="action_name">.uno:AlignMiddle</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -10557,10 +10557,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="Image-AlignBottom">
+ <object class="GtkToolButton"
id="Image-AlignDown">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="action_name">.uno:AlignBottom</property>
+ <property
name="action_name">.uno:AlignDown</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -10578,7 +10578,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
@@ -10614,95 +10614,122 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="ArrangeSection5">
+ <object class="sfxlo-OptionalBox" id="ArrangeSection4">
<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="box6">
+ <object class="GtkBox" id="SendToFrontGroup5">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkBox" id="SendToFrontGroup4">
+ <object class="sfxlo-NotebookbarToolBox"
id="BackgroundFront6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="orientation">vertical</property>
+ <property
name="toolbar_style">both-horiz</property>
+ <property name="show_arrow">False</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="OneStep5">
+ <object class="GtkToolButton"
id="Image-ObjectForwardOne">
<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="AlignBottom">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="action_name">.uno:ObjectForwardOne</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton"
id="Image-BringToFront">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="action_name">.uno:BringToFront</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
+ <property
name="action_name">.uno:ObjectForwardOne</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property
name="homogeneous">True</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="BackgroundFront7">
+ <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="sfxlo-NotebookbarToolBox"
id="BackgroundFront5">
+ <object class="GtkToolButton"
id="Image-ObjectBackOne">
<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="Image-ObjectBackOne">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="action_name">.uno:ObjectBackOne</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton"
id="Image-SendToBack">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="action_name">.uno:SendToBack</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
+ <property
name="action_name">.uno:ObjectBackOne</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>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="SendToFrontGroup2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="OneStep2">
+ <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="Image-BringToFront">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:BringToFront</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="BackgroundFront2">
+ <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="Image-SendToBack">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:SendToBack</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>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
