dbaccess/uiconfig/ui/sqlexception.ui | 87 ++++++++++++++++------------------- vcl/qt5/QtBuilder.cxx | 1 2 files changed, 43 insertions(+), 45 deletions(-)
New commits: commit 18c7beb4887a1e7d8cd39044d137e711575f600a Author: Michael Weghorn <[email protected]> AuthorDate: Fri Feb 20 12:14:01 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Feb 21 02:32:31 2026 +0100 dbaccess: Resave sqlexception.ui with glade 3.40 The dialog can be triggered like this: * start Writer * enable "View" -> "Toolbars" -> "Mail Merge" * press the "Address Book Source" toolbar button * press the "Assign" button in the dialog * in the "Address Book Data Source Wizard" dialog that shows up, select "Thunderbird" and press "Next" button * in the dialog showing an error message that shows up, press the "More" button Change-Id: I6daf78edc1c842df0da7b7d3582d5601ad11a721 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199856 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/dbaccess/uiconfig/ui/sqlexception.ui b/dbaccess/uiconfig/ui/sqlexception.ui index 93f93598e313..962e7b36cf40 100644 --- a/dbaccess/uiconfig/ui/sqlexception.ui +++ b/dbaccess/uiconfig/ui/sqlexception.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.20.2 --> +<!-- Generated with glade 3.40.0 --> <interface domain="dba"> <requires lib="gtk+" version="3.24"/> <object class="GtkTreeStore" id="liststore1"> @@ -13,30 +13,30 @@ </columns> </object> <object class="GtkDialog" id="SQLExceptionDialog"> - <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="can-focus">False</property> + <property name="border-width">6</property> <property name="title" translatable="yes" context="sqlexception|SQLExceptionDialog">Error Details</property> <property name="modal">True</property> - <property name="default_width">0</property> - <property name="default_height">0</property> - <property name="type_hint">dialog</property> + <property name="default-width">0</property> + <property name="default-height">0</property> + <property name="type-hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> - <property name="can_focus">False</property> - <property name="layout_style">end</property> + <property name="can-focus">False</property> + <property name="layout-style">end</property> <child> <object class="GtkButton" id="ok"> <property name="label" translatable="yes" context="stock">_OK</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="has-default">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -49,58 +49,58 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">0</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=2 --> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> <child> <object class="GtkLabel" id="label2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="sqlexception|label2">Error _list:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">list</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">list</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="label3"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="sqlexception|label3">_Description:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">description</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">description</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="shadow_type">in</property> + <property name="shadow-type">in</property> <child> <object class="GtkTextView" id="description"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="editable">False</property> @@ -108,28 +108,28 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="left-attach">1</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkScrolledWindow" id="scrolledwindow2"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="shadow_type">in</property> + <property name="shadow-type">in</property> <child> <object class="GtkTreeView" id="list"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="model">liststore1</property> - <property name="headers_visible">False</property> - <property name="headers_clickable">False</property> - <property name="search_column">0</property> - <property name="show_expanders">False</property> + <property name="headers-visible">False</property> + <property name="headers-clickable">False</property> + <property name="search-column">0</property> + <property name="show-expanders">False</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection1"/> </child> @@ -157,8 +157,8 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> </object> @@ -173,8 +173,5 @@ <action-widgets> <action-widget response="-5">ok</action-widget> </action-widgets> - <child> - <placeholder/> - </child> </object> </interface> commit b01a2f7955419551afb883fe554a69a1fcbfa3c0 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Feb 20 11:56:27 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Feb 21 02:32:25 2026 +0100 tdf#130857 qt weld: Specify plain text format for labels By default, QLabel::textFormat [1] is Qt::AutoText, meaning [2]: > The text string is interpreted as for Qt::RichText if > Qt::mightBeRichText() returns true, otherwise as Qt::PlainText. However, for the uses of weld::Label, the passed text is supposed to be plain text. Therefore, explicitly set the text format to be plain text. This fixes the issue mentioned in previous commit Change-Id: I9d078e33442c134e9af46c5c24799e80a55c7b22 Author: Michael Weghorn <[email protected]> Date: Fri Feb 20 11:41:24 2026 +0100 tdf#130857 qt weld: Support sw "Match Fields" dialog : > Currently, the dialog has an issue that not all > address elements (first column) are shown properly, e.g. > instead of "<Title>", no label is shown. "<Title>" was interpreted as potentially being an HTML tag, therefore not rendered literally. With this commit in place, it is displayed as expected. [1] https://doc.qt.io/qt-6/qlabel.html#textFormat-prop [2] https://doc.qt.io/qt-6/qt.html#TextFormat-enum Change-Id: I6dd8435f5fccd1be05c785c84196dba09f7886b5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199855 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtBuilder.cxx b/vcl/qt5/QtBuilder.cxx index 64893cd78c3e..c038a986bdbd 100644 --- a/vcl/qt5/QtBuilder.cxx +++ b/vcl/qt5/QtBuilder.cxx @@ -298,6 +298,7 @@ QObject* QtBuilder::makeObject(QObject* pParent, std::u16string_view sName, std: else if (sName == u"GtkLabel") { QLabel* pLabel = new QLabel(pParentWidget); + pLabel->setTextFormat(Qt::TextFormat::PlainText); setLabelProperties(*pLabel, rMap); extractMnemonicWidget(rId, rMap); pObject = pLabel;
