[Libreoffice-commits] core.git: cui/uiconfig
andreas kainz (via logerrit)
logerrit at kemper.freedesktop.org
Fri Oct 18 09:56:12 UTC 2019
cui/uiconfig/ui/cellalignment.ui | 63 +++++++++++++++++++++------------------
1 file changed, 34 insertions(+), 29 deletions(-)
New commits:
commit 9ab51f7aead713516b7e9a30aa64190d80517cbc
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Thu Oct 10 00:19:14 2019 +0200
Commit: andreas_kainz <kainz.a at gmail.com>
CommitDate: Fri Oct 18 11:54:55 2019 +0200
tdf#127934 Make Cell Format Align Dialog HIG conform
Change-Id: I14986e50c31655737be42afbdf28078c7e6fb9ad
Reviewed-on: https://gerrit.libreoffice.org/80572
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>
diff --git a/cui/uiconfig/ui/cellalignment.ui b/cui/uiconfig/ui/cellalignment.ui
index 7721736b3326..8a52cae74225 100644
--- a/cui/uiconfig/ui/cellalignment.ui
+++ b/cui/uiconfig/ui/cellalignment.ui
@@ -34,14 +34,15 @@
<object class="GtkGrid" id="grid10">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">18</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="labelDegrees">
<property name="visible">True</property>
@@ -67,7 +68,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
@@ -94,8 +95,8 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
@@ -108,22 +109,20 @@
<property name="wrap">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkScrolledWindow" id="preview">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
<property name="hscrollbar_policy">never</property>
<property name="vscrollbar_policy">never</property>
<property name="shadow_type">in</property>
@@ -144,8 +143,8 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
@@ -188,10 +187,13 @@
</child>
</object>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
</object>
@@ -355,7 +357,6 @@
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="border_width">6</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
@@ -368,15 +369,15 @@
<property name="climb_rate">1</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="labelHorzAlign">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="cellalignment|labelHorzAlign">Hori_zontal</property>
+ <property name="label" translatable="yes" context="cellalignment|labelHorzAlign">Hori_zontal:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">comboboxHorzAlign</property>
<property name="xalign">0</property>
@@ -390,27 +391,27 @@
<object class="GtkLabel" id="labelVertAlign">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="cellalignment|labelVertAlign">_Vertical</property>
+ <property name="label" translatable="yes" context="cellalignment|labelVertAlign">_Vertical:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">comboboxVertAlign</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="labelIndent">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="cellalignment|labelIndent">I_ndent</property>
+ <property name="label" translatable="yes" context="cellalignment|labelIndent">I_ndent:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">spinIndentFrom</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">2</property>
<property name="top_attach">0</property>
</packing>
</child>
@@ -418,7 +419,6 @@
<object class="GtkComboBoxText" id="comboboxHorzAlign">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<items>
<item id="0" translatable="yes" context="cellalignment|liststoreHorzAlign">Default</item>
<item id="1" translatable="yes" context="cellalignment|liststoreHorzAlign">Left</item>
@@ -430,15 +430,14 @@
</items>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="comboboxVertAlign">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<items>
<item id="0" translatable="yes" context="cellalignment|liststoreVertAlign">Default</item>
<item id="1" translatable="yes" context="cellalignment|liststoreVertAlign">Top</item>
@@ -449,10 +448,16 @@
</items>
</object>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">1</property>
<property name="top_attach">1</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
</object>
More information about the Libreoffice-commits
mailing list