desktop/uiconfig/ui/showlicensedialog.ui | 47 ++++++++++++++----------------- vcl/qt5/QtInstanceBuilder.cxx | 2 + 2 files changed, 24 insertions(+), 25 deletions(-)
New commits: commit 39c0bd189a56a27dceff740d01162f5de99fe99e Author: Michael Weghorn <[email protected]> AuthorDate: Thu Oct 16 23:55:37 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Oct 17 12:14:36 2025 +0200 tdf#130857 qt weld: Support Calc duplicates 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. To trigger the dialog: * start Calc * enter data in a few cells in column A * select the cells * "Data" -> "Duplicates" Change-Id: Ibee57c47b0871ad08f91e4e2cd048215fa04f764 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192559 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index af202d584090..ccbd29c779f3 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -132,6 +132,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"modules/scalc/ui/definedatabaserangedialog.ui"_ustr, u"modules/scalc/ui/deletecells.ui"_ustr, u"modules/scalc/ui/deletecontents.ui"_ustr, + u"modules/scalc/ui/duplicaterecordsdlg.ui"_ustr, u"modules/scalc/ui/gotosheetdialog.ui"_ustr, u"modules/scalc/ui/groupbydate.ui"_ustr, u"modules/scalc/ui/inputstringdialog.ui"_ustr, commit a13ac49f87244fbc57ef43833bad4c247ef6ceac Author: Michael Weghorn <[email protected]> AuthorDate: Thu Oct 16 23:47:26 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Oct 17 12:14:30 2025 +0200 tdf#130857 qt weld: Support dialog to show extension license 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. To trigger the dialog: * install an extension, e.g. "Tango color palette" [1], restart LO * "Tools" -> "Extensions" * right-click on the extension to open the context menu * select "Show License" context menu entry [1] https://extensions.libreoffice.org/en/extensions/show/tango-color-variations Change-Id: I7e499c6547385518226ed8f1689f8290b5b85571 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192558 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index f84f3e4057ab..af202d584090 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -119,6 +119,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"dbaccess/ui/savedialog.ui"_ustr, u"dbaccess/ui/tabledesignsavemodifieddialog.ui"_ustr, u"desktop/ui/installforalldialog.ui"_ustr, + u"desktop/ui/showlicensedialog.ui"_ustr, u"desktop/ui/licensedialog.ui"_ustr, u"filter/ui/pdfoptionsdialog.ui"_ustr, u"filter/ui/testxmlfilter.ui"_ustr, commit 85e1e1e3fc8c61c7a5f3f0243cf72e07dd0b114f Author: Michael Weghorn <[email protected]> AuthorDate: Thu Oct 16 23:44:41 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Oct 17 12:14:22 2025 +0200 desktop: Resave showlicensedialog.ui with glade 3.40 To trigger the dialog: * install an extension, e.g. "Tango color palette" [1], restart LO * "Tools" -> "Extensions" * right-click on the extension to open the context menu * select "Show License" context menu entry [1] https://extensions.libreoffice.org/en/extensions/show/tango-color-variations Change-Id: I24bdd4eab4617eb841172b259e1b181639c84820 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192557 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/desktop/uiconfig/ui/showlicensedialog.ui b/desktop/uiconfig/ui/showlicensedialog.ui index b53c5d00457b..13996f7e8f9d 100644 --- a/desktop/uiconfig/ui/showlicensedialog.ui +++ b/desktop/uiconfig/ui/showlicensedialog.ui @@ -1,40 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.40.0 --> <interface domain="dkt"> <requires lib="gtk+" version="3.20"/> <object class="GtkDialog" id="ShowLicenseDialog"> - <child internal-child="accessible"> - <object class="AtkObject" id="ShowLicenseDialog-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="showlicensedialog|extended_tip|ShowLicenseDialog">Read the license. Click the Scroll Down button to scroll down if necessary. Click Accept to continue the installation of the extension.</property> - </object> - </child> - <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="showlicensedialog|ShowLicenseDialog">Extension Software License Agreement</property> <property name="modal">True</property> - <property name="default_width">0</property> - <property name="default_height">0</property> - <property name="type_hint">dialog</property> - <child> - <placeholder/> - </child> + <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="close"> <property name="label" translatable="yes" context="stock">_Close</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> @@ -47,21 +39,21 @@ <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> <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="textview"> <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> @@ -79,5 +71,10 @@ <action-widgets> <action-widget response="-7">close</action-widget> </action-widgets> + <child internal-child="accessible"> + <object class="AtkObject" id="ShowLicenseDialog-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="showlicensedialog|extended_tip|ShowLicenseDialog">Read the license. Click the Scroll Down button to scroll down if necessary. Click Accept to continue the installation of the extension.</property> + </object> + </child> </object> </interface>
