cui/uiconfig/ui/optjsearchpage.ui | 270 +++++++++++++++---------------
cui/uiconfig/ui/similaritysearchdialog.ui | 90 +++++-----
vcl/qt5/QtInstanceBuilder.cxx | 1
3 files changed, 181 insertions(+), 180 deletions(-)
New commits:
commit e28f452794366469ebfb3ac947cb520250d243a3
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu May 29 11:28:33 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri May 30 07:46:05 2025 +0200
cui: Resave optjsearchpage.ui with glade 3.40
A dialog using it can be triggered as follows:
* In Writer, select "Tools" -> "Find and Replace"
* check the "Sounds like (Japanese)" checkbox in the dialog
* click on the "Sounds..." button
Change-Id: Ia99c65e17677e42727a3efa5573c17ce79f1427e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185996
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/cui/uiconfig/ui/optjsearchpage.ui
b/cui/uiconfig/ui/optjsearchpage.ui
index e4f96549ef48..1538b6bfa731 100644
--- a/cui/uiconfig/ui/optjsearchpage.ui
+++ b/cui/uiconfig/ui/optjsearchpage.ui
@@ -1,39 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="cui">
<requires lib="gtk+" version="3.20"/>
<object class="GtkBox" id="OptJSearchPage">
<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>
- <property name="border_width">6</property>
+ <property name="border-width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="can-focus">False</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=2 n-rows=8 -->
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <property name="column_homogeneous">True</property>
+ <property name="can-focus">False</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">12</property>
+ <property name="column-homogeneous">True</property>
<child>
<object class="GtkCheckButton" id="matchcase">
<property name="label" translatable="yes"
context="optjsearchpage|matchcase">_uppercase/lowercase</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="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="matchcase-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|matchcase">Specifies the options to be
treated as equal in a search.</property>
@@ -41,18 +41,18 @@
</child>
</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="GtkCheckButton" id="matchfullhalfwidth">
<property name="label" translatable="yes"
context="optjsearchpage|matchfullhalfwidth">_full-width/half-width
forms</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="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="matchfullhalfwidth-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|matchfullhalfwidth">Specifies the
options to be treated as equal in a search.</property>
@@ -60,18 +60,18 @@
</child>
</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="GtkCheckButton" id="matchhiraganakatakana">
<property name="label" translatable="yes"
context="optjsearchpage|matchhiraganakatakana">_hiragana/katakana</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="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject"
id="matchhiraganakatakana-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|matchhiraganakatakana">Specifies the
options to be treated as equal in a search.</property>
@@ -79,18 +79,18 @@
</child>
</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="GtkCheckButton" id="matchcontractions">
<property name="label" translatable="yes"
context="optjsearchpage|matchcontractions">_contractions (yo-on,
sokuon)</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="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="matchcontractions-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|matchcontractions">Specifies the
options to be treated as equal in a search.</property>
@@ -98,18 +98,18 @@
</child>
</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="GtkCheckButton" id="matchminusdashchoon">
<property name="label" translatable="yes"
context="optjsearchpage|matchminusdashchoon">_minus/dash/cho-on</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="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="matchminusdashchoon-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|matchminusdashchoon">Specifies the
options to be treated as equal in a search.</property>
@@ -117,18 +117,18 @@
</child>
</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="GtkCheckButton" id="matchrepeatcharmarks">
<property name="label" translatable="yes"
context="optjsearchpage|matchrepeatcharmarks">It_eration marks</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="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject"
id="matchrepeatcharmarks-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|matchrepeatcharmarks">Specifies the
options to be treated as equal in a search.</property>
@@ -136,18 +136,18 @@
</child>
</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="GtkCheckButton" id="matchvariantformkanji">
<property name="label" translatable="yes"
context="optjsearchpage|matchvariantformkanji">_variant-form kanji
(itaiji)</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="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject"
id="matchvariantformkanji-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|matchvariantformkanji">Specifies the
options to be treated as equal in a search.</property>
@@ -155,18 +155,18 @@
</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>
<child>
<object class="GtkCheckButton" id="matcholdkanaforms">
<property name="label" translatable="yes"
context="optjsearchpage|matcholdkanaforms">_old Kana forms</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="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="matcholdkanaforms-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|matcholdkanaforms">Specifies the
options to be treated as equal in a search.</property>
@@ -174,18 +174,18 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">7</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">7</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="matchdiziduzu">
<property name="label" translatable="yes"
context="optjsearchpage|matchdiziduzu">_di/zi, du/zu</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="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="matchdiziduzu-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|matchdiziduzu">Specifies the options
to be treated as equal in a search.</property>
@@ -193,18 +193,18 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="matchbavahafa">
<property name="label" translatable="yes"
context="optjsearchpage|matchbavahafa">_ba/va, ha/fa</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="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="matchbavahafa-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|matchbavahafa">Specifies the options
to be treated as equal in a search.</property>
@@ -212,18 +212,18 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="matchtsithichidhizi">
<property name="label" translatable="yes"
context="optjsearchpage|matchtsithichidhizi">_tsi/thi/chi, dhi/zi</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="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="matchtsithichidhizi-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|matchtsithichidhizi">Specifies the
options to be treated as equal in a search.</property>
@@ -231,18 +231,18 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="matchhyuiyubyuvyu">
<property name="label" translatable="yes"
context="optjsearchpage|matchhyuiyubyuvyu">h_yu/fyu, byu/vyu</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="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="matchhyuiyubyuvyu-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|matchhyuiyubyuvyu">Specifies the
options to be treated as equal in a search.</property>
@@ -250,18 +250,18 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="matchseshezeje">
<property name="label" translatable="yes"
context="optjsearchpage|matchseshezeje">_se/she, ze/je</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="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="matchseshezeje-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|matchseshezeje">Specifies the options
to be treated as equal in a search.</property>
@@ -269,18 +269,18 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">4</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="matchiaiya">
<property name="label" translatable="yes"
context="optjsearchpage|matchiaiya">_ia/iya (piano/piyano)</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="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="matchiaiya-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|matchiaiya">Specifies the options to
be treated as equal in a search.</property>
@@ -288,18 +288,18 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">5</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="matchkiku">
<property name="label" translatable="yes"
context="optjsearchpage|matchkiku">_ki/ku (tekisuto/tekusuto)</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="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="matchkiku-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|matchkiku">Specifies the options to be
treated as equal in a search.</property>
@@ -307,18 +307,18 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">6</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">6</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="matchprolongedsoundmark">
<property name="label" translatable="yes"
context="optjsearchpage|matchprolongedsoundmark">Prolon_ged vowels
(ka-/kaa)</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="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject"
id="matchprolongedsoundmark-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|matchprolongedsoundmark">Specifies the
options to be treated as equal in a search.</property>
@@ -326,8 +326,8 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">7</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">7</property>
</packing>
</child>
</object>
@@ -335,7 +335,7 @@
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="optjsearchpage|label1">Treat as Equal</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -352,27 +352,27 @@
<child>
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="can-focus">False</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=2 n-rows=2 -->
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <property name="column_homogeneous">True</property>
+ <property name="can-focus">False</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">12</property>
+ <property name="column-homogeneous">True</property>
<child>
<object class="GtkCheckButton" id="ignorepunctuation">
<property name="label" translatable="yes"
context="optjsearchpage|ignorepunctuation">Pu_nctuation characters</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="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="ignorepunctuation-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|ignorepunctuation">Specifies the
characters to be ignored.</property>
@@ -380,18 +380,18 @@
</child>
</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="GtkCheckButton" id="ignorewhitespace">
<property name="label" translatable="yes"
context="optjsearchpage|ignorewhitespace">_Whitespace characters</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="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="ignorewhitespace-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|ignorewhitespace">Specifies the
characters to be ignored.</property>
@@ -399,18 +399,18 @@
</child>
</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="GtkCheckButton" id="ignoremiddledot">
<property name="label" translatable="yes"
context="optjsearchpage|ignoremiddledot">Midd_le dots</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="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="ignoremiddledot-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|ignoremiddledot">Specifies the
characters to be ignored.</property>
@@ -418,8 +418,8 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
@@ -430,7 +430,7 @@
<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="optjsearchpage|label2">Ignore</property>
<attributes>
<attribute name="weight" value="bold"/>
commit 8d506ae58d4a83fb673b0360ce79a18500d5d3af
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu May 29 11:24:30 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri May 30 07:45:58 2025 +0200
tdf#130857 Define widgets in "Similarity Search" dlg in order
Switch the order in which the widgets in the .ui file
are defined so that the order matches the visual appearance
(and "left-attach"/"top-attach" properties order), which makes sure
that tab focus order with the Qt-based VCL plugins is correct as well
when using native Qt widgets (SAL_VCL_QT_USE_WELDED_WIDGETS=1), where
focus order is (by default) based on widget creation order.
See
commit 02692566ad9fc7c3484f8581ffa0004cd4e43987
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Thu Oct 24 17:43:35 2024 +0200
tdf#130857 optnewdictionarydialog.ui: Define focusable widgets in
order
for more background.
This dialog can be triggered as follows:
* In Writer, select "Tools" -> "Find and Replace"
* check the "Similarity search" checkbox in the dialog
* click on the "Similarities..." button
Change-Id: I552538b9c9b8da9583409e6680cfc98c62236ccf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185995
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/cui/uiconfig/ui/similaritysearchdialog.ui
b/cui/uiconfig/ui/similaritysearchdialog.ui
index 6ff9ecd8f40c..15ec84eb482e 100644
--- a/cui/uiconfig/ui/similaritysearchdialog.ui
+++ b/cui/uiconfig/ui/similaritysearchdialog.ui
@@ -117,102 +117,102 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label3">
+ <object class="GtkSpinButton" id="otherfld">
<property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="similaritysearchdialog|label3">_Add characters:</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">longerfld</property>
- <property name="xalign">1</property>
+ <property name="can-focus">True</property>
+ <property name="truncate-multiline">True</property>
+ <property name="adjustment">adjustment1</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="otherfld-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="similaritysearchdialog|extended_tip|otherfld">Enter
the number of characters in the search term that can be exchanged.</property>
+ </object>
+ </child>
</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="GtkLabel" id="label4">
+ <object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="similaritysearchdialog|label4">_Remove characters:</property>
+ <property name="label" translatable="yes"
context="similaritysearchdialog|label3">_Add characters:</property>
<property name="use-underline">True</property>
- <property name="mnemonic-widget">shorterfld</property>
+ <property name="mnemonic-widget">longerfld</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left-attach">0</property>
- <property name="top-attach">2</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="relaxbox">
- <property name="label" translatable="yes"
context="similaritysearchdialog|relaxbox">_Combine</property>
+ <object class="GtkSpinButton" id="longerfld">
<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="draw-indicator">True</property>
+ <property name="truncate-multiline">True</property>
+ <property name="adjustment">adjustment2</property>
<child internal-child="accessible">
- <object class="AtkObject" id="relaxbox-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes"
context="similaritysearchdialog|extended_tip|relaxbox">Searches for a term that
matches any combination of the similarity search settings.</property>
+ <object class="AtkObject" id="longerfld-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes"
context="similaritysearchdialog|extended_tip|longerfld">Enter the maximum
number of characters by which a word can exceed the number of characters in the
search term.</property>
</object>
</child>
</object>
<packing>
- <property name="left-attach">0</property>
- <property name="top-attach">3</property>
- <property name="width">2</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="otherfld">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="truncate-multiline">True</property>
- <property name="adjustment">adjustment1</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="otherfld-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="similaritysearchdialog|extended_tip|otherfld">Enter
the number of characters in the search term that can be exchanged.</property>
- </object>
- </child>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="similaritysearchdialog|label4">_Remove characters:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">shorterfld</property>
+ <property name="xalign">1</property>
</object>
<packing>
- <property name="left-attach">1</property>
- <property name="top-attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="longerfld">
+ <object class="GtkSpinButton" id="shorterfld">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="truncate-multiline">True</property>
- <property name="adjustment">adjustment2</property>
+ <property name="adjustment">adjustment3</property>
<child internal-child="accessible">
- <object class="AtkObject" id="longerfld-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes"
context="similaritysearchdialog|extended_tip|longerfld">Enter the maximum
number of characters by which a word can exceed the number of characters in the
search term.</property>
+ <object class="AtkObject" id="shorterfld-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes"
context="similaritysearchdialog|extended_tip|shorterfld">Enter the number of
characters by which a word can be shorter than the search term.</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">1</property>
- <property name="top-attach">1</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="shorterfld">
+ <object class="GtkCheckButton" id="relaxbox">
+ <property name="label" translatable="yes"
context="similaritysearchdialog|relaxbox">_Combine</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
- <property name="truncate-multiline">True</property>
- <property name="adjustment">adjustment3</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
- <object class="AtkObject" id="shorterfld-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes"
context="similaritysearchdialog|extended_tip|shorterfld">Enter the number of
characters by which a word can be shorter than the search term.</property>
+ <object class="AtkObject" id="relaxbox-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes"
context="similaritysearchdialog|extended_tip|relaxbox">Searches for a term that
matches any combination of the similarity search settings.</property>
</object>
</child>
</object>
<packing>
- <property name="left-attach">1</property>
- <property name="top-attach">2</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">3</property>
+ <property name="width">2</property>
</packing>
</child>
</object>
commit 638c4f8c996bbe38cd8379817c82ae2ba3ef7205
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu May 29 11:18:30 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri May 30 07:45:51 2025 +0200
tdf#130857 qt weld: Support "Similarity Search" dialog
This means that native Qt widgets are used for that dialog
now when using the qt5 or qt6 VCL plugin and starting LO with
environment variable SAL_VCL_QT_USE_WELDED_WIDGETS=1 set.
This dialog can be triggered as follows:
* In Writer, select "Tools" -> "Find and Replace"
* check the "Similarity search" checkbox in the dialog
* click on the "Similarities..." button
Change-Id: I39c1d08e72e506b8a22bdd31d1d2c389b399566c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185994
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx
index 485c22389b3a..6bceecf6ccbb 100644
--- a/vcl/qt5/QtInstanceBuilder.cxx
+++ b/vcl/qt5/QtInstanceBuilder.cxx
@@ -83,6 +83,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString&
rUIFile, const weld::W
u"cui/ui/querydialog.ui"_ustr,
u"cui/ui/securityoptionsdialog.ui"_ustr,
u"cui/ui/selectpathdialog.ui"_ustr,
+ u"cui/ui/similaritysearchdialog.ui"_ustr,
u"cui/ui/spelloptionsdialog.ui"_ustr,
u"cui/ui/splitcellsdialog.ui"_ustr,
u"cui/ui/tipofthedaydialog.ui"_ustr,
