sw/uiconfig/swriter/ui/mmcreatingdialog.ui | 67 ++++------- sw/uiconfig/swriter/ui/mmresultprintdialog.ui | 157 ++++++++++++-------------- vcl/qt5/QtInstanceBuilder.cxx | 1 3 files changed, 108 insertions(+), 117 deletions(-)
New commits: commit 6a0f194cb9e2da870ef37d87a08fbd84d39c1e34 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Feb 20 15:26:15 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Feb 21 02:33:50 2026 +0100 sw: Resave mmresultprintdialog.ui with glade 3.40 The dialog can be triggered like this: * start Writer * run the "Tools" -> "Mail Merge" wizard to the end (with setting database,...) and close with "Finish" * press the "Print Merged Documents" button in the toolbar Change-Id: Ia366f2778f3a11c4bcb19760d84da5f14991a91e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199874 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/sw/uiconfig/swriter/ui/mmresultprintdialog.ui b/sw/uiconfig/swriter/ui/mmresultprintdialog.ui index a984968a245e..58b8217ac756 100644 --- a/sw/uiconfig/swriter/ui/mmresultprintdialog.ui +++ b/sw/uiconfig/swriter/ui/mmresultprintdialog.ui @@ -1,44 +1,44 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> +<!-- Generated with glade 3.40.0 --> <interface domain="sw"> <requires lib="gtk+" version="3.24"/> <object class="GtkAdjustment" id="adjustment1"> <property name="lower">1</property> <property name="upper">100000</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkAdjustment" id="adjustment2"> <property name="lower">1</property> <property name="upper">100000</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkDialog" id="MMResultPrintDialog"> - <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="mmresultprintdialog|MMResultPrintDialog">Print merged document</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="mmresultprintdialog|ok">Print Documents</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> <child internal-child="accessible"> <object class="AtkObject" id="ok-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|ok">Prints the mail merge documents.</property> @@ -55,8 +55,8 @@ <object class="GtkButton" id="cancel"> <property name="label" translatable="yes" context="stock">_Cancel</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="use-underline">True</property> </object> <packing> @@ -69,8 +69,8 @@ <object class="GtkButton" id="help"> <property name="label" translatable="yes" context="stock">_Help</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="use-underline">True</property> </object> <packing> @@ -84,46 +84,46 @@ <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="GtkFrame" id="frame"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=3 n-rows=1 --> <object class="GtkGrid" id="grid5"> <property name="visible">True</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="can-focus">False</property> <property name="margin-start">12</property> <property name="margin-top">6</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> <child> <object class="GtkLabel" id="printerft"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="mmresultprintdialog|printerft">_Printer</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">printers</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">printers</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="GtkComboBoxText" id="printers"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <child internal-child="accessible"> <object class="AtkObject" id="printers-atkobject"> @@ -132,17 +132,17 @@ </child> </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="GtkButton" id="printersettings"> <property name="label" translatable="yes" context="mmresultprintdialog|printersettings">P_roperties...</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="use-underline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="printersettings-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|printersettings">Changes the printer properties.</property> @@ -150,8 +150,8 @@ </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> + <property name="left-attach">2</property> + <property name="top-attach">0</property> </packing> </child> </object> @@ -159,7 +159,7 @@ <child type="label"> <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="mmresultprintdialog|label2">Printer Options</property> <attributes> <attribute name="weight" value="bold"/> @@ -176,25 +176,25 @@ <child> <object class="GtkFrame" id="frame1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> <object class="GtkBox" id="box1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> + <property name="margin-start">12</property> <property name="orientation">vertical</property> <property name="spacing">6</property> - <property name="margin-start">12</property> <child> <object class="GtkRadioButton" id="printallrb"> <property name="label" translatable="yes" context="mmresultprintdialog|printallrb">Print _all documents</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> <property name="active">True</property> - <property name="draw_indicator">True</property> + <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="printallrb-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|printallrb">Prints documents for all recipients.</property> @@ -208,19 +208,19 @@ </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=4 n-rows=1 --> <object class="GtkGrid" id="grid3"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> + <property name="can-focus">False</property> + <property name="column-spacing">12</property> <child> <object class="GtkRadioButton" id="fromrb"> <property name="label" translatable="yes" context="mmresultprintdialog|fromrb">_From</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <property name="group">printallrb</property> <accessibility> <relation type="label-for" target="from"/> @@ -232,34 +232,34 @@ </child> </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="toft"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="mmresultprintdialog|toft">_To</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">to</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">to</property> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> + <property name="left-attach">2</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkSpinButton" id="from"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="text">1</property> + <property name="truncate-multiline">True</property> <property name="adjustment">adjustment1</property> <property name="value">1</property> <accessibility> <relation type="labelled-by" target="fromrb"/> </accessibility> - <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="from-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|from">Enter the number of the first record to include in the mail merge.</property> @@ -267,18 +267,18 @@ </child> </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="GtkSpinButton" id="to"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="text">1</property> + <property name="truncate-multiline">True</property> <property name="adjustment">adjustment2</property> <property name="value">1</property> - <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="to-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|to">Enter the number of the last record to include in the mail merge.</property> @@ -286,8 +286,8 @@ </child> </object> <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> + <property name="left-attach">3</property> + <property name="top-attach">0</property> </packing> </child> </object> @@ -302,7 +302,7 @@ <child type="label"> <object class="GtkLabel" id="label1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="mmresultprintdialog|label1">Print Records</property> <attributes> <attribute name="weight" value="bold"/> @@ -323,9 +323,6 @@ <action-widget response="-6">cancel</action-widget> <action-widget response="-11">help</action-widget> </action-widgets> - <child type="titlebar"> - <placeholder/> - </child> <child internal-child="accessible"> <object class="AtkObject" id="MMResultPrintDialog-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|MMResultPrintDialog">Prints the mail merge output for all or some recipients.</property> commit e4d080b7755e42105934384e494a6df68d784a10 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Feb 20 15:21:59 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Feb 21 02:33:44 2026 +0100 tdf#130857 qt weld: Support mailmerge "Creating ..." 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. The dialog can be triggered like this: * start Writer * run the "Tools" -> "Mail Merge" wizard to the end (with setting database,...) and close with "Finish" * press the "Send Email Messages" button in the toolbar * press the "Send Documents" button Change-Id: I780cff238b93845526ed90ab6b5d17a5238a07a4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199872 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index 73e7e20b1e60..87480de50f54 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -227,6 +227,7 @@ constexpr auto SUPPORTED_UI_FILES = frozen::make_unordered_set<std::u16string_vi u"modules/swriter/ui/inserttable.ui", u"modules/swriter/ui/labeldialog.ui", u"modules/swriter/ui/linenumbering.ui", + u"modules/swriter/ui/mmcreatingdialog.ui", u"modules/swriter/ui/newuserindexdialog.ui", u"modules/swriter/ui/numberingnamedialog.ui", u"modules/swriter/ui/outlinenumbering.ui", commit 73cf1a9ef3700a0f13609088f81a67bd16899b55 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Feb 20 15:18:20 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Feb 21 02:33:38 2026 +0100 sw: Resave mmcreatingdialog.ui with glade 3.40 The dialog can be triggered like this: * start Writer * run the "Tools" -> "Mail Merge" wizard to the end (with setting database,...) and close with "Finish" * press the "Send Email Messages" button in the toolbar * press the "Send Documents" button Change-Id: Ie9fdfd1a95ef4944b50af2d8fbed8c5cda6c5d6e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199871 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/sw/uiconfig/swriter/ui/mmcreatingdialog.ui b/sw/uiconfig/swriter/ui/mmcreatingdialog.ui index 6e1c4fc346a7..c1d3dc913942 100644 --- a/sw/uiconfig/swriter/ui/mmcreatingdialog.ui +++ b/sw/uiconfig/swriter/ui/mmcreatingdialog.ui @@ -1,27 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.40.0 --> <interface domain="sw"> <requires lib="gtk+" version="3.24"/> <object class="GtkDialog" id="MMCreatingDialog"> - <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="mmcreatingdialog|MMCreatingDialog">Mail Merge</property> <property name="modal">True</property> - <property name="type_hint">dialog</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="cancel"> <property name="label" translatable="yes" context="stock">_Cancel</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="use-underline">True</property> </object> <packing> @@ -34,72 +35,64 @@ <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="halign">center</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="label1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">1</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="mmcreatingdialog|label1">Status:</property> + <property name="xalign">1</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="label2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">1</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="mmcreatingdialog|label2">Progress:</property> + <property name="xalign">1</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkLabel" id="label3"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="mmcreatingdialog|label3">Creating documents...</property> + <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="progress"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="mmcreatingdialog|progress">%X of %Y</property> + <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> + <property name="left-attach">1</property> + <property name="top-attach">1</property> </packing> </child> </object>
