sc/uiconfig/scalc/ui/subtotalgrppage.ui | 84 ++++++++++++++++---------------- vcl/qt5/QtInstanceBuilder.cxx | 3 + 2 files changed, 45 insertions(+), 42 deletions(-)
New commits: commit 488ef8bde76ff17c4d042a219a4487f2cc4ad071 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Oct 28 19:47:49 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Oct 29 08:24:16 2025 +0100 tdf#130857 qt weld: Support Calc "Subtotals" 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. This dialog can be triggered in Calc using using "Data" -> "Subtotals". Change-Id: I13a8fea5621ab974ffb301346b539327affaa747 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193118 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index e64207194d58..19745758d478 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -146,6 +146,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"modules/scalc/ui/selectsource.ui"_ustr, u"modules/scalc/ui/showsheetdialog.ui"_ustr, u"modules/scalc/ui/sortdialog.ui"_ustr, + u"modules/scalc/ui/subtotaldialog.ui"_ustr, u"modules/scalc/ui/ttestdialog.ui"_ustr, u"modules/scalc/ui/ztestdialog.ui"_ustr, u"modules/schart/ui/insertaxisdlg.ui"_ustr, @@ -261,6 +262,8 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"modules/scalc/ui/sortkey.ui"_ustr, u"modules/scalc/ui/sortoptionspage.ui"_ustr, u"modules/scalc/ui/statisticsinfopage.ui"_ustr, + u"modules/scalc/ui/subtotalgrppage.ui"_ustr, + u"modules/scalc/ui/subtotaloptionspage.ui"_ustr, u"modules/simpress/ui/annotationtagmenu.ui"_ustr, u"modules/swriter/ui/optcaptionpage.ui"_ustr, u"modules/swriter/ui/columnpage.ui"_ustr, commit 72de964127d822509b126f2a6bf18fbc7cdccb6f Author: Michael Weghorn <[email protected]> AuthorDate: Tue Oct 28 19:44:12 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Oct 29 08:24:10 2025 +0100 sc: Resave subtotalgrppage.ui with glade 3.40 This .ui file is used by the Calc "Subtotals" dialog that can be triggered in Calc using "Data" -> "Subtotals". Change-Id: I3963317d4b5f4a8bad99ead8a23a58bbb6f65c70 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193117 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/sc/uiconfig/scalc/ui/subtotalgrppage.ui b/sc/uiconfig/scalc/ui/subtotalgrppage.ui index 431a3b9190fc..3cee6ed203c8 100644 --- a/sc/uiconfig/scalc/ui/subtotalgrppage.ui +++ b/sc/uiconfig/scalc/ui/subtotalgrppage.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> +<!-- Generated with glade 3.40.0 --> <interface domain="sc"> <requires lib="gtk+" version="3.20"/> <object class="GtkTreeStore" id="liststore1"> @@ -26,25 +26,25 @@ </object> <object class="GtkBox" id="SubTotalGrpPage"> <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="border_width">6</property> + <property name="border-width">6</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkBox" id="box2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes" context="subtotalgrppage|label1">Group by:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">group_by</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">group_by</property> </object> <packing> <property name="expand">False</property> @@ -55,7 +55,7 @@ <child> <object class="GtkComboBoxText" id="group_by"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child internal-child="accessible"> <object class="AtkObject" id="group_by-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="subtotalgrppage|extended_tip|group_by">Select the column that you want to control the subtotal calculation process. If the contents of the selected column change, the subtotals are automatically recalculated.</property> @@ -90,61 +90,61 @@ </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="halign">start</property> <property name="label" translatable="yes" context="subtotalgrppage|label2">Calculate subtotals for:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">columns</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">columns</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="halign">start</property> <property name="label" translatable="yes" context="subtotalgrppage|label3">Use function:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">functions</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">functions</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"> <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="columns"> - <property name="width_request">-1</property> + <property name="width-request">-1</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="model">liststore2</property> - <property name="headers_visible">False</property> - <property name="search_column">1</property> - <property name="show_expanders">False</property> + <property name="headers-visible">False</property> + <property name="search-column">1</property> + <property name="show-expanders">False</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="Macro Library List-selection2"/> </child> @@ -182,29 +182,29 @@ </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> <child> <object class="GtkScrolledWindow"> <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="functions"> - <property name="width_request">-1</property> + <property name="width-request">-1</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">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="search_column">0</property> - <property name="show_expanders">False</property> + <property name="headers-visible">False</property> + <property name="search-column">0</property> + <property name="show-expanders">False</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="Macro Library List-selection1"/> </child> @@ -228,8 +228,8 @@ </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> </object>
