sw/uiconfig/swriter/ui/editcategories.ui | 215 +++++++++++++++----------------
vcl/qt5/QtInstanceBuilder.cxx | 1
2 files changed, 107 insertions(+), 109 deletions(-)
New commits:
commit bad507e7bcb050621acc1b61b0fc8ba1de539f90
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Apr 25 20:51:19 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Apr 26 00:33:14 2025 +0200
tdf#130857 Define widgets in sw "Edit Categories" dialog 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.
To trigger the dialog in Writer:
"Tools" -> "AutoText", click "Categories" button.
Change-Id: I2ce55680902895171d5655b9e2c90275a492d3ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184649
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/sw/uiconfig/swriter/ui/editcategories.ui
b/sw/uiconfig/swriter/ui/editcategories.ui
index ce8ffe10efc7..5fc9a484b498 100644
--- a/sw/uiconfig/swriter/ui/editcategories.ui
+++ b/sw/uiconfig/swriter/ui/editcategories.ui
@@ -147,6 +147,68 @@
<property name="row-spacing">6</property>
<property name="column-spacing">12</property>
<property name="column-homogeneous">True</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="editcategories|label1">Category</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">name</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="label2">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="editcategories|label2">Path</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">pathlb</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="name">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="max-length">256</property>
+ <property name="activates-default">True</property>
+ <property name="truncate-multiline">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="name-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="editcategories|extended_tip|name">Displays the name
of the selected AutoText category. To change the name of the category, type a
new name, and then click Rename. To create a new category, type a name, and
then click New.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="pathlb">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="hexpand">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="pathlb-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="editcategories|extended_tip|pathlb">Displays the
current path to the directory where the selected AutoText category files are
stored. If you are creating an AutoText category, select where you want to
store the category files.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
@@ -221,68 +283,6 @@
<property name="width">2</property>
</packing>
</child>
- <child>
- <object class="GtkComboBoxText" id="pathlb">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="hexpand">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="pathlb-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="editcategories|extended_tip|pathlb">Displays the
current path to the directory where the selected AutoText category files are
stored. If you are creating an AutoText category, select where you want to
store the category files.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="editcategories|label2">Path</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">pathlb</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="editcategories|label1">Category</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">name</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="GtkEntry" id="name">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="max-length">256</property>
- <property name="activates-default">True</property>
- <property name="truncate-multiline">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="name-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="editcategories|extended_tip|name">Displays the name
of the selected AutoText category. To change the name of the category, type a
new name, and then click Rename. To create a new category, type a name, and
then click New.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">1</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
commit e61fcdec4d35cce45b32ea8ca1f6b7007721f156
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Apr 25 20:44:54 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Apr 26 00:33:06 2025 +0200
tdf#130857 qt weld: Support AutoText "Edit Categories" 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.
To trigger the dialog in Writer:
"Tools" -> "AutoText", click "Categories" button.
Change-Id: I4936591068ad1cac1a5ca3b1fef1405109258637
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184648
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx
index 90a2e0a82f9e..ff073b2e6917 100644
--- a/vcl/qt5/QtInstanceBuilder.cxx
+++ b/vcl/qt5/QtInstanceBuilder.cxx
@@ -112,6 +112,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString&
rUIFile)
u"modules/spropctrlr/ui/taborder.ui"_ustr,
u"modules/swriter/ui/authenticationsettingsdialog.ui"_ustr,
u"modules/swriter/ui/columnwidth.ui"_ustr,
+ u"modules/swriter/ui/editcategories.ui"_ustr,
u"modules/swriter/ui/endnotepage.ui"_ustr,
u"modules/swriter/ui/footendnotedialog.ui"_ustr,
u"modules/swriter/ui/footnotepage.ui"_ustr,
commit 00bf583504252c48e63206795422cc2d6fc1d95d
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Apr 25 20:41:44 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Apr 26 00:33:01 2025 +0200
sw: Resave editcategories.ui with glade 3.40
To trigger the dialog in Writer:
"Tools" -> "AutoText", click "Categories" button.
Change-Id: Ic718173aa1c8a468af963ac28381d2c0bcecfb9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184647
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sw/uiconfig/swriter/ui/editcategories.ui
b/sw/uiconfig/swriter/ui/editcategories.ui
index 4f498ce52adb..ce8ffe10efc7 100644
--- a/sw/uiconfig/swriter/ui/editcategories.ui
+++ b/sw/uiconfig/swriter/ui/editcategories.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="sw">
<requires lib="gtk+" version="3.20"/>
<object class="GtkTreeStore" id="liststore1">
@@ -13,29 +13,29 @@
</columns>
</object>
<object class="GtkDialog" id="EditCategoriesDialog">
- <property name="can_focus">False</property>
- <property name="border_width">6</property>
+ <property name="can-focus">False</property>
+ <property name="border-width">6</property>
<property name="title" translatable="yes"
context="editcategories|EditCategoriesDialog">Edit Categories</property>
<property name="modal">True</property>
- <property name="default_width">0</property>
- <property name="default_height">0</property>
- <property name="type_hint">dialog</property>
+ <property name="default-width">0</property>
+ <property name="default-height">0</property>
+ <property name="type-hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
+ <property name="can-focus">False</property>
+ <property name="layout-style">end</property>
<child>
<object class="GtkButton" id="new">
<property name="label" translatable="yes"
context="stock">_New</property>
<property name="visible">True</property>
<property name="sensitive">False</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="use-underline">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="new-atkobject">
@@ -54,8 +54,8 @@
<property name="label" translatable="yes"
context="stock">_Delete</property>
<property name="visible">True</property>
<property name="sensitive">False</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="use-underline">True</property>
</object>
<packing>
@@ -69,9 +69,9 @@
<property name="label" translatable="yes"
context="editcategories|rename">_Rename</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="use-underline">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="rename-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="editcategories|extended_tip|rename">Changes the
name of the selected AutoText category to the name that you enter in the Name
box.</property>
@@ -88,10 +88,10 @@
<object class="GtkButton" id="ok">
<property name="label" translatable="yes"
context="stock">_OK</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="has-default">True</property>
+ <property name="receives-default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -104,8 +104,8 @@
<object class="GtkButton" id="cancel">
<property name="label" translatable="yes"
context="stock">_Cancel</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="use-underline">True</property>
</object>
<packing>
@@ -118,8 +118,8 @@
<object class="GtkButton" id="help">
<property name="label" translatable="yes"
context="stock">_Help</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="use-underline">True</property>
</object>
<packing>
@@ -133,53 +133,53 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack_type">end</property>
+ <property name="pack-type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=2 n-rows=4 -->
<object class="GtkGrid" id="grid1">
<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="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <property name="column_homogeneous">True</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">12</property>
+ <property name="column-homogeneous">True</property>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="editcategories|label3">Selection list</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">group</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">group</property>
<property name="xalign">0</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>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="shadow-type">in</property>
<child>
<object class="GtkTreeView" id="group">
<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="hexpand">True</property>
<property name="vexpand">True</property>
<property name="model">liststore1</property>
- <property name="headers_visible">False</property>
- <property name="search_column">0</property>
- <property name="show_expanders">False</property>
+ <property name="headers-visible">False</property>
+ <property name="search-column">0</property>
+ <property name="show-expanders">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="Macro Library
List-selection1"/>
</child>
@@ -216,15 +216,15 @@
</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>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="pathlb">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="pathlb-atkobject">
@@ -233,44 +233,44 @@
</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="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="editcategories|label2">Path</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">pathlb</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">pathlb</property>
<property name="xalign">0</property>
</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="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="editcategories|label1">Category</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">name</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">name</property>
<property name="xalign">0</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="GtkEntry" id="name">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="max_length">256</property>
- <property name="activates_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="max-length">256</property>
+ <property name="activates-default">True</property>
<property name="truncate-multiline">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="name-atkobject">
@@ -279,8 +279,8 @@
</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>
</object>
@@ -300,9 +300,6 @@
<action-widget response="-6">cancel</action-widget>
<action-widget response="-11">help</action-widget>
</action-widgets>
- <child type="titlebar">
- <placeholder/>
- </child>
<child internal-child="accessible">
<object class="AtkObject" id="EditCategoriesDialog-atkobject">
<property name="AtkObject::accessible-description" translatable="yes"
context="editcategories|extended_tip|EditCategoriesDialog">Adds, renames, or
deletes AutoText categories.</property>
