sw/uiconfig/swriter/ui/captionoptions.ui | 169 +++++++++++++++----------------
1 file changed, 84 insertions(+), 85 deletions(-)
New commits:
commit ce15f7b5999d119b1c6ec726731c32c321f7dc92
Author: Seth Chaiklin <sdc.bla...@youmail.dk>
AuthorDate: Thu Mar 16 10:42:09 2023 +0000
Commit: Seth Chaiklin <sdc.bla...@youmail.dk>
CommitDate: Fri Mar 17 23:42:29 2023 +0000
tdf#154214 redesign of Caption Options dialog
Change-Id: I7cb9c8a01b8ae2482b7dbce976288df1b878b87c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148964
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/sw/uiconfig/swriter/ui/captionoptions.ui
b/sw/uiconfig/swriter/ui/captionoptions.ui
index 9ea0823846c5..6f83e1c9d880 100644
--- a/sw/uiconfig/swriter/ui/captionoptions.ui
+++ b/sw/uiconfig/swriter/ui/captionoptions.ui
@@ -81,7 +81,7 @@
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="frame3">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
@@ -89,7 +89,7 @@
<property name="shadow-type">none</property>
<child>
<!-- n-columns=2 n-rows=2 -->
- <object class="GtkGrid" id="grid2">
+ <object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-start">12</property>
@@ -98,76 +98,75 @@
<property name="row-spacing">6</property>
<property name="column-spacing">12</property>
<child>
- <object class="GtkComboBoxText" id="level">
+ <object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="tooltip-text" translatable="yes"
context="captionoptions|tooltip_text|level">Prepend the heading number of the
first prior heading whose outline level is equal to or less than the selected
outline level. If [None] is selected, no heading number is prepended.</property>
- <property name="hexpand">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="level-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="captionoptions|extended_tip|level">Prepend the
heading number of the first prior heading whose outline level is equal to or
less than the selected outline level. For example, select “2” to display the
heading number of the first prior heading with outline level 1 or outline level
2. If [None] is selected, no heading number is displayed.</property>
- </object>
- </child>
+ <property name="label" translatable="yes"
context="captionoptions|label7">Caption order:</property>
+ <property name="use-underline">True</property>
+ <property
name="mnemonic-widget">caption_order</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="left-attach">1</property>
+ <property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
- <object class="GtkEntry" id="separator">
+ <object class="GtkComboBoxText" id="caption_order">
<property name="visible">True</property>
- <property name="can-focus">True</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
- <property name="activates-default">True</property>
- <property name="truncate-multiline">True</property>
- <property name="tooltip_text" translatable="yes"
context="captionoptions|tooltip_text|separator">Enter the character to display
between the heading number and the caption number.</property>
+ <items>
+ <item translatable="yes"
context="captionoptions|liststore1">Category first</item>
+ <item translatable="yes"
context="captionoptions|liststore1">Numbering first</item>
+ </items>
<child internal-child="accessible">
- <object class="AtkObject" id="separator-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="captionoptions|extended_tip|separator">Enter the
character to display between the heading number and the caption
number.</property>
+ <object class="AtkObject"
id="caption_order-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="captionoptions|extended_tip|caption_order">Place
the caption number before or after the caption category.</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">1</property>
- <property name="top-attach">1</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label5">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="captionoptions|label5">_Up to level:</property>
+ <property name="label" translatable="yes"
context="captionoptions|label4">Character style:</property>
<property name="use-underline">True</property>
- <property name="mnemonic-widget">level</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
- <property name="top-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label6">
+ <object class="GtkComboBoxText" id="style">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="captionoptions|label6">_Separator:</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">separator</property>
- <property name="xalign">1</property>
+ <property name="hexpand">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="style-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="captionoptions|extended_tip|style">Specifies the
character style for the caption category and caption number.</property>
+ </object>
+ </child>
</object>
<packing>
- <property name="left-attach">0</property>
+ <property name="left-attach">1</property>
<property name="top-attach">1</property>
</packing>
</child>
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="captionoptions|label1">Heading Number Before Caption Number</property>
+ <property name="label" translatable="yes"
context="captionoptions|label3">Category and Caption Number</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -188,7 +187,7 @@
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
- <!-- n-columns=2 n-rows=2 -->
+ <!-- n-columns=2 n-rows=1 -->
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -197,39 +196,9 @@
<property name="hexpand">True</property>
<property name="row-spacing">6</property>
<property name="column-spacing">12</property>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="captionoptions|label4">Character style:</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">style</property>
- <property name="xalign">1</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="style">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="hexpand">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="style-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="captionoptions|extended_tip|style">Specifies the
character style.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
<child>
<object class="GtkCheckButton" id="border_and_shadow">
- <property name="label" translatable="yes"
context="captionoptions|border_and_shadow">_Apply border and shadow</property>
+ <property name="label" translatable="yes"
context="captionoptions|border_and_shadow">_Use border and shadow of selected
object</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
@@ -244,7 +213,7 @@
</object>
<packing>
<property name="left-attach">0</property>
- <property name="top-attach">1</property>
+ <property name="top-attach">0</property>
<property name="width">2</property>
</packing>
</child>
@@ -254,7 +223,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="captionoptions|label2">Category and Frame Format</property>
+ <property name="label" translatable="yes"
context="captionoptions|label2">Frame Format</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -268,15 +237,15 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame3">
+ <object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
- <!-- n-columns=2 n-rows=1 -->
- <object class="GtkGrid" id="grid3">
+ <!-- n-columns=2 n-rows=2 -->
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-start">12</property>
@@ -285,46 +254,76 @@
<property name="row-spacing">6</property>
<property name="column-spacing">12</property>
<child>
- <object class="GtkLabel" id="label7">
+ <object class="GtkComboBoxText" id="level">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="captionoptions|label7">Caption order:</property>
- <property name="use-underline">True</property>
- <property
name="mnemonic-widget">caption_order</property>
- <property name="xalign">1</property>
+ <property name="tooltip-text" translatable="yes"
context="captionoptions|tooltip_text|level">Prepend the heading number of the
first prior heading whose outline level is equal to or less than the selected
outline level. If [None] is selected, no heading number is prepended.</property>
+ <property name="hexpand">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="level-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="captionoptions|extended_tip|level">Prepend the
heading number of the first prior heading whose outline level is equal to or
less than the selected outline level. For example, select “2” to display the
heading number of the first prior heading with outline level 1 or outline level
2. If [None] is selected, no heading number is displayed.</property>
+ </object>
+ </child>
</object>
<packing>
- <property name="left-attach">0</property>
+ <property name="left-attach">1</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="caption_order">
+ <object class="GtkEntry" id="separator">
<property name="visible">True</property>
- <property name="can-focus">False</property>
+ <property name="can-focus">True</property>
+ <property name="tooltip-text" translatable="yes"
context="captionoptions|tooltip_text|separator">Enter the character to display
between the heading number and the caption number.</property>
<property name="hexpand">True</property>
- <items>
- <item translatable="yes"
context="captionoptions|liststore1">Category first</item>
- <item translatable="yes"
context="captionoptions|liststore1">Numbering first</item>
- </items>
+ <property name="activates-default">True</property>
+ <property name="truncate-multiline">True</property>
<child internal-child="accessible">
- <object class="AtkObject"
id="caption_order-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="captionoptions|extended_tip|caption_order">Place
the caption number before or after the caption category.</property>
+ <object class="AtkObject" id="separator-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="captionoptions|extended_tip|separator">Enter the
character to display between the heading number and the caption
number.</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">1</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="captionoptions|label5">_Up to level:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">level</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="captionoptions|label6">_Separator:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">separator</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label3">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="captionoptions|label3">Caption</property>
+ <property name="label" translatable="yes"
context="captionoptions|label1">Heading Number Before Caption Number</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
