svx/uiconfig/ui/textcharacterspacingcontrol.ui | 185 ++++++++++++-------------
1 file changed, 96 insertions(+), 89 deletions(-)
New commits:
commit 17ac33abe4eb1d406da1060f772562655f973e51
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Oct 15 17:12:02 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Oct 16 11:14:40 2021 +0200
add use-underline to spacing control labels
set all entries to use the same icon-size
Change-Id: Ibb949a039175ce2b93323bace7102a5f32aecfd7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123676
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/svx/uiconfig/ui/textcharacterspacingcontrol.ui
b/svx/uiconfig/ui/textcharacterspacingcontrol.ui
index 01cdd92d5635..ab501712f44e 100644
--- a/svx/uiconfig/ui/textcharacterspacingcontrol.ui
+++ b/svx/uiconfig/ui/textcharacterspacingcontrol.ui
@@ -12,6 +12,7 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property
name="icon-name">svx/res/symphony/spacing_very_tight.png</property>
+ <property name="icon_size">1</property>
</object>
<object class="GtkImage" id="image_spacing_115">
<property name="visible">True</property>
@@ -62,6 +63,7 @@
<property name="receives-default">True</property>
<property name="image">image_spacing_1</property>
<property name="relief">none</property>
+ <property name="use-underline">True</property>
<property name="xalign">0</property>
<property name="always-show-image">True</property>
</object>
@@ -78,6 +80,7 @@
<property name="receives-default">True</property>
<property name="image">image_spacing_115</property>
<property name="relief">none</property>
+ <property name="use-underline">True</property>
<property name="xalign">0</property>
<property name="always-show-image">True</property>
</object>
@@ -94,6 +97,7 @@
<property name="receives-default">True</property>
<property name="image">image_spacing_15</property>
<property name="relief">none</property>
+ <property name="use-underline">True</property>
<property name="xalign">0</property>
<property name="always-show-image">True</property>
</object>
@@ -110,6 +114,7 @@
<property name="receives-default">True</property>
<property name="image">image_spacing_2</property>
<property name="relief">none</property>
+ <property name="use-underline">True</property>
<property name="xalign">0</property>
<property name="always-show-image">True</property>
</object>
@@ -126,6 +131,7 @@
<property name="receives-default">True</property>
<property name="image">image_spacing_3</property>
<property name="relief">none</property>
+ <property name="use-underline">True</property>
<property name="xalign">0</property>
<property name="always-show-image">True</property>
</object>
@@ -142,6 +148,7 @@
<property name="receives-default">True</property>
<property name="image">image_spacing_4</property>
<property name="relief">none</property>
+ <property name="use-underline">True</property>
<property name="xalign">0</property>
<property name="always-show-image">True</property>
</object>
commit 507117d63f9bfa676148ed1018950dfafa6b5fc7
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Oct 15 17:09:29 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Oct 16 11:14:26 2021 +0200
resave with latest glade
Change-Id: I0fae7cd556a6158787e139b0b419e6a7ead18658
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123675
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/svx/uiconfig/ui/textcharacterspacingcontrol.ui
b/svx/uiconfig/ui/textcharacterspacingcontrol.ui
index 66e8ae57394c..01cdd92d5635 100644
--- a/svx/uiconfig/ui/textcharacterspacingcontrol.ui
+++ b/svx/uiconfig/ui/textcharacterspacingcontrol.ui
@@ -1,141 +1,182 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.38.2 -->
<interface domain="svx">
<requires lib="gtk+" version="3.20"/>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="lower">-2</property>
+ <property name="upper">10000</property>
+ <property name="step-increment">0.10</property>
+ <property name="page-increment">1</property>
+ </object>
+ <object class="GtkImage" id="image_spacing_1">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property
name="icon-name">svx/res/symphony/spacing_very_tight.png</property>
+ </object>
+ <object class="GtkImage" id="image_spacing_115">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">svx/res/symphony/spacing_tight.png</property>
+ <property name="icon_size">1</property>
+ </object>
+ <object class="GtkImage" id="image_spacing_15">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">svx/res/symphony/spacing_normal.png</property>
+ <property name="icon_size">1</property>
+ </object>
+ <object class="GtkImage" id="image_spacing_2">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">svx/res/symphony/spacing_loose.png</property>
+ <property name="icon_size">1</property>
+ </object>
+ <object class="GtkImage" id="image_spacing_3">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property
name="icon-name">svx/res/symphony/spacing_very_loose.png</property>
+ <property name="icon_size">1</property>
+ </object>
+ <object class="GtkImage" id="image_spacing_4">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property
name="icon-name">svx/res/symphony/last_custom_common.png</property>
+ <property name="icon_size">1</property>
+ </object>
<object class="GtkPopover" id="TextCharacterSpacingControl">
- <property name="can_focus">False</property>
- <property name="no_show_all">True</property>
- <property name="border_width">4</property>
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
+ <property name="border-width">4</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=1 n-rows=7 -->
<object class="GtkGrid" id="container">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child>
<object class="GtkButton" id="very_tight">
<property name="label" translatable="yes"
context="textcharacterspacingcontrol|very_tight">Very Tight</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="image">image_spacing_1</property>
<property name="relief">none</property>
<property name="xalign">0</property>
- <property name="always_show_image">True</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="tight">
<property name="label" translatable="yes"
context="textcharacterspacingcontrol|tight">Tight</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="image">image_spacing_115</property>
<property name="relief">none</property>
<property name="xalign">0</property>
- <property name="always_show_image">True</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="normal">
<property name="label" translatable="yes"
context="textcharacterspacingcontrol|normal">Normal</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="image">image_spacing_15</property>
<property name="relief">none</property>
<property name="xalign">0</property>
- <property name="always_show_image">True</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkButton" id="loose">
<property name="label" translatable="yes"
context="textcharacterspacingcontrol|loose">Loose</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="image">image_spacing_2</property>
<property name="relief">none</property>
<property name="xalign">0</property>
- <property name="always_show_image">True</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
<object class="GtkButton" id="very_loose">
<property name="label" translatable="yes"
context="textcharacterspacingcontrol|very_loose">Very Loose</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="image">image_spacing_3</property>
<property name="relief">none</property>
<property name="xalign">0</property>
- <property name="always_show_image">True</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkButton" id="last_custom">
<property name="label" translatable="yes"
context="textcharacterspacingcontrol|last_custom">Last Custom Value</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="image">image_spacing_4</property>
<property name="relief">none</property>
<property name="xalign">0</property>
- <property name="always_show_image">True</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_top">6</property>
+ <property name="can-focus">False</property>
+ <property name="margin-top">6</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
<object class="GtkSpinButton" id="kerning">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can-focus">True</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<property name="hexpand">True</property>
- <property name="width_chars">0</property>
+ <property name="width-chars">0</property>
<property name="text" translatable="yes"
context="textcharacterspacingcontrol|kerning">0.0</property>
+ <property name="truncate-multiline">True</property>
<property name="adjustment">adjustment1</property>
<property name="digits">1</property>
- <property name="margin-start">12</property>
- <property name="truncate-multiline">True</property>
- <property name="margin-top">6</property>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="textcharacterspacingcontrol|label2">Custom Value</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -144,52 +185,11 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">6</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">6</property>
</packing>
</child>
</object>
</child>
</object>
- <object class="GtkAdjustment" id="adjustment1">
- <property name="lower">-2</property>
- <property name="upper">10000</property>
- <property name="step_increment">0.1</property>
- <property name="page_increment">1</property>
- </object>
- <object class="GtkImage" id="image_spacing_1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="icon_name">svx/res/symphony/spacing_very_tight.png</property>
- </object>
- <object class="GtkImage" id="image_spacing_115">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">svx/res/symphony/spacing_tight.png</property>
- <property name="icon_size">1</property>
- </object>
- <object class="GtkImage" id="image_spacing_15">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">svx/res/symphony/spacing_normal.png</property>
- <property name="icon_size">1</property>
- </object>
- <object class="GtkImage" id="image_spacing_2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">svx/res/symphony/spacing_loose.png</property>
- <property name="icon_size">1</property>
- </object>
- <object class="GtkImage" id="image_spacing_3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="icon_name">svx/res/symphony/spacing_very_loose.png</property>
- <property name="icon_size">1</property>
- </object>
- <object class="GtkImage" id="image_spacing_4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="icon_name">svx/res/symphony/last_custom_common.png</property>
- <property name="icon_size">1</property>
- </object>
</interface>
