sw/uiconfig/swriter/ui/customizeaddrlistdialog.ui | 137 ++++++++++------------ vcl/qt5/QtInstanceBuilder.cxx | 2 2 files changed, 69 insertions(+), 70 deletions(-)
New commits: commit 7770328bfe21dfdf01963b7eaf0105e7a7ed2f1d Author: Michael Weghorn <[email protected]> AuthorDate: Fri Feb 20 10:50:20 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Feb 21 02:31:25 2026 +0100 sw: Resave customizeaddrlistdialog.ui with glade 3.40 The dialog can be triggered like this: * start Writer * "Tools" -> "Mail Merge Wizard..." * select some database and press "Next" button until reaching page "3. Insert Address Block" * press "Select Different Address List..." button * in the "Select Address List" dialog, press the "Create..." button * in the "New Address List" dialog, press the "Customize" button Change-Id: I132deb54675225ca29ee61ea487254f79c799e98 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199810 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/sw/uiconfig/swriter/ui/customizeaddrlistdialog.ui b/sw/uiconfig/swriter/ui/customizeaddrlistdialog.ui index 5c02d3f41b2c..1bfcf41cc7d7 100644 --- a/sw/uiconfig/swriter/ui/customizeaddrlistdialog.ui +++ b/sw/uiconfig/swriter/ui/customizeaddrlistdialog.ui @@ -1,15 +1,15 @@ <?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="GtkImage" id="image1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="icon-name">go-up</property> </object> <object class="GtkImage" id="image2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="icon-name">go-down</property> </object> <object class="GtkTreeStore" id="liststore2"> @@ -21,31 +21,31 @@ </columns> </object> <object class="GtkDialog" id="CustomizeAddrListDialog"> - <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="customizeaddrlistdialog|CustomizeAddrListDialog">Customize Address List</property> <property name="resizable">False</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> @@ -58,8 +58,8 @@ <object class="GtkButton" id="cancel"> <property name="label" translatable="yes" context="stock">_Close</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> @@ -72,8 +72,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> @@ -87,32 +87,32 @@ <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=3 n-rows=1 --> <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="column_spacing">12</property> + <property name="column-spacing">12</property> <child> <object class="GtkButtonBox" id="buttonbox2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">6</property> - <property name="layout_style">start</property> + <property name="layout-style">start</property> <child> <object class="GtkButton" id="add"> <property name="label" translatable="yes" context="customizeaddrlistdialog|add">_Add...</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="add-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="customizeaddrlistdialog|extended_tip|add">Inserts a new text field.</property> @@ -129,8 +129,8 @@ <object class="GtkButton" id="delete"> <property name="label" translatable="yes" context="stock">_Delete</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> <child internal-child="accessible"> <object class="AtkObject" id="delete-atkobject"> @@ -148,9 +148,9 @@ <object class="GtkButton" id="rename"> <property name="label" translatable="yes" context="customizeaddrlistdialog|rename">_Rename...</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="rename-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="customizeaddrlistdialog|extended_tip|rename">Renames the selected text field.</property> @@ -165,49 +165,49 @@ </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> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=2 --> <object class="GtkGrid" id="grid2"> <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="row-spacing">6</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="label" translatable="yes" context="customizeaddrlistdialog|label1">A_ddress list elements:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">treeview</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">treeview</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="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="treeview"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="vexpand">True</property> <property name="model">liststore2</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-selection2"/> </child> @@ -230,54 +230,54 @@ </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> <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> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=2 --> <object class="GtkGrid" id="grid3"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="valign">center</property> - <property name="row_spacing">6</property> + <property name="row-spacing">6</property> <child> <object class="GtkButton" id="down"> <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="valign">center</property> <property name="image">image2</property> <property name="always-show-image">True</property> </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="GtkButton" id="up"> <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="image">image1</property> <property name="always-show-image">True</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> </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> </object> @@ -294,8 +294,5 @@ <action-widget response="-6">cancel</action-widget> <action-widget response="-11">help</action-widget> </action-widgets> - <child type="titlebar"> - <placeholder/> - </child> </object> </interface> commit f4ac51bb673f581a10a74758fc09054fcecf5b13 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Feb 20 10:47:08 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Feb 21 02:31:18 2026 +0100 tdf#130857 qt weld: Support sw "Rename Element" 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 * "Tools" -> "Mail Merge Wizard..." * select some database and press "Next" button until reaching page "3. Insert Address Block" * press "Select Different Address List..." button * in the "Select Address List" dialog, press the "Create..." button * in the "New Address List" dialog, press the "Customize" button * in the "Customize Address List" dialog, select an elemtn and press the "Rename..." button Change-Id: I0f2c85bda30cd2565fc81822af2bb3b4a0c55117 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199809 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index 897046660c37..8bcf6087a1ca 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/pagenumberdlg.ui", u"modules/swriter/ui/printmergedialog.ui", u"modules/swriter/ui/renameautotextdialog.ui", + u"modules/swriter/ui/renameentrydialog.ui", u"modules/swriter/ui/renameobjectdialog.ui", u"modules/swriter/ui/rowheight.ui", u"modules/swriter/ui/savelabeldialog.ui", commit 1cbc42b30929cdbd16826098c7a02d2fde2e249f Author: Michael Weghorn <[email protected]> AuthorDate: Fri Feb 20 10:45:20 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Feb 21 02:31:10 2026 +0100 tdf#130857 qt weld: Support sw "Add Element" 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 * "Tools" -> "Mail Merge Wizard..." * select some database and press "Next" button until reaching page "3. Insert Address Block" * press "Select Different Address List..." button * in the "Select Address List" dialog, press the "Create..." button * in the "New Address List" dialog, press the "Customize" button * in the "Customize Address List" dialog, press the "Add" button Change-Id: I362ccd9f1ef3c8a91d518b20ff9d13ccd0de0888 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199808 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index b8c5d5a363d7..897046660c37 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -198,6 +198,7 @@ constexpr auto SUPPORTED_UI_FILES = frozen::make_unordered_set<std::u16string_vi u"modules/smath/ui/smathsettings.ui", u"modules/smath/ui/spacingdialog.ui", u"modules/spropctrlr/ui/taborder.ui", + u"modules/swriter/ui/addentrydialog.ui", u"modules/swriter/ui/authenticationsettingsdialog.ui", u"modules/swriter/ui/autoformattable.ui", u"modules/swriter/ui/bibliographyentry.ui",
