sfx2/uiconfig/ui/linefragment.ui | 28 ++++++++++++++-------------- vcl/qt5/QtInstanceBuilder.cxx | 9 +++++++++ 2 files changed, 23 insertions(+), 14 deletions(-)
New commits: commit 5382dc7ad1fbf0dc342a8caf5c190065769f9a10 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Aug 13 23:42:26 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Aug 14 07:53:07 2025 +0200 tdf#130857 Define widgets in "Custom Properties" tab page in order Switch the order in which the widgets in the .ui file are defined so that the order matches the visual appearance and logical 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 <[email protected]> Date: Thu Oct 24 17:43:35 2024 +0200 tdf#130857 optnewdictionarydialog.ui: Define focusable widgets in order for more background. The tab page can be triggered as follows: * start Writer * "File" -> "Properties" * switch to the "Custom Properties" tab * click on the "Add Property" button to add a property Change-Id: Ia4a39a7ddaec7e06fe5ec1b46fc42d9b607c3898 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189545 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/sfx2/uiconfig/ui/linefragment.ui b/sfx2/uiconfig/ui/linefragment.ui index 4abac21a8629..abe3b1d1b680 100644 --- a/sfx2/uiconfig/ui/linefragment.ui +++ b/sfx2/uiconfig/ui/linefragment.ui @@ -49,20 +49,6 @@ <property name="top-attach">0</property> </packing> </child> - <child> - <object class="GtkButton" id="remove"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes" context="linefragment|STR_SFX_REMOVE_PROPERTY">Remove Property</property> - <property name="image">image1</property> - <property name="always-show-image">True</property> - </object> - <packing> - <property name="left-attach">3</property> - <property name="top-attach">0</property> - </packing> - </child> <child> <object class="GtkBox"> <property name="visible">True</property> @@ -231,6 +217,20 @@ <property name="left-attach">2</property> <property name="top-attach">0</property> </packing> + </child> + <child> + <object class="GtkButton" id="remove"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="linefragment|STR_SFX_REMOVE_PROPERTY">Remove Property</property> + <property name="image">image1</property> + <property name="always-show-image">True</property> + </object> + <packing> + <property name="left-attach">3</property> + <property name="top-attach">0</property> + </packing> </child> </object> <object class="GtkSizeGroup" id="sizegroup"> commit 486015864af87a4574e33bbccb169a756a2c0a47 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Aug 13 23:37:20 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Aug 14 07:52:56 2025 +0200 tdf#130857 qt weld: Support document properties 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. The dialog can be triggered via "File" -> "Properties" from the different LibreOffice modules. What exact tab pages get shown in the dialog depends on the module. Change-Id: I932da42b286d9eca787ffe629908bf7e778d8ac0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189543 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index 7d591a85af4d..6b6bbc9150d6 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -167,6 +167,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"modules/swriter/ui/rowheight.ui"_ustr, u"modules/swriter/ui/splittable.ui"_ustr, u"modules/swriter/ui/wordcount.ui"_ustr, + u"sfx/ui/documentpropertiesdialog.ui"_ustr, u"sfx/ui/editdurationdialog.ui"_ustr, u"sfx/ui/helpmanual.ui"_ustr, u"sfx/ui/inputdialog.ui"_ustr, @@ -229,7 +230,15 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"cui/ui/textattrtabpage.ui"_ustr, u"cui/ui/textanimtabpage.ui"_ustr, u"cui/ui/textcolumnstabpage.ui"_ustr, + u"modules/scalc/ui/statisticsinfopage.ui"_ustr, u"modules/swriter/ui/printoptionspage.ui"_ustr, + u"modules/swriter/ui/statisticsinfopage.ui"_ustr, + u"sfx/ui/custominfopage.ui"_ustr, + u"sfx/ui/descriptioninfopage.ui"_ustr, + u"sfx/ui/documentfontspage.ui"_ustr, + u"sfx/ui/documentinfopage.ui"_ustr, + u"sfx/ui/linefragment.ui"_ustr, + u"sfx/ui/securityinfopage.ui"_ustr, u"svt/ui/datewindow.ui"_ustr, u"svx/ui/colorwindow.ui"_ustr, u"vcl/ui/editmenu.ui"_ustr,
