sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 298 +++++++--------
1 file changed, 149 insertions(+), 149 deletions(-)
New commits:
commit 99d641a5448fdaa0837fd9501851630b0b69e3da
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Wed Apr 10 23:56:05 2019 +0200
Commit: andreas_kainz <kain...@gmail.com>
CommitDate: Thu Apr 11 07:07:45 2019 +0200
NB writer grouped_compact arrangement fix
Change-Id: If9f93b6d244652ae6756df76cefa5e69310a67b1
Reviewed-on: https://gerrit.libreoffice.org/70552
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kain...@gmail.com>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index 4d3dad28cd8b..86a8c2ef198f 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -3873,11 +3873,11 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox"
id="Default-Section-Insert">
+ <object class="sfxlo-OptionalBox"
id="Default-Section-Paragraph">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkSeparator" id="separator18">
+ <object class="GtkSeparator" id="separator6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -3892,58 +3892,120 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="Section6">
+ <object class="GtkBox" id="Section5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom6">
+ <object class="GtkBox" id="box13">
<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="Default-InsertGraphic">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertGraphic</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkMenuToolButton"
id="Default-InsertTable">
+ <object class="sfxlo-NotebookbarToolBox"
id="ExtBottom2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertTable</property>
+ <property name="can_focus">True</property>
+ <property
name="toolbar_style">icons</property>
+ <property
name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Default-LeftPara">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:LeftPara</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Default-CenterPara">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:CenterPara</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Default-RightPara">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:RightPara</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Default-JustifyPara">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:JustifyPara</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="Default-CharmapControl">
+ <object class="GtkSeparator"
id="separator140">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:CharmapControl</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="hexpand">True</property>
+ <property
name="orientation">vertical</property>
</object>
<packing>
- <property name="expand">False</property>
- <property
name="homogeneous">True</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="Default-InsertPagebreak">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom35">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertPagebreak</property>
+ <property name="can_focus">True</property>
+ <property
name="toolbar_style">icons</property>
+ <property
name="show_arrow">False</property>
+ <child>
+ <object class="GtkMenuToolButton"
id="Default-DefaultBullet">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:DefaultBullet</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkMenuToolButton"
id="Default-DefaultNumbering">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:DefaultNumbering</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>
@@ -3954,12 +4016,12 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box44">
+ <object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="svtlo-ManagedMenuButton"
id="Default-Insert:MenuInsert">
- <property name="label" translatable="yes"
context="notebookbar_groupedbar_compact|InsertButton">_Insert</property>
+ <object class="svtlo-ManagedMenuButton"
id="Default-Paragraph:MenuParagraph">
+ <property name="label" translatable="yes"
context="notebookbar_groupedbar_compact|ParagraphButton">_Paragraph</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="focus_on_click">False</property>
@@ -3974,7 +4036,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="ExtTop6">
+ <object class="sfxlo-NotebookbarToolBox"
id="ExtBottom8">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
@@ -3982,10 +4044,21 @@
<property
name="toolbar_style">icons</property>
<property
name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Default-InsertDraw">
+ <object class="GtkMenuToolButton"
id="Default-LineSpacing">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="action_name">.uno:InsertDraw</property>
+ <property
name="action_name">.uno:LineSpacing</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkMenuToolButton"
id="Default-BackgroundColor">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:BackgroundColor</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -4014,7 +4087,7 @@
</packing>
</child>
<style>
- <class name="priority-5"/>
+ <class name="priority-6"/>
</style>
</object>
<packing>
@@ -4024,11 +4097,11 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox"
id="Default-Section-Paragraph">
+ <object class="sfxlo-OptionalBox"
id="Default-Section-Insert">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkSeparator" id="separator6">
+ <object class="GtkSeparator" id="separator18">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -4043,120 +4116,58 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="Section5">
+ <object class="GtkBox" id="Section6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkBox" id="box13">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom6">
<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>
- <object class="sfxlo-NotebookbarToolBox"
id="ExtBottom2">
+ <object class="GtkToolButton"
id="Default-InsertGraphic">
<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="Default-LeftPara">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="action_name">.uno:LeftPara</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton"
id="Default-CenterPara">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="action_name">.uno:CenterPara</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton"
id="Default-RightPara">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="action_name">.uno:RightPara</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton"
id="Default-JustifyPara">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="action_name">.uno:JustifyPara</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:InsertGraphic</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>
<child>
- <object class="GtkSeparator"
id="separator140">
+ <object class="GtkMenuToolButton"
id="Default-InsertTable">
<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="hexpand">True</property>
- <property
name="orientation">vertical</property>
+ <property
name="action_name">.uno:InsertTable</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="padding">5</property>
- <property name="position">1</property>
+ <property name="expand">False</property>
+ <property
name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom35">
+ <object class="GtkToolButton"
id="Default-CharmapControl">
<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="GtkMenuToolButton"
id="Default-DefaultBullet">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="action_name">.uno:DefaultBullet</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkMenuToolButton"
id="Default-DefaultNumbering">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="action_name">.uno:DefaultNumbering</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:CharmapControl</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Default-InsertPagebreak">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:InsertPagebreak</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property
name="homogeneous">True</property>
</packing>
</child>
</object>
@@ -4167,12 +4178,12 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box2">
+ <object class="GtkBox" id="box44">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="svtlo-ManagedMenuButton"
id="Default-Paragraph:MenuParagraph">
- <property name="label" translatable="yes"
context="notebookbar_groupedbar_compact|ParagraphButton">_Paragraph</property>
+ <object class="svtlo-ManagedMenuButton"
id="Default-Insert:MenuInsert">
+ <property name="label" translatable="yes"
context="notebookbar_groupedbar_compact|InsertButton">_Insert</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="focus_on_click">False</property>
@@ -4187,7 +4198,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="ExtBottom8">
+ <object class="sfxlo-NotebookbarToolBox"
id="ExtTop6">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
@@ -4195,21 +4206,10 @@
<property
name="toolbar_style">icons</property>
<property
name="show_arrow">False</property>
<child>
- <object class="GtkMenuToolButton"
id="Default-LineSpacing">
- <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>
- <child>
- <object class="GtkMenuToolButton"
id="Default-BackgroundColor">
+ <object class="GtkToolButton"
id="Default-InsertDraw">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="action_name">.uno:BackgroundColor</property>
+ <property
name="action_name">.uno:InsertDraw</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -4238,13 +4238,13 @@
</packing>
</child>
<style>
- <class name="priority-6"/>
+ <class name="priority-5"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -4703,7 +4703,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">9</property>
+ <property name="position">7</property>
</packing>
</child>
<style>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
