vcl/inc/qt5/QtInstanceWidget.hxx | 4 +-- vcl/qt5/QtInstanceBuilder.cxx | 4 ++- vcl/qt5/QtInstanceWidget.cxx | 40 +++++++++++++++++++++++++++++++++------ 3 files changed, 39 insertions(+), 9 deletions(-)
New commits: commit 933e05818a9e4a79347eed09ef16a75cff5a695f Author: Michael Weghorn <[email protected]> AuthorDate: Sun Nov 23 01:37:55 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Nov 24 22:50:23 2025 +0100 tdf#130857 qt weld: Support "Define Bibliography Entry" 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 like this: * start Writer * "Insert" -> "Table of Contents and Index" -> "Citation" * press "Edit" button Change-Id: Ifdb016034dab793046f6ceb2a15f0a8556753d1e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194379 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index 05174895eabe..117c545d4f6f 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -171,6 +171,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"modules/swriter/ui/captionoptions.ui"_ustr, u"modules/swriter/ui/columndialog.ui"_ustr, u"modules/swriter/ui/columnwidth.ui"_ustr, + u"modules/swriter/ui/createauthorentry.ui"_ustr, u"modules/swriter/ui/editcategories.ui"_ustr, u"modules/swriter/ui/endnotepage.ui"_ustr, u"modules/swriter/ui/footendnotedialog.ui"_ustr, @@ -268,6 +269,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"modules/scalc/ui/subtotalgrppage.ui"_ustr, u"modules/scalc/ui/subtotaloptionspage.ui"_ustr, u"modules/simpress/ui/annotationtagmenu.ui"_ustr, + u"modules/swriter/ui/bibliofragment.ui"_ustr, u"modules/swriter/ui/columnpage.ui"_ustr, u"modules/swriter/ui/optcaptionpage.ui"_ustr, u"modules/swriter/ui/printoptionspage.ui"_ustr, commit c6a1b92dd14a4f345cff5896e17258c1ccd5da02 Author: Michael Weghorn <[email protected]> AuthorDate: Sun Nov 23 01:26:52 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Nov 24 22:50:17 2025 +0100 tdf#130857 qt weld: Implement QtInstanceWidget::{g,s}et_{h,v}expand Change-Id: Ie7350ddc860a3e4640ed563f2e0dcb317fec4552 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194378 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/inc/qt5/QtInstanceWidget.hxx b/vcl/inc/qt5/QtInstanceWidget.hxx index b30b2d3efbab..ed208bb4b9fa 100644 --- a/vcl/inc/qt5/QtInstanceWidget.hxx +++ b/vcl/inc/qt5/QtInstanceWidget.hxx @@ -80,11 +80,11 @@ public: virtual OUString get_help_id() const override; - virtual void set_hexpand(bool) override; + virtual void set_hexpand(bool bExpand) override; virtual bool get_hexpand() const override; - virtual void set_vexpand(bool) override; + virtual void set_vexpand(bool bExpand) override; virtual bool get_vexpand() const override; diff --git a/vcl/qt5/QtInstanceWidget.cxx b/vcl/qt5/QtInstanceWidget.cxx index 4f0dfcd0073b..ce2a8515b7a7 100644 --- a/vcl/qt5/QtInstanceWidget.cxx +++ b/vcl/qt5/QtInstanceWidget.cxx @@ -380,20 +380,48 @@ OUString QtInstanceWidget::get_help_id() const return toOUString(aHelpIdVariant.toString()); } -void QtInstanceWidget::set_hexpand(bool) { assert(false && "Not implemented yet"); } +void QtInstanceWidget::set_hexpand(bool bExpand) +{ + SolarMutexGuard g; + + GetQtInstance().RunInMainThread([&] { + QSizePolicy aSizePolicy = m_pWidget->sizePolicy(); + aSizePolicy.setHorizontalPolicy(bExpand ? QSizePolicy::Expanding : QSizePolicy::Preferred); + m_pWidget->setSizePolicy(aSizePolicy); + }); +} bool QtInstanceWidget::get_hexpand() const { - assert(false && "Not implemented yet"); - return true; + SolarMutexGuard g; + + bool bExpand = false; + GetQtInstance().RunInMainThread( + [&] { bExpand = m_pWidget->sizePolicy().horizontalPolicy() == QSizePolicy::Expanding; }); + + return bExpand; } -void QtInstanceWidget::set_vexpand(bool) { assert(false && "Not implemented yet"); } +void QtInstanceWidget::set_vexpand(bool bExpand) +{ + SolarMutexGuard g; + + GetQtInstance().RunInMainThread([&] { + QSizePolicy aSizePolicy = m_pWidget->sizePolicy(); + aSizePolicy.setVerticalPolicy(bExpand ? QSizePolicy::Expanding : QSizePolicy::Preferred); + m_pWidget->setSizePolicy(aSizePolicy); + }); +} bool QtInstanceWidget::get_vexpand() const { - assert(false && "Not implemented yet"); - return true; + SolarMutexGuard g; + + bool bExpand = false; + GetQtInstance().RunInMainThread( + [&] { bExpand = m_pWidget->sizePolicy().verticalPolicy() == QSizePolicy::Expanding; }); + + return bExpand; } void QtInstanceWidget::set_margin_top(int nMargin) commit c2bb4f7235fe303304c198735220ca9ef99dd63f Author: Michael Weghorn <[email protected]> AuthorDate: Sun Nov 23 00:46:05 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Nov 24 22:50:09 2025 +0100 tdf#130857 qt weld: Sort alphabetically Change-Id: Iff1a10be9b0983f2837969da6ccdddcd996d5262 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194374 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index efe9a7c6bc18..05174895eabe 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -268,8 +268,8 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"modules/scalc/ui/subtotalgrppage.ui"_ustr, u"modules/scalc/ui/subtotaloptionspage.ui"_ustr, u"modules/simpress/ui/annotationtagmenu.ui"_ustr, - u"modules/swriter/ui/optcaptionpage.ui"_ustr, u"modules/swriter/ui/columnpage.ui"_ustr, + u"modules/swriter/ui/optcaptionpage.ui"_ustr, u"modules/swriter/ui/printoptionspage.ui"_ustr, u"modules/swriter/ui/statisticsinfopage.ui"_ustr, u"modules/swriter/ui/wrappage.ui"_ustr,
