sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 795 ++++++++++----- 1 file changed, 578 insertions(+), 217 deletions(-)
New commits:
commit 419ca3999d87def283217bad7e42b3e95df6e22b
Author: andreas kainz <kain...@gmail.com>
Date: Sun May 21 23:12:56 2017 +0200
update groupedbar compact notebookbar add margins and jay feedback
Change-Id: I56228b3f120df5cad53d721715b977f8131efdc8
Reviewed-on: https://gerrit.libreoffice.org/37885
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
Tested-by: Yousuf Philips <philip...@hotmail.com>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index e499d15bb6cb..e61ac3e21bcd 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -3800,6 +3800,7 @@
<object class="sfxlo-DropdownBox" id="FileSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_left">5</property>
<property name="baseline_position">bottom</property>
<child>
<object class="GtkBox" id="Section">
@@ -3863,6 +3864,33 @@
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="ExtBottom3">
+ <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">
+ <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">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -3976,7 +4004,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="ExtBottom3">
+ <object class="sfxlo-NotebookbarToolBox"
id="ExtBottom10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
@@ -4069,12 +4097,16 @@
<object class="sfxlo-NotebookbarToolBox"
id="SectionBottom3">
<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="StyleApply">
<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:StyleApply</property>
</object>
<packing>
@@ -5630,17 +5662,6 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="AutoFormat">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:AutoFormat</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
- <child>
<object class="GtkMenuToolButton"
id="SetBorderStyle1">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -5688,6 +5709,33 @@
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="ExtBottom11">
+ <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="AutoFormat">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:AutoFormat</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>
@@ -6588,64 +6636,112 @@
<property name="can_focus">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="Wrap1">
+ <object class="GtkBox" id="box46">
<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="WrapOff">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="action_name">.uno:WrapOff</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="WrapOn">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="action_name">.uno:WrapOn</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkToolButton" id="WrapIdeal">
+ <object class="sfxlo-NotebookbarToolBox"
id="Wrap1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="action_name">.uno:WrapIdeal</property>
+ <property name="can_focus">False</property>
+ <property
name="toolbar_style">icons</property>
+ <property
name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="WrapOff">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:WrapOff</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="WrapOn">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:WrapOn</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="WrapIdeal">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:WrapIdeal</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="GtkToolButton"
id="ObjectBackOne">
+ <object class="GtkSeparator"
id="separator144">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:ObjectBackOne</property>
+ <property
name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
- <property
name="homogeneous">True</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="ObjectForwardOne">
+ <object class="sfxlo-NotebookbarToolBox"
id="Wrap5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:ObjectForwardOne</property>
+ <property
name="toolbar_style">icons</property>
+ <property
name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="BringToFront1">
+ <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>
+ <child>
+ <object class="GtkToolButton"
id="ObjectForwardOne3">
+ <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="ObjectBackOne3">
+ <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>
</object>
<packing>
<property name="expand">False</property>
- <property
name="homogeneous">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -6679,8 +6775,8 @@
<object class="sfxlo-NotebookbarToolBox"
id="Align1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">end</property>
- <property name="vexpand">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>
@@ -7533,10 +7629,36 @@
<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="GtkSeparator"
id="separator148">
+ <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">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom12">
+ <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="FlipHorizontal1">
+ <object class="GtkToolButton"
id="FlipHorizontal2">
<property
name="visible">True</property>
- <property
name="can_focus">True</property>
+ <property
name="can_focus">False</property>
<property
name="action_name">.uno:FlipHorizontal</property>
</object>
<packing>
@@ -7545,9 +7667,9 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="LineEndStyle2">
+ <object class="GtkToolButton"
id="LineEndStyle1">
<property
name="visible">True</property>
- <property
name="can_focus">True</property>
+ <property
name="can_focus">False</property>
<property
name="action_name">.uno:LineEndStyle</property>
</object>
<packing>
@@ -7559,7 +7681,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -7670,75 +7792,112 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom25">
+ <object class="GtkBox" id="box49">
<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="DrawText2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="action_name">.uno:DrawText</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton"
id="ArrowsToolbox">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="action_name">.uno:ArrowsToolbox</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton"
id="LineToolbox">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="action_name">.uno:LineToolbox</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
<child>
- <object class="GtkToolButton"
id="BasicShapes1">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom25">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="action_name">.uno:BasicShapes</property>
+ <property name="can_focus">False</property>
+ <property
name="toolbar_style">icons</property>
+ <property
name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="DrawText2">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:DrawText</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="ArrowsToolbox">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:ArrowsToolbox</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="LineToolbox">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:LineToolbox</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="GtkToolButton"
id="ArrowShapes1">
+ <object class="GtkSeparator"
id="separator149">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="action_name">.uno:ArrowShapes</property>
+ <property name="can_focus">False</property>
+ <property
name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
- <property
name="homogeneous">True</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="FlowChartShapes1">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom13">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:FlowChartShapes</property>
+ <property
name="toolbar_style">icons</property>
+ <property
name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="BasicShapes2">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:BasicShapes</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="ArrowShapes2">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:ArrowShapes</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="FlowChartShapes2">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:FlowChartShapes</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">2</property>
</packing>
</child>
</object>
@@ -7860,64 +8019,112 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="Wrap2">
+ <object class="GtkBox" id="box47">
<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="WrapOff2">
+ <object class="sfxlo-NotebookbarToolBox"
id="Wrap2">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="action_name">.uno:WrapOff</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="WrapOn2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="action_name">.uno:WrapOn</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton"
id="WrapIdeal1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="action_name">.uno:WrapIdeal</property>
+ <property name="can_focus">False</property>
+ <property
name="toolbar_style">icons</property>
+ <property
name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="WrapOff2">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:WrapOff</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="WrapOn2">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:WrapOn</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="WrapIdeal1">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:WrapIdeal</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="GtkToolButton"
id="ObjectBackOne2">
+ <object class="GtkSeparator"
id="separator146">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="action_name">.uno:ObjectBackOne</property>
+ <property name="can_focus">False</property>
+ <property
name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
- <property
name="homogeneous">True</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="ObjectForwardOne2">
+ <object class="sfxlo-NotebookbarToolBox"
id="Wrap6">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="action_name">.uno:ObjectForwardOne</property>
+ <property name="can_focus">False</property>
+ <property
name="toolbar_style">icons</property>
+ <property
name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="BringToFront2">
+ <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>
+ <child>
+ <object class="GtkToolButton"
id="ObjectForwardOne2">
+ <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="ObjectBackOne2">
+ <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>
</object>
<packing>
<property name="expand">False</property>
- <property
name="homogeneous">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -8555,64 +8762,112 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="Wrap4">
+ <object class="GtkBox" id="box48">
<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="WrapOff1">
+ <object class="sfxlo-NotebookbarToolBox"
id="Wrap4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:WrapOff</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="WrapOn1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:WrapOn</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton"
id="WrapIdeal2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:WrapIdeal</property>
+ <property
name="toolbar_style">icons</property>
+ <property
name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="WrapOff1">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:WrapOff</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="WrapOn1">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:WrapOn</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="WrapIdeal2">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:WrapIdeal</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="GtkToolButton"
id="ObjectBackOne1">
+ <object class="GtkSeparator"
id="separator147">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:ObjectBackOne</property>
+ <property
name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
- <property
name="homogeneous">True</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="ObjectForwardOne1">
+ <object class="sfxlo-NotebookbarToolBox"
id="Wrap7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:ObjectForwardOne</property>
+ <property
name="toolbar_style">icons</property>
+ <property
name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="BringToFront3">
+ <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>
+ <child>
+ <object class="GtkToolButton"
id="ObjectForwardOne1">
+ <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="ObjectBackOne1">
+ <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>
</object>
<packing>
<property name="expand">False</property>
- <property
name="homogeneous">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -8919,15 +9174,19 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom33">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom14">
<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="StyleApply2">
<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:StyleApply</property>
</object>
<packing>
@@ -8947,7 +9206,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="svtlo-ManagedMenuButton"
id="paragraphstylec:MenuStyle">
+ <object class="svtlo-ManagedMenuButton"
id="paragraphstyles:MenuStyle">
<property name="label"
translatable="yes">_Styles</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -8962,7 +9221,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="ExtTop8">
+ <object class="sfxlo-NotebookbarToolBox"
id="ExtTop7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="opacity">0.92156862745098034</property>
@@ -9052,32 +9311,32 @@
<object class="sfxlo-NotebookbarToolBox"
id="ExtBottom6">
<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="CharFontName2">
<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">False</property>
+ <property name="expand">True</property>
<property
name="homogeneous">True</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom34">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom33">
<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>
<child>
@@ -9092,26 +9351,15 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Bold2">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="action_name">.uno:Bold</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton"
id="Italic2">
- <property
name="use_action_appearance">True</property>
+ <object class="GtkMenuToolButton"
id="BackgroundColor">
+ <property
name="use_action_appearance">False</property>
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="action_name">.uno:Italic</property>
+ <property
name="action_name">.uno:BackgroundColor</property>
</object>
<packing>
<property
name="expand">False</property>
- <property
name="homogeneous">True</property>
+ <property
name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -9133,7 +9381,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="svtlo-ManagedMenuButton"
id="formatc:MenuFormat">
+ <object class="svtlo-ManagedMenuButton"
id="formats:MenuFormat">
<property name="label"
translatable="yes">F_ormat</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -9148,7 +9396,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="ExtTop9">
+ <object class="sfxlo-NotebookbarToolBox"
id="ExtTop8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
@@ -9157,10 +9405,10 @@
<property
name="show_arrow">False</property>
<property name="icon_size">1</property>
<child>
- <object class="GtkMenuToolButton"
id="fontcolor2">
+ <object class="GtkToolButton" id="Bold2">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="action_name">.uno:Color</property>
+ <property
name="action_name">.uno:Bold</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -9168,15 +9416,47 @@
</packing>
</child>
<child>
- <object class="GtkMenuToolButton"
id="BackColor2">
- <property
name="use_action_appearance">False</property>
+ <object class="GtkToolButton"
id="Italic2">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="action_name">.uno:BackColor</property>
+ <property
name="action_name">.uno:Italic</property>
</object>
<packing>
<property
name="expand">False</property>
- <property
name="homogeneous">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Underline2">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:UnderlineSimple</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Strikeout2">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:Strikeout</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkMenuToolButton"
id="fontcolor2">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:Color</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
</packing>
</child>
</object>
@@ -9204,7 +9484,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -9235,13 +9515,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom39">
+ <object class="sfxlo-NotebookbarToolBox"
id="ExtBottom7">
<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="LeftPara">
+ <object class="GtkToolButton"
id="LeftPara3">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
<property
name="action_name">.uno:LeftPara</property>
@@ -9252,7 +9532,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="CenterPara">
+ <object class="GtkToolButton"
id="CenterPara2">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
<property
name="action_name">.uno:CenterPara</property>
@@ -9263,7 +9543,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="RightPara">
+ <object class="GtkToolButton"
id="RightPara2">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
<property
name="action_name">.uno:RightPara</property>
@@ -9274,7 +9554,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="JustifyPara">
+ <object class="GtkToolButton"
id="JustifyPara3">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
<property
name="action_name">.uno:JustifyPara</property>
@@ -9288,6 +9568,65 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparator"
id="separator150">
+ <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">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom34">
+ <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="CommonAlignTop">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:CommonAlignTop</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="CommonAlignVerticalCenter">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:CommonAlignVerticalCenter</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="CommonAlignBottom">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:CommonAlignBottom</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>
@@ -9303,7 +9642,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="svtlo-ManagedMenuButton"
id="paragraphc:MenuParagraph">
+ <object class="svtlo-ManagedMenuButton"
id="paragraphs:MenuParagraph">
<property name="label"
translatable="yes">_Paragraph</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -9318,7 +9657,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="ExtBottom7">
+ <object class="sfxlo-NotebookbarToolBox"
id="ExtBottom12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
@@ -9327,15 +9666,36 @@
<property
name="show_arrow">False</property>
<property name="icon_size">1</property>
<child>
- <object class="GtkMenuToolButton"
id="BackgroundColor">
- <property
name="use_action_appearance">False</property>
+ <object class="GtkToolButton"
id="ParaspaceDecrease1">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="action_name">.uno:BackgroundColor</property>
+ <property
name="action_name">.uno:ParaspaceDecrease</property>
</object>
<packing>
<property
name="expand">False</property>
- <property
name="homogeneous">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="ParaspaceIncrease1">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:ParaspaceIncrease</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkMenuToolButton"
id="LineSpacing1">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:LineSpacing</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
</packing>
</child>
</object>
@@ -9363,7 +9723,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -9515,6 +9875,7 @@
<object class="sfxlo-DropdownBox" id="ToolsSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_right">5</property>
<child>
<object class="GtkBox" id="Ext2">
<property name="visible">True</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
