extensions/uiconfig/spropctrlr/ui/formattedsample.ui | 20 +++++++++---------- vcl/qt5/QtInstanceBuilder.cxx | 3 ++ 2 files changed, 13 insertions(+), 10 deletions(-)
New commits: commit cf27fa6d7879fd199972f036d9b6985f0682aad6 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Feb 26 01:08:36 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Feb 28 00:55:18 2026 +0100 tdf#130857 qt weld: Support "Properties: Formatted Field" dlg 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 like this: * start Writer * "Form" -> "Formatted Field" * click and drag mouse in the document to insert the form control * double-click on the inserted form control to open the properties dialog Previously, the top-level dialog was declared as supported but these UI files used in the dialog were not, resulting in an assert getting triggered when trying to start the dialog: soffice.bin: /home/michi/development/git/libreoffice/vcl/qt6/../qt5/QtInstanceContainer.cxx:27: auto QtInstanceContainer::move(weld::Widget *, weld::Container *)::(anonymous class)::operator()() const: Assertion `pQtInstanceWidget' failed. Change-Id: I315f0b91d88ba829347584a70f886f8ea95a6c1c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200370 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index a8060bf58541..d7e07078d1d3 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -357,6 +357,8 @@ constexpr auto SUPPORTED_WITH_QT_PARENT = frozen::make_unordered_set<std::u16str u"modules/spropctrlr/ui/colorlistbox.ui", u"modules/spropctrlr/ui/combobox.ui", u"modules/spropctrlr/ui/datefield.ui", + u"modules/spropctrlr/ui/formattedcontrol.ui", + u"modules/spropctrlr/ui/formattedsample.ui", u"modules/spropctrlr/ui/formproperties.ui", u"modules/spropctrlr/ui/listbox.ui", u"modules/spropctrlr/ui/multiline.ui", commit 8355b1c0da52faa2af35ae2333a9a19d9dfdb7c5 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Feb 26 01:04:49 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Feb 28 00:55:10 2026 +0100 spropctrlr: Resave formattedsample.ui with glade 3.40 This UI file is used by the dialog that can be triggered like this: * start Writer * "Form" -> "Formatted Field" * click and drag mouse in the document to insert the form control * double-click on the inserted form control to open the properties dialog Change-Id: Ibcb5da155b0c91a002264639576350d49e59c945 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200369 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/extensions/uiconfig/spropctrlr/ui/formattedsample.ui b/extensions/uiconfig/spropctrlr/ui/formattedsample.ui index 9068948f6e13..94e60a50cdb2 100644 --- a/extensions/uiconfig/spropctrlr/ui/formattedsample.ui +++ b/extensions/uiconfig/spropctrlr/ui/formattedsample.ui @@ -1,23 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.40.0 --> <interface domain="pcr"> <requires lib="gtk+" version="3.24"/> <object class="GtkAdjustment" id="adjustmentForwardBackward"> <property name="lower">-10000</property> <property name="upper">10000</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkBox" id="formattedsample"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <child> <object class="GtkEntry" id="entry"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="truncate-multiline">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> + <property name="truncate-multiline">True</property> </object> <packing> <property name="expand">False</property> @@ -27,12 +27,12 @@ </child> <child> <object class="GtkSpinButton" id="sample"> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> + <property name="can-focus">True</property> + <property name="no-show-all">True</property> <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustmentForwardBackward</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> + <property name="adjustment">adjustmentForwardBackward</property> <property name="digits">2</property> </object> <packing> commit 24704fb129f56a86a81dd57ed6f67d7bf6f228f4 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Feb 26 00:55:43 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Feb 28 00:55:03 2026 +0100 tdf#130857 qt weld: Support "Properties: Time Field" dlg 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 like this: * start Writer * "Form" -> "More Fields" -> "Time Field" * click and drag mouse in the document to insert the form control * double-click on the inserted form control to open the properties dialog Previously, the top-level dialog was declared as supported but this UI file used in the dialog was not, resulting in an assert getting triggered when trying to start the dialog: soffice.bin: /home/michi/development/git/libreoffice/vcl/qt6/../qt5/QtInstanceContainer.cxx:27: auto QtInstanceContainer::move(weld::Widget *, weld::Container *)::(anonymous class)::operator()() const: Assertion `pQtInstanceWidget' failed. Change-Id: Ibb40f90a886527bdbf25cb537b678055ddd063da Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200368 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index ecde68fd6434..a8060bf58541 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -362,6 +362,7 @@ constexpr auto SUPPORTED_WITH_QT_PARENT = frozen::make_unordered_set<std::u16str u"modules/spropctrlr/ui/multiline.ui", u"modules/spropctrlr/ui/numericfield.ui", u"modules/spropctrlr/ui/textfield.ui", + u"modules/spropctrlr/ui/timefield.ui", u"modules/spropctrlr/ui/urlcontrol.ui", u"modules/swriter/ui/addressfragment.ui", u"modules/swriter/ui/assignfragment.ui",
