vcl/qt5/QtInstanceBuilder.cxx | 28 ++++++++++++++++++----------
vcl/qt5/QtInstanceTreeView.cxx | 2 +-
2 files changed, 19 insertions(+), 11 deletions(-)
New commits:
commit e7968c5751c21500bb29d56f6d1b23cc0e5a4ea9
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Sun Aug 3 22:58:33 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Mon Aug 4 09:01:38 2025 +0200
tdf#130857 qt weld: Unbreak "Print" option page
Prevent trying to use native Qt widgets for the
"LibreOfficeDev Writer" -> "Print" page in the
"Tools" -> "Options" dialog long as the dialog itself
isn't supported yet, as that results in that page
looking broken with when using the qt5 or qt6 VCL
plugin and starting LO with
environment variable SAL_VCL_QT_USE_WELDED_WIDGETS=1 set.
Declare that .ui file only as supported when a native
parent is used.
Change-Id: Ifbd7e30f162fd3bed6426a145ef36827a1df401a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188902
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx
index cde2892a855b..ba4fa4f30a2d 100644
--- a/vcl/qt5/QtInstanceBuilder.cxx
+++ b/vcl/qt5/QtInstanceBuilder.cxx
@@ -159,7 +159,6 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString&
rUIFile, const weld::W
u"modules/swriter/ui/inserttable.ui"_ustr,
u"modules/swriter/ui/linenumbering.ui"_ustr,
u"modules/swriter/ui/numberingnamedialog.ui"_ustr,
- u"modules/swriter/ui/printoptionspage.ui"_ustr,
u"modules/swriter/ui/renameautotextdialog.ui"_ustr,
u"modules/swriter/ui/renameobjectdialog.ui"_ustr,
u"modules/swriter/ui/rowheight.ui"_ustr,
@@ -212,14 +211,23 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString&
rUIFile, const weld::W
// These UI files are only supported inside native Qt dialogs/widgets
static std::unordered_set<OUString> aSupportedWithQtParent = {
- u"cui/ui/appearance.ui"_ustr,
u"cui/ui/graphictestentry.ui"_ustr,
- u"cui/ui/lineendstabpage.ui"_ustr, u"cui/ui/linetabpage.ui"_ustr,
- u"cui/ui/linestyletabpage.ui"_ustr, u"cui/ui/optlingupage.ui"_ustr,
- u"cui/ui/possizetabpage.ui"_ustr,
u"cui/ui/rotationtabpage.ui"_ustr,
- u"cui/ui/slantcornertabpage.ui"_ustr,
u"cui/ui/textattrtabpage.ui"_ustr,
- u"cui/ui/textanimtabpage.ui"_ustr,
u"cui/ui/textcolumnstabpage.ui"_ustr,
- u"svt/ui/datewindow.ui"_ustr, u"svx/ui/colorwindow.ui"_ustr,
- u"vcl/ui/editmenu.ui"_ustr, u"xmlsec/ui/certdetails.ui"_ustr,
+ u"cui/ui/appearance.ui"_ustr,
+ u"cui/ui/graphictestentry.ui"_ustr,
+ u"cui/ui/lineendstabpage.ui"_ustr,
+ u"cui/ui/linetabpage.ui"_ustr,
+ u"cui/ui/linestyletabpage.ui"_ustr,
+ u"cui/ui/optlingupage.ui"_ustr,
+ u"cui/ui/possizetabpage.ui"_ustr,
+ u"cui/ui/rotationtabpage.ui"_ustr,
+ u"cui/ui/slantcornertabpage.ui"_ustr,
+ u"cui/ui/textattrtabpage.ui"_ustr,
+ u"cui/ui/textanimtabpage.ui"_ustr,
+ u"cui/ui/textcolumnstabpage.ui"_ustr,
+ u"modules/swriter/ui/printoptionspage.ui"_ustr,
+ u"svt/ui/datewindow.ui"_ustr,
+ u"svx/ui/colorwindow.ui"_ustr,
+ u"vcl/ui/editmenu.ui"_ustr,
+ u"xmlsec/ui/certdetails.ui"_ustr,
u"xmlsec/ui/certgeneral.ui"_ustr,
};
commit 53d726da551445844e1a8eeb6a19a9add2b00cd5
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Sun Aug 3 22:51:38 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Mon Aug 4 09:01:32 2025 +0200
tdf#130857 qt weld: Unbreak "Writing Aids" option page
Prevent trying to use native Qt widgets for the
"Languages and Locales" -> "Writing Aids" page as
long as the dialog itself isn't supported yet, as that
results in that page looking broken with when using the
qt5 or qt6 VCL plugin and starting LO with
environment variable SAL_VCL_QT_USE_WELDED_WIDGETS=1 set.
Declare that .ui file only as supported when a native
parent is used.
That file was previously declared as supported in
commit 66a674f915badf9e586b8e3854954d71dc908a4d
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Fri Feb 21 15:33:53 2025 +0100
tdf#130857 qt weld: Support spelling options dialog
because in that scenario it does have native parent
and works fine there.
Change-Id: I185827e0931245d87424dea71fecfd86ca627236
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188901
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx
index 4eb3ceea0e14..cde2892a855b 100644
--- a/vcl/qt5/QtInstanceBuilder.cxx
+++ b/vcl/qt5/QtInstanceBuilder.cxx
@@ -83,7 +83,6 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString&
rUIFile, const weld::W
u"cui/ui/numberdialog.ui"_ustr,
u"cui/ui/objecttitledescdialog.ui"_ustr,
u"cui/ui/objectnamedialog.ui"_ustr,
- u"cui/ui/optlingupage.ui"_ustr,
u"cui/ui/optnewdictionarydialog.ui"_ustr,
u"cui/ui/password.ui"_ustr,
u"cui/ui/pastespecial.ui"_ustr,
@@ -215,12 +214,13 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString&
rUIFile, const weld::W
static std::unordered_set<OUString> aSupportedWithQtParent = {
u"cui/ui/appearance.ui"_ustr,
u"cui/ui/graphictestentry.ui"_ustr,
u"cui/ui/lineendstabpage.ui"_ustr, u"cui/ui/linetabpage.ui"_ustr,
- u"cui/ui/linestyletabpage.ui"_ustr, u"cui/ui/possizetabpage.ui"_ustr,
- u"cui/ui/rotationtabpage.ui"_ustr,
u"cui/ui/slantcornertabpage.ui"_ustr,
- u"cui/ui/textattrtabpage.ui"_ustr,
u"cui/ui/textanimtabpage.ui"_ustr,
- u"cui/ui/textcolumnstabpage.ui"_ustr, u"svt/ui/datewindow.ui"_ustr,
- u"svx/ui/colorwindow.ui"_ustr, u"vcl/ui/editmenu.ui"_ustr,
- u"xmlsec/ui/certdetails.ui"_ustr, u"xmlsec/ui/certgeneral.ui"_ustr,
+ u"cui/ui/linestyletabpage.ui"_ustr, u"cui/ui/optlingupage.ui"_ustr,
+ u"cui/ui/possizetabpage.ui"_ustr,
u"cui/ui/rotationtabpage.ui"_ustr,
+ u"cui/ui/slantcornertabpage.ui"_ustr,
u"cui/ui/textattrtabpage.ui"_ustr,
+ u"cui/ui/textanimtabpage.ui"_ustr,
u"cui/ui/textcolumnstabpage.ui"_ustr,
+ u"svt/ui/datewindow.ui"_ustr, u"svx/ui/colorwindow.ui"_ustr,
+ u"vcl/ui/editmenu.ui"_ustr, u"xmlsec/ui/certdetails.ui"_ustr,
+ u"xmlsec/ui/certgeneral.ui"_ustr,
};
if (aSupportedUIFiles.contains(rUIFile))
commit 44e08e5b7fef8d9aa65e81e6a9a1367b177f473c
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Sun Aug 3 22:36:37 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Mon Aug 4 09:01:26 2025 +0200
tdf#130857 qt weld: Use text col in TreeView::insert
Don't unconditionally insert the text into the first
column in QtInstanceTreeView::insert, but into the
first column that supports text according to the
underlying GtkTreeViewColumn/GtkCellRenderers in the .ui
file. (Use QtInstanceTreeView::set_text which implements
the corresponding logic.)
Together with previous commit
Change-Id: Ic8a59b254f3bac14c3b812f00d0cbfa3740432f2
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Sun Aug 3 22:17:34 2025 +0200
tdf#130857 qt weld: Evaluate GtkCellRenderers to know supported
types
this fixes the problem mentioned in previous commit
Change-Id: Id94e22e879f712bd967431ec0f9dc34e4480e3dd
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Sun Aug 3 22:15:20 2025 +0200
tdf#130857 qt weld: Support Java "Class Path" dialog
> Currently, both the icon and the path are displayed
> in the first column of the tree view and the second
> column remains empty. This will be addressed in
> upcoming commits.
Change-Id: I16f661fb47fedb889743bb8f91b5447a21f9f88f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188892
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/vcl/qt5/QtInstanceTreeView.cxx b/vcl/qt5/QtInstanceTreeView.cxx
index 41b94fe9eea7..3dd253677fea 100644
--- a/vcl/qt5/QtInstanceTreeView.cxx
+++ b/vcl/qt5/QtInstanceTreeView.cxx
@@ -71,7 +71,7 @@ void QtInstanceTreeView::insert(const weld::TreeIter*
pParent, int nPos, const O
const QModelIndex aIndex = modelIndex(nPos, 0, aParentIndex);
QStandardItem* pItem = itemFromIndex(aIndex);
if (pStr)
- pItem->setText(toQString(*pStr));
+ set_text(treeIter(nPos), *pStr);
if (pId)
pItem->setData(toQString(*pId), ROLE_ID);
