cui/uiconfig/ui/optnewdictionarydialog.ui | 66 +++++++++++------------
sw/uiconfig/swriter/ui/renameobjectdialog.ui | 77 ++++++++++++---------------
vcl/qt5/QtInstanceBuilder.cxx | 1
3 files changed, 71 insertions(+), 73 deletions(-)
New commits:
commit 02692566ad9fc7c3484f8581ffa0004cd4e43987
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Oct 24 17:43:35 2024 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Oct 25 08:57:45 2024 +0200
tdf#130857 optnewdictionarydialog.ui: Define focusable widgets in order
Switch the order that the widgets are defined in the .ui file
to match their logical order (to be top to bottom, left to right)
as also described by their "left-attach" and "top-attach"
properties.
This only rearranges the order without changing anything else
for the single children and doesn't have any effect for the gtk3
and VCL implementations.
But as described in more details in
commit 0fe7b3cebc1a070b13b825635f4bd387a22e41ab
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Wed Oct 23 22:43:10 2024 +0200
tdf#130857 printersetupdialog.ui: Define focusable widgets in order
, Qt uses the construction order of widgets to determine
the tab order as well, meaning that focus would unexpectedly jump from
the edit to the checkbox, then back to the combobox without
this commit in place for the qt5 and qt6 VCL plugins in this
dialog ("Tools" -> "Options" -> "Languages and Locales" -> "Writing Aids"
-> "New") now that native Qt widgets are used.
Change-Id: Ib09137cb11dab60c4a1af4fbc3b007e801dea33b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175567
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/cui/uiconfig/ui/optnewdictionarydialog.ui
b/cui/uiconfig/ui/optnewdictionarydialog.ui
index 0566ea9d638d..8f97fa73a2f3 100644
--- a/cui/uiconfig/ui/optnewdictionarydialog.ui
+++ b/cui/uiconfig/ui/optnewdictionarydialog.ui
@@ -89,6 +89,20 @@
<property name="column_spacing">12</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
+ <child>
+ <object class="GtkLabel" id="name_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="optnewdictionarydialog|name_label">_Name:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">nameedit</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="nameedit">
<property name="visible">True</property>
@@ -109,30 +123,39 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="name_label">
+ <object class="GtkLabel" id="language_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="optnewdictionarydialog|name_label">_Name:</property>
+ <property name="label" translatable="yes"
context="optnewdictionarydialog|language_label">_Language:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">nameedit</property>
+ <property name="mnemonic_widget">language</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="language_label">
+ <object class="GtkComboBoxText" id="language">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="optnewdictionarydialog|language_label">_Language:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">language</property>
- <property name="xalign">0</property>
+ <property name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry">
+ <property name="can_focus">True</property>
+ <property name="truncate-multiline">True</property>
+ <property name="activates_default">True</property>
+ </object>
+ </child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="language-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="language">By selecting a certain language you can
limit the use of the custom dictionary.</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>
@@ -156,29 +179,6 @@
<property name="width">2</property>
</packing>
</child>
- <child>
- <object class="GtkComboBoxText" id="language">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_entry">True</property>
- <child internal-child="entry">
- <object class="GtkEntry">
- <property name="can_focus">True</property>
- <property name="truncate-multiline">True</property>
- <property name="activates_default">True</property>
- </object>
- </child>
- <child internal-child="accessible">
- <object class="AtkObject" id="language-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="language">By selecting a certain language you can
limit the use of the custom dictionary.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
</object>
</child>
<child type="label">
commit 9c52785e13f0e4ca8c314730f47b5e887da963fb
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Oct 24 17:36:45 2024 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Oct 25 08:57:38 2024 +0200
sw: Resave renameobjectdialog.ui with glade 3.40
Change-Id: Ib977073b0c7b851f67abc78727b08ba559a501cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175566
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/sw/uiconfig/swriter/ui/renameobjectdialog.ui
b/sw/uiconfig/swriter/ui/renameobjectdialog.ui
index a623970a48c1..83ab85a3a7e6 100644
--- a/sw/uiconfig/swriter/ui/renameobjectdialog.ui
+++ b/sw/uiconfig/swriter/ui/renameobjectdialog.ui
@@ -1,32 +1,32 @@
<?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="GtkDialog" id="RenameObjectDialog">
- <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="renameobjectdialog|RenameObjectDialog">Rename object: </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="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>
@@ -39,8 +39,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>
@@ -53,8 +53,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>
@@ -68,54 +68,54 @@
<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>
<object class="GtkFrame" id="frame1">
<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="label_xalign">0</property>
- <property name="shadow_type">none</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=1 -->
<object class="GtkGrid" id="grid1">
<property name="visible">True</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="can-focus">False</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">12</property>
<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="renameobjectdialog|label2">New name:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">entry</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">entry</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="entry">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can-focus">True</property>
<property name="hexpand">True</property>
+ <property name="activates-default">True</property>
<property name="truncate-multiline">True</property>
- <property name="activates_default">True</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>
</object>
@@ -123,7 +123,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="renameobjectdialog|label1">Change Name</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -144,8 +144,5 @@
<action-widget response="-6">cancel</action-widget>
<action-widget response="-11">help</action-widget>
</action-widgets>
- <child type="titlebar">
- <placeholder/>
- </child>
</object>
</interface>
commit 912ef29867e8d5698ae6613e6a2227d12338abd1
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Oct 24 12:38:18 2024 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Oct 25 08:57:32 2024 +0200
tdf#130857 qt weld: Declare support for "New Dictionary" dialog
Now that previous commits implemented the functionality
required by this dialog, add the .ui file to the list
of supported ones for QtInstanceBuilder.
This dialog can be triggered via "Tools" ->
"Options" -> "Languages and Locales" -> "Writing Aids"
-> "New".
Change-Id: Id5c73d49a374eb0e84944f734126a4164f753b00
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175547
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx
index 908d2ba3e6bb..9e76483c9bed 100644
--- a/vcl/qt5/QtInstanceBuilder.cxx
+++ b/vcl/qt5/QtInstanceBuilder.cxx
@@ -37,6 +37,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString&
rUIFile)
// what is relevant for that particular one, without having to implement
the full
// weld API at once.
static std::unordered_set<OUString> aSupportedUIFiles = {
+ u"cui/ui/optnewdictionarydialog.ui"_ustr,
u"modules/scalc/ui/inputstringdialog.ui"_ustr,
u"modules/schart/ui/insertaxisdlg.ui"_ustr,
u"modules/swriter/ui/inforeadonlydialog.ui"_ustr,
