sc/uiconfig/scalc/ui/sidebarnumberformat.ui | 7 +------
sc/uiconfig/scalc/ui/sortcriteriapage.ui | 18 +++++-------------
sc/uiconfig/scalc/ui/sortkey.ui | 10 +++-------
sc/uiconfig/scalc/ui/sortoptionspage.ui | 15 +++------------
sw/uiconfig/swriter/ui/contentcontroldlg.ui | 4 ++--
sw/uiconfig/swriter/ui/flddocumentpage.ui | 2 +-
6 files changed, 15 insertions(+), 41 deletions(-)
New commits:
commit e7a57620c5f9d3ad5e13f0052310fa4e0eb05f89
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Apr 19 21:10:11 2023 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Apr 20 10:12:24 2023 +0200
add truncate-multiline as our usual property
and remove input-purpose as we don't use that, esp for
auto-conversion to gtk4
Change-Id: Icf2f9127b189b9966aac3fcadb09c2a01bd671f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150657
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/uiconfig/scalc/ui/sortoptionspage.ui
b/sc/uiconfig/scalc/ui/sortoptionspage.ui
index 475a64510419..171d5f7feefb 100644
--- a/sc/uiconfig/scalc/ui/sortoptionspage.ui
+++ b/sc/uiconfig/scalc/ui/sortoptionspage.ui
@@ -266,6 +266,7 @@
<property name="has-entry">True</property>
<child internal-child="entry">
<object class="GtkEntry">
+ <property name="truncate-multiline">True</property>
<property name="can-focus">False</property>
</object>
</child>
diff --git a/sw/uiconfig/swriter/ui/contentcontroldlg.ui
b/sw/uiconfig/swriter/ui/contentcontroldlg.ui
index 9bd3f52c4a1c..9b3bfe9296a1 100644
--- a/sw/uiconfig/swriter/ui/contentcontroldlg.ui
+++ b/sw/uiconfig/swriter/ui/contentcontroldlg.ui
@@ -171,11 +171,11 @@
<object class="GtkSpinButton" id="idspinbutton">
<property name="visible">True</property>
<property name="can-focus">True</property>
- <property name="input-purpose">number</property>
<property name="input-hints">GTK_INPUT_HINT_NO_SPELLCHECK |
GTK_INPUT_HINT_NO_EMOJI | GTK_INPUT_HINT_NONE</property>
<property name="snap-to-ticks">True</property>
<property name="numeric">True</property>
<property name="wrap">True</property>
+ <property name="truncate-multiline">True</property>
<accessibility>
<relation type="labelled-by" target="idlabel"/>
</accessibility>
@@ -214,10 +214,10 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="primary-icon-tooltip-text" translatable="yes"
context="contentcontroldlg:tabindexspinbutton">Keyboard tab navigation order:
-1 to exclude from tab stop</property>
- <property name="input-purpose">number</property>
<property name="input-hints">GTK_INPUT_HINT_NO_SPELLCHECK |
GTK_INPUT_HINT_NO_EMOJI | GTK_INPUT_HINT_NONE</property>
<property name="snap-to-ticks">True</property>
<property name="numeric">True</property>
+ <property name="truncate-multiline">True</property>
<accessibility>
<relation type="labelled-by" target="tabindexlabel"/>
</accessibility>
diff --git a/sw/uiconfig/swriter/ui/flddocumentpage.ui
b/sw/uiconfig/swriter/ui/flddocumentpage.ui
index 0929b31f7a69..6849333aabd3 100644
--- a/sw/uiconfig/swriter/ui/flddocumentpage.ui
+++ b/sw/uiconfig/swriter/ui/flddocumentpage.ui
@@ -365,7 +365,7 @@
<child internal-child="accessible">
<object class="AtkObject" id="level-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="flddocumentpage|extended_tip|level">Use this option
to specify which heading before the field to display. The selected heading is
the first one whose outline level is less than or equal to the specified value.
For example, specifying “2” will display the first heading before the field
with outline level 1 or outline level 2. Heading numbers can be enabled by
using “Tools - Heading Numbering“.</property>
- </object>
+ </object>
</child>
</object>
<packing>
commit 81a664b8e5e8a95a06b562873305422e00d02d50
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Apr 19 21:00:19 2023 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Apr 20 10:12:16 2023 +0200
using mnemonic-widget is more idiomatic for a simple label for something
Change-Id: I46f9f9fba894819a7efafcfe8c47229c2b3cf8ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150656
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
index 64526c54f362..8d167ff1cce8 100644
--- a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
+++ b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
@@ -203,10 +203,8 @@
<property name="can-focus">False</property>
<property name="label" translatable="yes"
context="sidebarnumberformat|leadingzeroeslabel">Leading _zeroes:</property>
<property name="use-underline">True</property>
+ <property name="mnemonic-widget">leadingzeroes</property>
<property name="xalign">0</property>
- <accessibility>
- <relation type="label-for" target="leadingzeroes"/>
- </accessibility>
</object>
<packing>
<property name="left-attach">0</property>
@@ -221,9 +219,6 @@
<property name="hexpand">True</property>
<property name="truncate-multiline">True</property>
<property name="adjustment">adjustment1</property>
- <accessibility>
- <relation type="labelled-by" target="leadingzeroeslabel"/>
- </accessibility>
<child internal-child="accessible">
<object class="AtkObject" id="leadingzeroes-atkobject">
<property name="AtkObject::accessible-name" translatable="yes"
context="sidebarnumberformat|leadingzeroes-atkobject">Leading Zeroes</property>
diff --git a/sc/uiconfig/scalc/ui/sortcriteriapage.ui
b/sc/uiconfig/scalc/ui/sortcriteriapage.ui
index f56e5e1fd8ef..49a0d7229368 100644
--- a/sc/uiconfig/scalc/ui/sortcriteriapage.ui
+++ b/sc/uiconfig/scalc/ui/sortcriteriapage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="sc">
<requires lib="gtk+" version="3.20"/>
<object class="GtkBox" id="TopWindow">
@@ -98,9 +98,6 @@
<property name="use-underline">True</property>
<property name="draw-indicator">True</property>
<property name="group">rbTopDown</property>
- <accessibility>
- <relation type="labelled-by" target="lbDirection"/>
- </accessibility>
</object>
<packing>
<property name="left-attach">1</property>
@@ -112,10 +109,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes"
context="sortcriteriapage|lbDirection">Direction:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">rbTopDown</property>
<property name="xalign">1</property>
- <accessibility>
- <relation type="label-for" target="rbLeftRight"/>
- </accessibility>
</object>
<packing>
<property name="left-attach">0</property>
@@ -130,9 +126,6 @@
<property name="receives-default">False</property>
<property name="use-underline">True</property>
<property name="draw-indicator">True</property>
- <accessibility>
- <relation type="labelled-by" target="lbHeader"/>
- </accessibility>
</object>
<packing>
<property name="left-attach">1</property>
@@ -144,10 +137,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes"
context="sortcriteriapage|lbHeader">Headers:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">cbHeader</property>
<property name="xalign">1</property>
- <accessibility>
- <relation type="label-for" target="cbHeader"/>
- </accessibility>
</object>
<packing>
<property name="left-attach">0</property>
diff --git a/sc/uiconfig/scalc/ui/sortkey.ui b/sc/uiconfig/scalc/ui/sortkey.ui
index 781c846ae82f..4ac25149d743 100644
--- a/sc/uiconfig/scalc/ui/sortkey.ui
+++ b/sc/uiconfig/scalc/ui/sortkey.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="sc">
<requires lib="gtk+" version="3.20"/>
<object class="GtkFrame" id="SortKeyFrame">
@@ -29,9 +29,6 @@
<property name="AtkObject::accessible-description"
translatable="yes" context="sortkey|extended_tip|sortlb">Select the column that
you want to use as the primary sort key.</property>
</object>
</child>
- <accessibility>
- <relation type="labelled-by" target="lbColRow"/>
- </accessibility>
</object>
<packing>
<property name="left-attach">1</property>
@@ -84,10 +81,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label">Column/Row:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">sortlb</property>
<property name="xalign">1</property>
- <accessibility>
- <relation type="label-for" target="sortlb"/>
- </accessibility>
</object>
<packing>
<property name="left-attach">0</property>
diff --git a/sc/uiconfig/scalc/ui/sortoptionspage.ui
b/sc/uiconfig/scalc/ui/sortoptionspage.ui
index f807dbcb082b..475a64510419 100644
--- a/sc/uiconfig/scalc/ui/sortoptionspage.ui
+++ b/sc/uiconfig/scalc/ui/sortoptionspage.ui
@@ -238,9 +238,7 @@
<property name="halign">start</property>
<property name="label" translatable="yes"
context="sortoptionspage|label6">Language</property>
<property name="use-underline">True</property>
- <accessibility>
- <relation type="label-for" target="language"/>
- </accessibility>
+ <property name="mnemonic-widget">language</property>
</object>
<packing>
<property name="left-attach">0</property>
@@ -254,9 +252,7 @@
<property name="halign">start</property>
<property name="label" translatable="yes"
context="sortoptionspage|algorithmft">Options</property>
<property name="use-underline">True</property>
- <accessibility>
- <relation type="label-for" target="algorithmlb"/>
- </accessibility>
+ <property name="mnemonic-widget">algorithmlb</property>
</object>
<packing>
<property name="left-attach">1</property>
@@ -278,9 +274,6 @@
<property name="AtkObject::accessible-description"
translatable="yes" context="sortoptionspage|extended_tip|language">Select the
language for the sorting rules.</property>
</object>
</child>
- <accessibility>
- <relation type="labelled-by" target="label6"/>
- </accessibility>
</object>
<packing>
<property name="left-attach">0</property>
@@ -297,9 +290,6 @@
<property name="AtkObject::accessible-description"
translatable="yes" context="sortoptionspage|extended_tip|algorithmlb">Select a
sorting option for the language.</property>
</object>
</child>
- <accessibility>
- <relation type="labelled-by" target="algorithmft"/>
- </accessibility>
</object>
<packing>
<property name="left-attach">1</property>
