vcl/qt5/QtInstanceBuilder.cxx | 2 ++
vcl/qt5/QtInstanceLabel.cxx | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit fb591ac1b7debcd90cfa9d35fb5392599de9bb2e
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Feb 5 13:14:15 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Feb 7 09:58:49 2025 +0100
tdf#130857 qt weld: Convert accelerator when setting label text
Without this, the label in the second dialog mentioned
in the commit message of
Change-Id: Icab9171faa2a011e65796f468f29ee1517ae4f01
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Wed Feb 5 13:06:01 2025 +0100
tdf#130857 qt weld: Support Base dialogs asking to save changes
would have a label containing the literal text "~Table Name"
instead of "Table Name" with the "T" used as accelerator.
Change-Id: Iae3cc053216c6cb565cc5137fbfd7e58c19f2089
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181163
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/vcl/qt5/QtInstanceLabel.cxx b/vcl/qt5/QtInstanceLabel.cxx
index 6e4029138bb7..ec6775ea6106 100644
--- a/vcl/qt5/QtInstanceLabel.cxx
+++ b/vcl/qt5/QtInstanceLabel.cxx
@@ -22,7 +22,8 @@ QtInstanceLabel::QtInstanceLabel(QLabel* pLabel)
void QtInstanceLabel::set_label(const OUString& rText)
{
SolarMutexGuard g;
- GetQtInstance().RunInMainThread([&] { m_pLabel->setText(toQString(rText));
});
+ GetQtInstance().RunInMainThread(
+ [&] { m_pLabel->setText(vclToQtStringWithAccelerator(rText)); });
}
OUString QtInstanceLabel::get_label() const
commit d423dcf8ea0009214eda772e333960084887ef52
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Feb 5 13:06:01 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Feb 7 09:58:35 2025 +0100
tdf#130857 qt weld: Support Base dialogs asking to save changes
Declare support for the 2 dialogs that can be triggered like this:
1) Start Base, create a new database
2) With the "Tables" section enabled, click on
"Create Table in Design View..."
3) In the table that shows up, do any changes.
4) close window
-> A dialog asking whether changes should be saved shows up.
(This is "dbaccess/ui/tabledesignsavemodifieddialog.ui".)
5) Select "Yes"
-> A dialog allowing to enter a name for the table
shows up.
(This is "dbaccess/ui/savedialog.ui".)
This means that native Qt widgets are used for these dialogs
now when using the qt5 or qt6 VCL plugin and starting LO with
environment variable SAL_VCL_QT_USE_WELDED_WIDGETS=1 set.
Change-Id: Icab9171faa2a011e65796f468f29ee1517ae4f01
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181162
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx
index 08e3a49d09be..cf59e6a6605d 100644
--- a/vcl/qt5/QtInstanceBuilder.cxx
+++ b/vcl/qt5/QtInstanceBuilder.cxx
@@ -74,6 +74,8 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString&
rUIFile)
u"cui/ui/splitcellsdialog.ui"_ustr,
u"cui/ui/tipofthedaydialog.ui"_ustr,
u"cui/ui/toolbarmodedialog.ui"_ustr,
+ u"dbaccess/ui/savedialog.ui"_ustr,
+ u"dbaccess/ui/tabledesignsavemodifieddialog.ui"_ustr,
u"modules/scalc/ui/inputstringdialog.ui"_ustr,
u"modules/scalc/ui/insertcells.ui"_ustr,
u"modules/scalc/ui/movecopysheet.ui"_ustr,
