sw/uiconfig/swriter/ui/addressblockdialog.ui | 247 +++++++++++++-------------- sw/uiconfig/swriter/ui/assignfieldsdialog.ui | 147 ++++++---------- vcl/qt5/QtInstanceBuilder.cxx | 2 3 files changed, 184 insertions(+), 212 deletions(-)
New commits: commit ee78517f3936e539569bc72d19f0363991824f05 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Feb 20 11:41:24 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Feb 21 02:32:18 2026 +0100 tdf#130857 qt weld: Support sw "Match Fields" 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 "Match Fields" button Currently, the dialog has an issue that not all address elements (first column) are shown properly, e.g. instead of "<Title>", no label text is shown. This issue will be addressed separately in upcoming commit Change-Id: I6dd8435f5fccd1be05c785c84196dba09f7886b5 Author: Michael Weghorn <[email protected]> Date: Fri Feb 20 11:56:27 2026 +0100 tdf#130857 qt weld: Specify plain text format for labels Change-Id: I9d078e33442c134e9af46c5c24799e80a55c7b22 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199854 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index 2af87add026b..aa7932d9a78f 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -199,6 +199,7 @@ constexpr auto SUPPORTED_UI_FILES = frozen::make_unordered_set<std::u16string_vi u"modules/smath/ui/spacingdialog.ui", u"modules/spropctrlr/ui/taborder.ui", u"modules/swriter/ui/addentrydialog.ui", + u"modules/swriter/ui/assignfieldsdialog.ui", u"modules/swriter/ui/authenticationsettingsdialog.ui", u"modules/swriter/ui/autoformattable.ui", u"modules/swriter/ui/bibliographyentry.ui", @@ -353,6 +354,7 @@ constexpr auto SUPPORTED_WITH_QT_PARENT = frozen::make_unordered_set<std::u16str u"modules/spropctrlr/ui/textfield.ui", u"modules/spropctrlr/ui/urlcontrol.ui", u"modules/swriter/ui/addressfragment.ui", + u"modules/swriter/ui/assignfragment.ui", u"modules/swriter/ui/bibliofragment.ui", u"modules/swriter/ui/businessdatapage.ui", u"modules/swriter/ui/cardmediumpage.ui", commit 4ab05062ea362a93996125881aaa9c1879eef5b1 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Feb 20 11:34:55 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Feb 21 02:32:12 2026 +0100 sw: Resave assignfieldsdialog.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 "Match Fields..." button Change-Id: I1eaa8825191b4687a08923f4f43e071657050734 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199821 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/sw/uiconfig/swriter/ui/assignfieldsdialog.ui b/sw/uiconfig/swriter/ui/assignfieldsdialog.ui index 9daa7da5d3c2..9adfc49500d7 100644 --- a/sw/uiconfig/swriter/ui/assignfieldsdialog.ui +++ b/sw/uiconfig/swriter/ui/assignfieldsdialog.ui @@ -1,32 +1,32 @@ <?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="GtkDialog" id="AssignFieldsDialog"> - <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="assignfieldsdialog|AssignFieldsDialog">Match Fields</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> @@ -39,8 +39,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> @@ -53,8 +53,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> @@ -67,24 +67,24 @@ <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="GtkBox" id="box1"> <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> <child> <object class="GtkLabel" id="MATCHING_LABEL"> <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="assignfieldsdialog|MATCHING_LABEL">Assign the fields from your data source to match the address elements.</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">FIELDS</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">FIELDS</property> </object> <packing> <property name="expand">False</property> @@ -93,65 +93,41 @@ </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=2 --> <object class="GtkGrid"> <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> <child> <object class="GtkScrolledWindow" id="scroll"> <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="GtkViewport"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid"> <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> <child> <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid" id="FIELDS"> <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="row_spacing">6</property> - <property name="column_spacing">6</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> + <property name="row-spacing">6</property> + <property name="column-spacing">6</property> <child> <placeholder/> </child> @@ -162,8 +138,8 @@ </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> </object> @@ -172,59 +148,59 @@ </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> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=3 n-rows=1 --> <object class="GtkGrid"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> - <property name="border_width">6</property> - <property name="column_spacing">6</property> + <property name="border-width">6</property> + <property name="column-spacing">6</property> <child> <object class="GtkLabel" id="addresselem"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="assignfieldsdialog|ST_ADDRESSELEMENT">Address elements</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="previewelem"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="assignfieldsdialog|ST_PREVIEW">Preview</property> <property name="xalign">0</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="GtkLabel" id="matchelem"> <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" translatable="yes" context="assignfieldsdialog|ST_MATCHESTO">Matches to field</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> </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> @@ -237,11 +213,11 @@ <child> <object class="GtkLabel" id="PREVIEW_LABEL"> <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="assignfieldsdialog|PREVIEW_LABEL">Address block preview</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">PREVIEW</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">PREVIEW</property> </object> <packing> <property name="expand">False</property> @@ -252,18 +228,18 @@ <child> <object class="GtkScrolledWindow" id="previewwin"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> + <property name="can-focus">True</property> + <property name="hscrollbar-policy">never</property> + <property name="vscrollbar-policy">never</property> + <property name="shadow-type">in</property> <child> <object class="GtkViewport"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkDrawingArea" id="PREVIEW"> <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="PREVIEW-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="assignfieldsdialog|extended_tip|PREVIEW">Displays a preview of the values of the first data record.</property> @@ -294,9 +270,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="AssignFieldsDialog-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="assignfieldsdialog|extended_tip|AssignFieldsDialog">Matches the logical field names of the layout dialog to the field names in your database when you create new address blocks or salutations.</property> commit cb3db6d9c9a52b1966c83481e3036b140ed8fc79 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Feb 20 11:25:42 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Feb 21 02:32:06 2026 +0100 sw: Resave addressblockdialog.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 "More..." button * in the "Select Address Block" dialog, press the "New..." button Change-Id: I6f187727cf06de60c006ea0ebe3d6038964e99ce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199820 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/sw/uiconfig/swriter/ui/addressblockdialog.ui b/sw/uiconfig/swriter/ui/addressblockdialog.ui index 6a69b15ead43..b92a4313d229 100644 --- a/sw/uiconfig/swriter/ui/addressblockdialog.ui +++ b/sw/uiconfig/swriter/ui/addressblockdialog.ui @@ -1,36 +1,36 @@ <?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-next</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-previous</property> </object> <object class="GtkImage" id="image3"> <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="image4"> <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="GtkImage" id="image5"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes" context="addressblockdialog|image5|tooltip_text">Add to address</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes" context="addressblockdialog|image5|tooltip_text">Add to address</property> <property name="icon-name">go-next</property> </object> <object class="GtkImage" id="image6"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="icon-name">go-previous</property> </object> <object class="GtkTreeStore" id="liststore1"> @@ -42,30 +42,30 @@ </columns> </object> <object class="GtkDialog" id="AddressBlockDialog"> - <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="addressblockdialog|AddressBlockDialog">New Address Block</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> @@ -78,9 +78,9 @@ <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="can_default">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -93,8 +93,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> @@ -108,52 +108,52 @@ <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=4 n-rows=6 --> <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="addressesft"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="addressblockdialog|addressesft">Address _elements</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">addresses</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">addresses</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="addresses"> <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="headers-visible">False</property> <property name="reorderable">True</property> - <property name="search_column">0</property> - <property name="show_expanders">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-selection2"/> </child> @@ -177,40 +177,40 @@ </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> <property name="height">5</property> </packing> </child> <child> <object class="GtkLabel" id="addressdestft"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="addressblockdialog|addressdestft">1. Drag address elements here</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">addressdest</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">addressdest</property> <property name="xalign">0</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> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=3 n-rows=3 --> <object class="GtkGrid" id="grid3"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">center</property> <property name="valign">center</property> - <property name="row_homogeneous">True</property> - <property name="column_homogeneous">True</property> + <property name="row-homogeneous">True</property> + <property name="column-homogeneous">True</property> <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="tooltip_text" translatable="yes" context="addressblockdialog|up|tooltip_text">Move up</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="addressblockdialog|up|tooltip_text">Move up</property> <property name="image">image3</property> <property name="always-show-image">True</property> <child internal-child="accessible"> @@ -220,16 +220,16 @@ </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="left"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="addressblockdialog|left|tooltip_text">Move left</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="addressblockdialog|left|tooltip_text">Move left</property> <property name="image">image2</property> <property name="always-show-image">True</property> <child internal-child="accessible"> @@ -239,16 +239,16 @@ </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="GtkButton" id="right"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="addressblockdialog|right|tooltip_text">Move right</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="addressblockdialog|right|tooltip_text">Move right</property> <property name="image">image1</property> <property name="always-show-image">True</property> <child internal-child="accessible"> @@ -258,16 +258,16 @@ </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> + <property name="left-attach">2</property> + <property name="top-attach">1</property> </packing> </child> <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="tooltip_text" translatable="yes" context="addressblockdialog|down|tooltip_text">Move down</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="addressblockdialog|down|tooltip_text">Move down</property> <property name="image">image4</property> <property name="always-show-image">True</property> <child internal-child="accessible"> @@ -277,8 +277,8 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="left-attach">1</property> + <property name="top-attach">2</property> </packing> </child> <child> @@ -298,48 +298,48 @@ </child> </object> <packing> - <property name="left_attach">3</property> - <property name="top_attach">1</property> + <property name="left-attach">3</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="can-focus">False</property> <property name="label" translatable="yes" context="addressblockdialog|label3">Preview</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">addrpreview</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">addrpreview</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">4</property> + <property name="left-attach">2</property> + <property name="top-attach">4</property> </packing> </child> <child> <object class="GtkLabel" id="customft"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="label" translatable="yes" context="addressblockdialog|customft">2. Customi_ze salutation</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">custom</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">custom</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> + <property name="left-attach">2</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkComboBoxText" id="custom"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="has_entry">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="has-entry">True</property> <child internal-child="entry"> <object class="GtkEntry" id="comboboxtext-entry"> - <property name="can_focus">True</property> + <property name="can-focus">True</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> - <property name="activates_default">True</property> </object> </child> <child internal-child="accessible"> @@ -349,27 +349,27 @@ </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">3</property> + <property name="left-attach">2</property> + <property name="top-attach">3</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="border_width">0</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> + <property name="border-width">0</property> + <property name="hscrollbar-policy">never</property> + <property name="shadow-type">in</property> <child> <object class="GtkViewport"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkDrawingArea" id="addressdest"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="events">GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK</property> <property name="hexpand">True</property> <property name="vexpand">True</property> @@ -384,26 +384,26 @@ </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> + <property name="left-attach">2</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkScrolledWindow" id="previewwin"> <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="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> + <property name="hscrollbar-policy">never</property> + <property name="shadow-type">in</property> <child> <object class="GtkViewport"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkDrawingArea" id="addrpreview"> <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> <child internal-child="accessible"> @@ -417,23 +417,23 @@ </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">5</property> + <property name="left-attach">2</property> + <property name="top-attach">5</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="valign">center</property> - <property name="row_spacing">6</property> + <property name="row-spacing">6</property> <child> <object class="GtkButton" id="fromaddr"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="addressblockdialog|fromaddr|tooltip_text">Remove from address</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="addressblockdialog|fromaddr|tooltip_text">Remove from address</property> <property name="image">image6</property> <property name="always-show-image">True</property> <child internal-child="accessible"> @@ -443,15 +443,15 @@ </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="GtkButton" id="toaddr"> <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">image5</property> <property name="always-show-image">True</property> <child internal-child="accessible"> @@ -461,14 +461,14 @@ </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> </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> @@ -515,9 +515,6 @@ <action-widget response="-6">cancel</action-widget> <action-widget response="-11">help</action-widget> </action-widgets> - <child type="titlebar"> - <placeholder/> - </child> </object> <object class="GtkSizeGroup" id="sizegroup1"> <property name="mode">both</property>
