[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sc/uiconfig
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Dec 13 23:46:25 UTC 2018
sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui | 853 ++++++++---------
1 file changed, 433 insertions(+), 420 deletions(-)
New commits:
commit f0ee03f161fe4a6bae8f6c9d04b499fdaf87b003
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Tue Dec 11 10:31:13 2018 +0100
Commit: andreas_kainz <kainz.a at gmail.com>
CommitDate: Fri Dec 14 00:46:00 2018 +0100
update groupedbar_compact for calc
Change-Id: Iebbf1eb2db64efa340287b0e0846fa8a121ddf19
Reviewed-on: https://gerrit.libreoffice.org/65081
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
(cherry picked from commit 9325646778dbd353c8cb24977b627fa8fb274eec)
Reviewed-on: https://gerrit.libreoffice.org/65102
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
index 9ef4b34e425e..66dc9cab8955 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
@@ -2269,7 +2269,7 @@
<object class="GtkMenuItem" id="MenuSettings-Menubar">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|MenubarAction">Menubar</property>
+ <property name="action_name">.uno:Menubar</property>
</object>
</child>
<child>
@@ -2324,7 +2324,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property>
- <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|Menu">_Check for Updates...</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|MenuAction">_Check for Updates...</property>
</object>
</child>
<child>
@@ -2334,6 +2334,26 @@
</object>
</child>
<child>
+ <object class="GtkMenuItem" id="MenuSettings-RunMacro">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:RunMacro</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuSettings-ScriptOrganizer">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ScriptOrganizer</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="MenuSettings-separator4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
<object class="GtkMenuItem" id="MenuSettings-HelpIndex">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -2898,64 +2918,72 @@
<property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
- <property name="baseline_position">bottom</property>
<child>
<object class="sfxlo-DropdownBox" id="ToolsSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="margin_right">5</property>
<child>
<object class="GtkBox" id="Ext2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkBox" id="Section2">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
+ <property name="can_focus">True</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom2">
+ <object class="GtkToolButton" id="Tools-SearchDialog">
<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="SearchDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:SearchDialog</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:SearchDialog</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
- <object class="svtlo-ManagedMenuButton" id="menub:MenuSettings">
- <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|menub">_Menu</property>
+ <object class="GtkToolButton" id="Tools-HelpIndex">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="focus_on_click">False</property>
- <property name="receives_default">False</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <property name="relief">none</property>
- <property name="use_underline">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:HelpIndex</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Tools-CloseDoc">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:CloseDoc</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Edit-Undo1">
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:Undo</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Edit-Redo1">
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:Redo</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -2970,54 +2998,28 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="thirdExt2">
- <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>
- <child>
- <object class="GtkToolButton" id="HelpIndex1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:HelpIndex</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="svtlo-ManagedMenuButton" id="toolsb:MenuTools">
- <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|toolsb">_Tools</property>
+ <object class="svtlo-ManagedMenuButton" id="Tools-Menu:MenuSettings">
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|MenuButton">_Menu</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="halign">end</property>
+ <property name="hexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -3030,7 +3032,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
@@ -3040,13 +3042,11 @@
<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">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="baseline_position">top</property>
<child>
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom">
<property name="visible">True</property>
@@ -3061,7 +3061,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -3072,7 +3072,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -3083,7 +3083,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -3104,8 +3104,6 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
</object>
@@ -3141,6 +3139,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
<property name="orientation">vertical</property>
</object>
<packing>
@@ -3155,11 +3155,12 @@
<object class="sfxlo-DropdownBox" id="ClipboardSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="baseline_position">bottom</property>
<child>
<object class="GtkSeparator" id="separator1">
<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>
@@ -3188,7 +3189,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -3199,7 +3200,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -3210,7 +3211,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -3231,8 +3232,6 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
</object>
@@ -3242,44 +3241,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="ExtBottom10">
- <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>
- <child>
- <object class="GtkToolButton" id="Cut">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Cut</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="Copy">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Copy</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>
@@ -3313,11 +3274,12 @@
<object class="sfxlo-OptionalBox" id="Default-Section-Styles">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="baseline_position">bottom</property>
<child>
<object class="GtkSeparator" id="separator10">
<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>
@@ -3357,7 +3319,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -3368,7 +3330,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -3426,11 +3388,12 @@
<object class="sfxlo-OptionalBox" id="Default-Section-Font">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="baseline_position">bottom</property>
<child>
<object class="GtkSeparator" id="separator11">
<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>
@@ -3465,7 +3428,7 @@
</object>
<packing>
<property name="expand">True</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -3490,7 +3453,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -3546,7 +3509,6 @@
<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="Default-Bold">
<property name="visible">True</property>
@@ -3555,7 +3517,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -3566,7 +3528,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -3577,7 +3539,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -3601,7 +3563,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -3636,11 +3598,12 @@
<object class="sfxlo-OptionalBox" id="Default-Section-Paragraph">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="baseline_position">bottom</property>
<child>
<object class="GtkSeparator" id="separator6">
<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>
@@ -3673,7 +3636,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -3684,7 +3647,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -3695,7 +3658,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -3706,7 +3669,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -3721,6 +3684,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
<property name="hexpand">True</property>
<property name="orientation">vertical</property>
</object>
@@ -3747,7 +3712,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -3758,7 +3723,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -3769,7 +3734,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -3814,7 +3779,6 @@
<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="Default-ToggleMergeCells">
<property name="visible">True</property>
@@ -3823,7 +3787,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -3834,7 +3798,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -3845,7 +3809,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -3870,7 +3834,7 @@
</packing>
</child>
<style>
- <class name="priority-6"/>
+ <class name="priority-7"/>
</style>
</object>
<packing>
@@ -3883,11 +3847,12 @@
<object class="sfxlo-OptionalBox" id="Default-Section-Cell">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="baseline_position">bottom</property>
<child>
<object class="GtkSeparator" id="separator21">
<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>
@@ -3916,7 +3881,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -3927,7 +3892,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -3938,7 +3903,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -3952,7 +3917,6 @@
<object class="sfxlo-NotebookbarToolBox" id="ExtTop14">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="opacity">0.92156862745098034</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
@@ -3963,7 +3927,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -3974,7 +3938,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -3985,7 +3949,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -4003,7 +3967,7 @@
</packing>
</child>
<style>
- <class name="priority-5"/>
+ <class name="priority-6"/>
</style>
</object>
<packing>
@@ -4016,11 +3980,12 @@
<object class="sfxlo-OptionalBox" id="Default-Section-Number">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="baseline_position">bottom</property>
<child>
<object class="GtkSeparator" id="separator151">
<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>
@@ -4076,7 +4041,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -4087,7 +4052,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -4139,7 +4104,7 @@
</packing>
</child>
<style>
- <class name="priority-7"/>
+ <class name="priority-5"/>
</style>
</object>
<packing>
@@ -4152,11 +4117,12 @@
<object class="sfxlo-OptionalBox" id="Default-Section-Data">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="baseline_position">bottom</property>
<child>
<object class="GtkSeparator" id="separator141">
<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>
@@ -4185,7 +4151,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -4196,7 +4162,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -4207,7 +4173,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -4252,7 +4218,7 @@
</packing>
</child>
<style>
- <class name="priority-3"/>
+ <class name="priority-4"/>
</style>
</object>
<packing>
@@ -4265,11 +4231,12 @@
<object class="sfxlo-OptionalBox" id="Default-Section-Insert">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="baseline_position">bottom</property>
<child>
<object class="GtkSeparator" id="separator18">
<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>
@@ -4298,7 +4265,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -4309,7 +4276,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -4320,7 +4287,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -4341,8 +4308,6 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
</object>
@@ -4367,7 +4332,7 @@
</packing>
</child>
<style>
- <class name="priority-4"/>
+ <class name="priority-3"/>
</style>
</object>
<packing>
@@ -4380,11 +4345,12 @@
<object class="sfxlo-OptionalBox" id="Default-Section-Review">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="baseline_position">bottom</property>
<child>
<object class="GtkSeparator" id="separator27">
<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>
@@ -4413,7 +4379,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -4424,7 +4390,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -4456,8 +4422,6 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
</object>
@@ -4495,11 +4459,12 @@
<object class="sfxlo-OptionalBox" id="Default-Section-View">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="baseline_position">bottom</property>
<child>
<object class="GtkSeparator" id="separator24">
<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>
@@ -4528,7 +4493,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -4539,7 +4504,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -4550,7 +4515,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -4618,9 +4583,6 @@
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
<object class="sfxlo-PriorityMergedHBox" id="DrawTextContainer">
<property name="can_focus">False</property>
<child>
@@ -4631,6 +4593,8 @@
<object class="GtkSeparator" id="separator109">
<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>
@@ -4670,7 +4634,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -4681,7 +4645,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -4726,7 +4690,7 @@
</packing>
</child>
<style>
- <class name="priority-8"/>
+ <class name="priority-3"/>
</style>
</object>
<packing>
@@ -4739,11 +4703,12 @@
<object class="sfxlo-OptionalBox" id="DrawText-Section-Font1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="baseline_position">bottom</property>
<child>
<object class="GtkSeparator" id="separator110">
<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>
@@ -4778,7 +4743,7 @@
</object>
<packing>
<property name="expand">True</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -4802,7 +4767,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -4813,7 +4778,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -4858,7 +4823,6 @@
<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="DrawText-Bold1">
<property name="visible">True</property>
@@ -4867,7 +4831,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -4878,7 +4842,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -4889,7 +4853,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -4900,7 +4864,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -4950,6 +4914,8 @@
<object class="GtkSeparator" id="separator139">
<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>
@@ -4982,7 +4948,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -4993,7 +4959,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -5004,7 +4970,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -5015,7 +4981,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -5029,6 +4995,8 @@
<object class="GtkSeparator" id="separator150">
<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>
@@ -5052,7 +5020,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -5063,7 +5031,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -5074,7 +5042,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -5119,7 +5087,6 @@
<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="ParaspaceDecrease">
<property name="visible">True</property>
@@ -5128,7 +5095,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -5139,7 +5106,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -5192,6 +5159,8 @@
<object class="GtkSeparator" id="separator145">
<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>
@@ -5220,7 +5189,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -5231,7 +5200,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -5242,7 +5211,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -5303,7 +5272,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>
@@ -5317,6 +5286,8 @@
<object class="GtkSeparator" id="separator34">
<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>
@@ -5349,7 +5320,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -5360,7 +5331,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -5371,7 +5342,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -5467,7 +5438,7 @@
</object>
<packing>
<property name="expand">True</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -5491,7 +5462,7 @@
</object>
<packing>
<property name="expand">True</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -5520,7 +5491,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="first2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
@@ -5546,7 +5517,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="first3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -5557,7 +5528,7 @@
</object>
<packing>
<property name="expand">True</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -5589,7 +5560,7 @@
</object>
<packing>
<property name="expand">True</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -5625,7 +5596,7 @@
</object>
<packing>
<property name="expand">True</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -5649,7 +5620,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -5667,7 +5638,7 @@
</packing>
</child>
<style>
- <class name="priority-6"/>
+ <class name="priority-5"/>
</style>
</object>
<packing>
@@ -5680,11 +5651,12 @@
<object class="sfxlo-OptionalBox" id="Draw-Section-Arrange">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="baseline_position">bottom</property>
<child>
<object class="GtkSeparator" id="separator25">
<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>
@@ -5717,7 +5689,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -5728,7 +5700,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -5739,7 +5711,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -5750,7 +5722,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -5764,6 +5736,8 @@
<object class="GtkSeparator" id="separator29">
<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>
@@ -5776,7 +5750,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="Align2">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
@@ -5787,7 +5761,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -5798,7 +5772,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -5809,7 +5783,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -5849,12 +5823,11 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="Align3">
<property name="visible">True</property>
- <property name="can_focus">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="Draw-AlignUp">
<property name="visible">True</property>
@@ -5863,7 +5836,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -5874,7 +5847,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -5885,7 +5858,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -5910,7 +5883,7 @@
</packing>
</child>
<style>
- <class name="priority-5"/>
+ <class name="priority-4"/>
</style>
</object>
<packing>
@@ -5923,11 +5896,12 @@
<object class="sfxlo-OptionalBox" id="Draw-Section-Draw">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="baseline_position">bottom</property>
<child>
<object class="GtkSeparator" id="separator31">
<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>
@@ -5960,7 +5934,7 @@
</object>
<packing>
<property name="expand">True</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -5971,7 +5945,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -5982,7 +5956,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -6023,7 +5997,7 @@
</object>
<packing>
<property name="expand">True</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -6034,7 +6008,7 @@
</object>
<packing>
<property name="expand">True</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -6045,7 +6019,7 @@
</object>
<packing>
<property name="expand">True</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -6089,7 +6063,6 @@
<property name="halign">end</property>
<property name="hexpand">True</property>
<property name="toolbar_style">icons</property>
- <property name="icon_size">1</property>
<child>
<object class="GtkToolButton" id="Draw-StarShapes">
<property name="visible">True</property>
@@ -6098,7 +6071,7 @@
</object>
<packing>
<property name="expand">True</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -6109,7 +6082,7 @@
</object>
<packing>
<property name="expand">True</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -6120,7 +6093,7 @@
</object>
<packing>
<property name="expand">True</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -6145,7 +6118,7 @@
</packing>
</child>
<style>
- <class name="priority-4"/>
+ <class name="priority-3"/>
</style>
</object>
<packing>
@@ -6162,6 +6135,8 @@
<object class="GtkSeparator" id="separator92">
<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>
@@ -6179,7 +6154,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom25">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">end</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
@@ -6191,7 +6166,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -6202,7 +6177,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -6213,7 +6188,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -6275,6 +6250,8 @@
<object class="GtkSeparator" id="separator93">
<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>
@@ -6296,7 +6273,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom46">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">end</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
@@ -6319,7 +6296,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -6330,7 +6307,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -6341,7 +6318,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -6352,7 +6329,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -6392,12 +6369,11 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="third4">
<property name="visible">True</property>
- <property name="can_focus">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="Draw-ExtrusionDepthFloater">
<property name="visible">True</property>
@@ -6406,7 +6382,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -6417,7 +6393,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -6460,7 +6436,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -6470,11 +6446,12 @@
<object class="sfxlo-OptionalBox" id="Image-Section-Image">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="baseline_position">bottom</property>
<child>
<object class="GtkSeparator" id="separator14">
<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>
@@ -6504,7 +6481,7 @@
</object>
<packing>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list