vcl/CustomTarget_qt5_moc.mk | 1 + vcl/CustomTarget_qt6_moc.mk | 1 + vcl/inc/qt5/QtInstanceRadioButton.hxx | 6 +++++- vcl/qt5/QtInstanceBuilder.cxx | 2 ++ vcl/qt5/QtInstanceRadioButton.cxx | 2 ++ 5 files changed, 11 insertions(+), 1 deletion(-)
New commits: commit 2c93a8b474f6fc2420c01aa1e9cad2963c6c9c16 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Oct 29 20:16:06 2024 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Oct 30 09:08:08 2024 +0100 tdf#130857 qt weld: Declare support for Calc "Select Source" dialog Add .ui file for Calc's "Select Source" dialog to list of files supported by QtInstanceBuilder, so that native Qt widgets are used for that dialog now when using the qt5/qt6 VCL plugins, unless environment variable SAL_VCL_QT_NO_WELDED_WIDGETS=1 is set. This dialog is e.g. used for "Insert" -> "Pivot Table" in Calc. Change-Id: I4e9397f665f83cff099a7fb91d5e310b249be933 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175800 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index 033aaa445a3a..17e8d90d039e 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -46,6 +46,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile) u"cui/ui/querysetinsmodedialog.ui"_ustr, u"cui/ui/securityoptionsdialog.ui"_ustr, u"modules/scalc/ui/inputstringdialog.ui"_ustr, + u"modules/scalc/ui/selectsource.ui"_ustr, u"modules/schart/ui/insertaxisdlg.ui"_ustr, u"modules/smath/ui/alignmentdialog.ui"_ustr, u"modules/swriter/ui/inforeadonlydialog.ui"_ustr, commit 8bf22f69ffd2fb24b14297b8f869eb8371dfbb21 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Oct 29 20:12:53 2024 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Oct 30 09:08:01 2024 +0100 tdf#130857 qt weld: Signal when radio button gets toggled Call weld::RadioButton::signal_toggle when the QRadioButton::toggled signal gets emitted. Change-Id: Ib9713c452fef94448a4f101a7ef6b1dc1d93966c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175799 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/vcl/CustomTarget_qt5_moc.mk b/vcl/CustomTarget_qt5_moc.mk index 26533420c67f..9be6abc8a399 100644 --- a/vcl/CustomTarget_qt5_moc.mk +++ b/vcl/CustomTarget_qt5_moc.mk @@ -19,6 +19,7 @@ $(call gb_CustomTarget_get_target,vcl/qt5) : \ $(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceEntry.moc \ $(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceLinkButton.moc \ $(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceMessageDialog.moc \ + $(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceRadioButton.moc \ $(gb_CustomTarget_workdir)/vcl/qt5/QtMainWindow.moc \ $(gb_CustomTarget_workdir)/vcl/qt5/QtMenu.moc \ $(gb_CustomTarget_workdir)/vcl/qt5/QtTransferable.moc \ diff --git a/vcl/CustomTarget_qt6_moc.mk b/vcl/CustomTarget_qt6_moc.mk index f31184182a82..facb45db49f7 100644 --- a/vcl/CustomTarget_qt6_moc.mk +++ b/vcl/CustomTarget_qt6_moc.mk @@ -19,6 +19,7 @@ $(call gb_CustomTarget_get_target,vcl/qt6) : \ $(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceEntry.moc \ $(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceLinkButton.moc \ $(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceMessageDialog.moc \ + $(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceRadioButton.moc \ $(gb_CustomTarget_workdir)/vcl/qt6/QtMainWindow.moc \ $(gb_CustomTarget_workdir)/vcl/qt6/QtMenu.moc \ $(gb_CustomTarget_workdir)/vcl/qt6/QtTransferable.moc \ diff --git a/vcl/inc/qt5/QtInstanceRadioButton.hxx b/vcl/inc/qt5/QtInstanceRadioButton.hxx index 46eb098f942a..499c86219c56 100644 --- a/vcl/inc/qt5/QtInstanceRadioButton.hxx +++ b/vcl/inc/qt5/QtInstanceRadioButton.hxx @@ -14,8 +14,12 @@ #include <QtCore/QObject> #include <QtWidgets/QRadioButton> -class QtInstanceRadioButton : public QtInstanceWidget, public virtual weld::RadioButton +class QtInstanceRadioButton : public QObject, + public QtInstanceWidget, + public virtual weld::RadioButton { + Q_OBJECT + QRadioButton* m_pRadioButton; public: diff --git a/vcl/qt5/QtInstanceRadioButton.cxx b/vcl/qt5/QtInstanceRadioButton.cxx index 8c5124aa2661..e5bf0918525d 100644 --- a/vcl/qt5/QtInstanceRadioButton.cxx +++ b/vcl/qt5/QtInstanceRadioButton.cxx @@ -8,6 +8,7 @@ */ #include <QtInstanceRadioButton.hxx> +#include <QtInstanceRadioButton.moc> #include <vcl/qt/QtUtils.hxx> @@ -16,6 +17,7 @@ QtInstanceRadioButton::QtInstanceRadioButton(QRadioButton* pRadioButton) , m_pRadioButton(pRadioButton) { assert(m_pRadioButton); + connect(m_pRadioButton, &QRadioButton::toggled, this, [&] { signal_toggled(); }); } void QtInstanceRadioButton::set_active(bool bActive) commit 7adf81494411fa8401d70f4e4cda02547883a5d2 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Oct 29 19:58:18 2024 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Oct 30 09:07:53 2024 +0100 tdf#130857 qt weld: Declare support for "Security Options" dialog Add .ui file of the "Security Options and Warnings" dialog that can be triggered via "Tools" -> "Options" -> "LibreOfficeDev" -> "Security", then pressing the "Options..." button there to list of files supported by QtInstanceBuilder, so that native Qt widgets are used for that dialog now when using the qt5/qt6 VCL plugins, unless environment variable SAL_VCL_QT_NO_WELDED_WIDGETS=1 is set. Change-Id: Ife7422cb82358d91e3b2092037768231669fcab3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175798 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index 86189c951e73..033aaa445a3a 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -44,6 +44,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile) u"cui/ui/aboutdialog.ui"_ustr, u"cui/ui/optnewdictionarydialog.ui"_ustr, u"cui/ui/querysetinsmodedialog.ui"_ustr, + u"cui/ui/securityoptionsdialog.ui"_ustr, u"modules/scalc/ui/inputstringdialog.ui"_ustr, u"modules/schart/ui/insertaxisdlg.ui"_ustr, u"modules/smath/ui/alignmentdialog.ui"_ustr,
