svx/uiconfig/ui/sidebarparagraph.ui | 128 +++++++++++++++++-------------------
1 file changed, 63 insertions(+), 65 deletions(-)
New commits:
commit 39af38df2faf2c54f09ecd5fcfd75850de1749b2
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Fri Jan 17 00:47:25 2020 +0100
Commit: andreas_kainz <kain...@gmail.com>
CommitDate: Fri Jan 17 08:42:06 2020 +0100
Sidebarparagraph update for smaler height and better sizing
Change-Id: I7fa3fe8f8156107f21a7cc7cbc86a32bbbe67549
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86949
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kain...@gmail.com>
diff --git a/svx/uiconfig/ui/sidebarparagraph.ui
b/svx/uiconfig/ui/sidebarparagraph.ui
index 6b0cbf2c3da7..2d3fb0903e04 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -36,58 +36,19 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="border_width">6</property>
+ <property name="row_spacing">3</property>
<property name="column_spacing">6</property>
<property name="column_homogeneous">True</property>
- <child>
- <object class="GtkToolbar" id="numberbullet">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes"
context="sidebarparagraph|numberbullet|tooltip_text">Bullets and
Numbering</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
- <property name="icon_size">2</property>
- <child>
- <object class="GtkMenuToolButton" id=".uno:DefaultBullet">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="is_important">True</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkMenuToolButton" id=".uno:DefaultNumbering">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="is_important">True</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_bottom">6</property>
<property name="spacing">6</property>
<child>
<object class="GtkToolbar" id="horizontalalignment">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes"
context="sidebarparagraph|horizontalalignment|tooltip_text">Horizontal
Alignment</property>
- <property name="halign">start</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<property name="icon_size">2</property>
@@ -146,6 +107,8 @@
<object class="GtkToolbar" id="writedirection">
<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">2</property>
@@ -153,7 +116,6 @@
<object class="GtkToggleToolButton"
id=".uno:ParaLeftToRight">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="is_important">True</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -165,7 +127,6 @@
<object class="GtkToggleToolButton"
id=".uno:ParaRightToLeft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="is_important">True</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -185,8 +146,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes"
context="sidebarparagraph|verticalalignment|tooltip_text">Vertical
Alignment</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">2</property>
@@ -239,11 +198,11 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box5">
+ <object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">3</property>
<child>
<object class="GtkLabel" id="spacinglabel">
<property name="visible">True</property>
@@ -398,7 +357,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="margin_left">1</property>
- <property name="hexpand">True</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<property name="icon_size">2</property>
@@ -428,11 +386,11 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box13">
+ <object class="GtkBox" id="box4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">3</property>
<child>
<object class="GtkLabel" id="indentlabel">
<property name="visible">True</property>
@@ -650,22 +608,75 @@
<property name="top_attach">3</property>
</packing>
</child>
+ <child>
+ <object class="GtkSeparator" id="separator1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">3</property>
+ <property name="margin_right">3</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
<child>
<object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkToolbar" id="numberbullet">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes"
context="sidebarparagraph|numberbullet|tooltip_text">Bullets and
Numbering</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <property name="icon_size">2</property>
+ <child>
+ <object class="GtkMenuToolButton" id=".uno:DefaultBullet">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="is_important">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkMenuToolButton" id=".uno:DefaultNumbering">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="is_important">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</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="GtkToolbar" id="backgroundcolor">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes"
context="sidebarparagraph|backgroundcolor|tooltip_text">Paragraph Background
Color</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">2</property>
<child>
<object class="GtkMenuToolButton" id=".uno:BackgroundColor">
- <property name="width_request">105</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
@@ -680,26 +691,13 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator1">
- <property name="height_request">2</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
- </object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="top_attach">1</property>
<property name="width">2</property>
</packing>
</child>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
