sw/uiconfig/swriter/ui/columnpage.ui | 539 +++++++++++++++++------------------
1 file changed, 277 insertions(+), 262 deletions(-)
New commits:
commit f71dd69a712602a97f0a0b3950b0750ff0beba25
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Thu Oct 10 00:50:21 2019 +0200
Commit: andreas_kainz <kain...@gmail.com>
CommitDate: Fri Oct 18 13:04:49 2019 +0200
tdf#127880 Columns in Writer dialog is HIG conform
Change-Id: Ib624655cafda298818b55b3383785881f5a5e592
Reviewed-on: https://gerrit.libreoffice.org/80573
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
Tested-by: Jenkins
diff --git a/sw/uiconfig/swriter/ui/columnpage.ui
b/sw/uiconfig/swriter/ui/columnpage.ui
index bfc7f68aff8f..86042c063948 100644
--- a/sw/uiconfig/swriter/ui/columnpage.ui
+++ b/sw/uiconfig/swriter/ui/columnpage.ui
@@ -12,12 +12,12 @@
<object class="GtkAdjustment" id="adjustment2">
<property name="lower">0.01</property>
<property name="upper">56</property>
- <property name="step_increment">0.10000000000000001</property>
+ <property name="step_increment">0.1</property>
<property name="page_increment">1</property>
</object>
<object class="GtkAdjustment" id="adjustment3">
<property name="upper">56</property>
- <property name="step_increment">0.10000000000000001</property>
+ <property name="step_increment">0.1</property>
<property name="page_increment">1</property>
</object>
<object class="GtkAdjustment" id="adjustment4">
@@ -37,18 +37,18 @@
<object class="GtkAdjustment" id="adjustment6">
<property name="lower">0.01</property>
<property name="upper">56</property>
- <property name="step_increment">0.10000000000000001</property>
+ <property name="step_increment">0.1</property>
<property name="page_increment">1</property>
</object>
<object class="GtkAdjustment" id="adjustment7">
<property name="lower">0.01</property>
<property name="upper">56</property>
- <property name="step_increment">0.10000000000000001</property>
+ <property name="step_increment">0.1</property>
<property name="page_increment">1</property>
</object>
<object class="GtkAdjustment" id="adjustment8">
<property name="upper">56</property>
- <property name="step_increment">0.10000000000000001</property>
+ <property name="step_increment">0.1</property>
<property name="page_increment">1</property>
</object>
<object class="GtkImage" id="image7">
@@ -78,193 +78,237 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkGrid" id="grid8">
+ <object class="GtkCheckButton" id="autowidth">
+ <property name="label" translatable="yes"
context="columnpage|autowidth">Auto_Width</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">6</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
<property name="hexpand">True</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="columnft">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="columnpage|columnft">Column:</property>
- <property name="xalign">1</property>
- <accessibility>
- <relation type="label-for" target="back"/>
- <relation type="label-for" target="next"/>
- </accessibility>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="label">_1</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">width1mf</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="label">_2</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">width2mf</property>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="label">_3</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">width3mf</property>
- </object>
- <packing>
- <property name="left_attach">4</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="widthft">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="columnpage|widthft">Width:</property>
- <property name="xalign">1</property>
- <accessibility>
- <relation type="label-for" target="width3mf"/>
- <relation type="label-for" target="width2mf"/>
- <relation type="label-for" target="width1mf"/>
- </accessibility>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="width3mf">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">center</property>
- <property name="hexpand">True</property>
- <property name="adjustment">adjustment7</property>
- <property name="digits">2</property>
- <accessibility>
- <relation type="labelled-by" target="widthft"/>
- </accessibility>
- </object>
- <packing>
- <property name="left_attach">4</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="width2mf">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">center</property>
- <property name="hexpand">True</property>
- <property name="adjustment">adjustment6</property>
- <property name="digits">2</property>
- <accessibility>
- <relation type="labelled-by" target="widthft"/>
- </accessibility>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="width1mf">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">center</property>
- <property name="hexpand">True</property>
- <property name="adjustment">adjustment2</property>
- <property name="digits">2</property>
- <accessibility>
- <relation type="labelled-by" target="widthft"/>
- </accessibility>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="distft">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="columnpage|distft">Spacing:</property>
- <property name="xalign">1</property>
- <accessibility>
- <relation type="label-for" target="spacing1mf"/>
- <relation type="label-for" target="spacing2mf"/>
- </accessibility>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkGrid" id="grid15">
+ <object class="GtkGrid" id="grid8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">center</property>
- <property name="column_spacing">24</property>
+ <property name="halign">start</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
- <object class="GtkSpinButton" id="spacing1mf">
+ <object class="GtkLabel" id="columnft">
+ <property name="width_request">100</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="columnpage|columnft">Column:</property>
+ <property name="xalign">0</property>
+ <accessibility>
+ <relation type="label-for" target="back"/>
+ <relation type="label-for" target="next"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label">_1</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">width1mf</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label">_2</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">width2mf</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label">_3</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">width3mf</property>
+ </object>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="widthft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="columnpage|widthft">Width:</property>
+ <property name="xalign">0</property>
+ <accessibility>
+ <relation type="label-for" target="width3mf"/>
+ <relation type="label-for" target="width2mf"/>
+ <relation type="label-for" target="width1mf"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="width3mf">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">center</property>
- <property name="adjustment">adjustment3</property>
+ <property name="hexpand">True</property>
+ <property name="adjustment">adjustment7</property>
<property name="digits">2</property>
<accessibility>
- <relation type="labelled-by" target="distft"/>
+ <relation type="labelled-by" target="widthft"/>
</accessibility>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left_attach">4</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="spacing2mf">
+ <object class="GtkSpinButton" id="width2mf">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">center</property>
- <property name="adjustment">adjustment8</property>
+ <property name="hexpand">True</property>
+ <property name="adjustment">adjustment6</property>
<property name="digits">2</property>
<accessibility>
- <relation type="labelled-by" target="distft"/>
+ <relation type="labelled-by" target="widthft"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="width1mf">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">center</property>
+ <property name="hexpand">True</property>
+ <property name="adjustment">adjustment2</property>
+ <property name="digits">2</property>
+ <accessibility>
+ <relation type="labelled-by" target="widthft"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="distft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="columnpage|distft">Spacing:</property>
+ <property name="xalign">0</property>
+ <accessibility>
+ <relation type="label-for" target="spacing1mf"/>
+ <relation type="label-for" target="spacing2mf"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid15">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="column_spacing">24</property>
+ <child>
+ <object class="GtkSpinButton" id="spacing1mf">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">center</property>
+ <property name="adjustment">adjustment3</property>
+ <property name="digits">2</property>
+ <accessibility>
+ <relation type="labelled-by" target="distft"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spacing2mf">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">center</property>
+ <property name="adjustment">adjustment8</property>
+ <property name="digits">2</property>
+ <accessibility>
+ <relation type="labelled-by" target="distft"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="width">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="back">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="image">image7</property>
+ <accessibility>
+ <relation type="labelled-by" target="columnft"/>
</accessibility>
</object>
<packing>
@@ -272,81 +316,41 @@
<property name="top_attach">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkButton" id="next">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="image">image8</property>
+ <accessibility>
+ <relation type="labelled-by" target="columnft"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">5</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">2</property>
- <property name="width">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="autowidth">
- <property name="label" translatable="yes"
context="columnpage|autowidth">Auto_Width</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">3</property>
- <property name="width">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="back">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="image">image7</property>
- <accessibility>
- <relation type="labelled-by" target="columnft"/>
- </accessibility>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="next">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="image">image8</property>
- <accessibility>
- <relation type="labelled-by" target="columnft"/>
- </accessibility>
- </object>
- <packing>
- <property name="left_attach">5</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
</child>
@@ -389,12 +393,13 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="linestyleft">
+ <property name="width_request">100</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes"
context="columnpage|linestyleft">St_yle:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">linestylelb</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -408,11 +413,11 @@
<property name="label" translatable="yes"
context="columnpage|linewidthft">_Width:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">linewidthmf</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
@@ -422,11 +427,11 @@
<property name="label" translatable="yes"
context="columnpage|lineheightft">H_eight:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">lineheightmf</property>
- <property name="xalign">1</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">3</property>
</packing>
</child>
<child>
@@ -436,11 +441,11 @@
<property name="label" translatable="yes"
context="columnpage|lineposft">_Position:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">lineposlb</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">2</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
@@ -450,7 +455,6 @@
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
- <property name="label" translatable="no"></property>
<child>
<placeholder/>
</child>
@@ -472,7 +476,7 @@
</object>
<packing>
<property name="left_attach">3</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
@@ -482,8 +486,8 @@
<property name="adjustment">adjustment5</property>
</object>
<packing>
- <property name="left_attach">3</property>
- <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
@@ -495,7 +499,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
@@ -505,14 +509,13 @@
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
- <property name="label" translatable="no"></property>
<child>
<placeholder/>
</child>
</object>
<packing>
- <property name="left_attach">5</property>
- <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
@@ -522,11 +525,11 @@
<property name="label" translatable="yes"
context="columnpage|linecolorft">_Color:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">colorlb</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">4</property>
- <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
@@ -535,6 +538,18 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
</object>
@@ -592,12 +607,13 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="label3">
+ <property name="width_request">100</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes"
context="columnpage|label3">Columns:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">colsnf</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -650,8 +666,6 @@
<object class="GtkComboBoxText" id="applytolb">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="halign">start</property>
- <property name="hexpand">True</property>
<items>
<item id="0" translatable="yes"
context="columnpage|liststore2">Selection</item>
<item id="1" translatable="yes"
context="columnpage|liststore2">Current Section</item>
@@ -672,7 +686,7 @@
<property name="label" translatable="yes"
context="columnpage|applytoft">_Apply to:</property>
<property name="use_underline">True</property>
<property
name="mnemonic_widget">applytolb</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -689,6 +703,7 @@
<object class="GtkGrid" id="grid7">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="textdirectionft">
@@ -697,7 +712,7 @@
<property name="label" translatable="yes"
context="columnpage|textdirectionft">Text _direction:</property>
<property name="use_underline">True</property>
<property
name="mnemonic_widget">textdirectionlb</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
