cui/uiconfig/ui/paragalignpage.ui | 121 ++++++++++++++++----------------------
1 file changed, 52 insertions(+), 69 deletions(-)
New commits:
commit 1987c98926a85a483a32ea78e460e563a6ea4705
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Sun Nov 17 22:36:25 2019 +0100
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Tue Nov 19 08:31:30 2019 +0100
Paragraph Align Tab fix
Change-Id: Ied02b9db154bd007399b8b3d567d692d4973d382
Reviewed-on: https://gerrit.libreoffice.org/83040
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kain...@gmail.com>
(cherry picked from commit bc9b046fbd1d68016ae6c53c990fce97b57eb663)
Reviewed-on: https://gerrit.libreoffice.org/83058
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/cui/uiconfig/ui/paragalignpage.ui
b/cui/uiconfig/ui/paragalignpage.ui
index 289585fa390c..c1f0a78cee2d 100644
--- a/cui/uiconfig/ui/paragalignpage.ui
+++ b/cui/uiconfig/ui/paragalignpage.ui
@@ -5,8 +5,6 @@
<object class="GtkGrid" id="ParaAlignPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">start</property>
- <property name="hexpand">True</property>
<property name="border_width">6</property>
<property name="row_spacing">12</property>
<property name="column_spacing">24</property>
@@ -55,10 +53,6 @@
<object class="GtkGrid" id="maingrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="valign">start</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
<property name="row_spacing">12</property>
<child>
<object class="GtkFrame" id="frame1">
@@ -76,7 +70,7 @@
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">6</property>
+ <property name="row_spacing">3</property>
<child>
<object class="GtkRadioButton" id="radioBTN_LEFTALIGN">
<property name="label" translatable="yes"
context="paragalignpage|radioBTN_LEFTALIGN">_Left</property>
@@ -176,33 +170,15 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box4">
+ <object class="GtkBox" id="box5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="homogeneous">True</property>
<child>
- <object class="GtkBox" id="box1">
- <property name="visible">True</property>
+ <object class="GtkLabel"
id="labelST_RIGHTALIGN_ASIAN">
<property name="can_focus">False</property>
- <property name="margin_left">13</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkLabel" id="labelLB_LASTLINE">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">12</property>
- <property name="vexpand">True</property>
- <property name="label" translatable="yes"
context="paragalignpage|labelLB_LASTLINE">_Last line:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">comboLB_LASTLINE</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="label" translatable="yes"
context="paragalignpage|labelST_RIGHTALIGN_ASIAN">Righ_t/Bottom</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -211,16 +187,11 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxText"
id="comboLB_LASTLINE">
- <property name="visible">True</property>
+ <object class="GtkLabel"
id="labelST_LEFTALIGN_ASIAN">
<property name="can_focus">False</property>
- <property name="active">0</property>
- <items>
- <item id="0" translatable="yes"
context="paragalignpage|liststoreLB_LASTLINE">Start</item>
- <item id="1" translatable="yes"
context="paragalignpage|liststoreLB_LASTLINE">Start</item>
- <item id="2" translatable="yes"
context="paragalignpage|liststoreLB_LASTLINE">Centered</item>
- <item id="3" translatable="yes"
context="paragalignpage|liststoreLB_LASTLINE">Justified</item>
- </items>
+ <property name="xpad">5</property>
+ <property name="label" translatable="yes"
context="paragalignpage|labelST_LEFTALIGN_ASIAN">_Left/Top</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -231,43 +202,58 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">4</property>
+ <property name="top_attach">7</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box5">
+ <object class="GtkAlignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="homogeneous">True</property>
- <child>
- <object class="GtkLabel"
id="labelST_RIGHTALIGN_ASIAN">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="paragalignpage|labelST_RIGHTALIGN_ASIAN">Righ_t/Bottom</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="left_padding">18</property>
<child>
- <object class="GtkLabel"
id="labelST_LEFTALIGN_ASIAN">
+ <object class="GtkBox" id="box4">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xpad">5</property>
- <property name="label" translatable="yes"
context="paragalignpage|labelST_LEFTALIGN_ASIAN">_Left/Top</property>
- <property name="use_underline">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="labelLB_LASTLINE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="paragalignpage|labelLB_LASTLINE">_Last line:</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">comboLB_LASTLINE</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText"
id="comboLB_LASTLINE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="active">0</property>
+ <items>
+ <item id="0" translatable="yes"
context="paragalignpage|liststoreLB_LASTLINE">Start</item>
+ <item id="1" translatable="yes"
context="paragalignpage|liststoreLB_LASTLINE">Start</item>
+ <item id="2" translatable="yes"
context="paragalignpage|liststoreLB_LASTLINE">Centered</item>
+ <item id="3" translatable="yes"
context="paragalignpage|liststoreLB_LASTLINE">Justified</item>
+ </items>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">7</property>
+ <property name="top_attach">4</property>
</packing>
</child>
</object>
@@ -306,12 +292,11 @@
<object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkLabel" id="labelFT_VERTALIGN">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_right">12</property>
<property name="label" translatable="yes"
context="paragalignpage|labelFT_VERTALIGN">_Alignment:</property>
<property name="use_underline">True</property>
<property
name="mnemonic_widget">comboLB_VERTALIGN</property>
@@ -378,12 +363,11 @@
<object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_right">12</property>
<property name="label" translatable="yes"
context="paragalignpage|label2">_Text direction:</property>
<property name="use_underline">True</property>
<property
name="mnemonic_widget">comboLB_TEXTDIRECTION</property>
@@ -435,7 +419,6 @@
</object>
<object class="GtkSizeGroup" id="sizegroup1">
<widgets>
- <widget name="box1"/>
<widget name="labelFT_VERTALIGN"/>
<widget name="label2"/>
</widgets>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
