sw/inc/strings.hrc | 2 ++
sw/source/ui/dbui/mmoutputtypepage.cxx | 5 ++++-
sw/source/ui/inc/mmresultdialogs.hxx | 2 ++
sw/uiconfig/swriter/ui/mmsendmails.ui | 2 +-
4 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit abaa11329822d659581d7860a82308409189f0f5
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue Apr 5 10:20:00 2022 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Tue Apr 5 17:02:13 2022 +0200
Related tdf#148384: Improve mail merge results reporting
1. Disambiguate "address validity check failed" from "mail delivery error".
2. Change "Cancel" button into "Close" when operation is finished.
3. "%1 of %2 emails sent" changed to "%1 of %2 emails processed", since
the number does not reflect the sent status, and includes failures.
Change-Id: Idb4934618a843133dfb35de10b9903875094366a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132565
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index b9a5cd8b6d82..b534cb115b80 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -1379,9 +1379,11 @@
#define STR_SAVEACOPY_SRC NC_("STR_SAVEACOPY_SRC",
"~Export copy of source...")
#define ST_CONTINUE NC_("ST_CONTINUE", "~Continue")
+#define ST_CLOSE_DIALOG NC_("ST_CLOSE_DIALOG",
"~Close")
#define ST_SENDINGTO NC_("ST_SENDINGTO", "Sending
to: %1")
#define ST_COMPLETED NC_("ST_COMPLETED",
"Successfully sent")
#define ST_FAILED NC_("ST_FAILED", "Sending
failed")
+#define ST_ADDRESS_INVALID NC_("ST_ADDRESS_INVALID",
"Address invalid")
#define STR_SENDER_TOKENS NC_("STR_SENDER_TOKENS",
"COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;CITY; ;STATEPROV;
;POSTALCODE;CR;COUNTRY;CR;")
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx
b/sw/source/ui/dbui/mmoutputtypepage.cxx
index dd05de3095a7..01a8b2c3ff66 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -205,9 +205,11 @@ public:
SwSendMailDialog::SwSendMailDialog(weld::Window *pParent,
SwMailMergeConfigItem& rConfigItem)
: GenericDialogController(pParent, "modules/swriter/ui/mmsendmails.ui",
"SendMailsDialog")
, m_sContinue(SwResId( ST_CONTINUE ))
+ , m_sClose(SwResId(ST_CLOSE_DIALOG))
, m_sSendingTo( SwResId(ST_SENDINGTO ))
, m_sCompleted( SwResId(ST_COMPLETED ))
, m_sFailed( SwResId(ST_FAILED ))
+ , m_sAddressInvalid(SwResId(ST_ADDRESS_INVALID))
, m_bCancel(false)
, m_bDestructionEnabled(false)
, m_pImpl(new SwSendMailDialog_Impl)
@@ -395,7 +397,7 @@ void SwSendMailDialog::IterateMails()
m_xStatus->append();
m_xStatus->set_image(m_nSendCount, RID_BMP_FORMULA_CANCEL, 0);
m_xStatus->set_text(m_nSendCount, sMessage.replaceFirst("%1",
pCurrentMailDescriptor->sEMail), 1);
- m_xStatus->set_text(m_nSendCount, m_sFailed, 2);
+ m_xStatus->set_text(m_nSendCount, m_sAddressInvalid, 2);
++m_nSendCount;
++m_nErrorCount;
UpdateTransferStatus( );
@@ -517,6 +519,7 @@ void SwSendMailDialog::AllMailsSent()
if (m_nSendCount == m_nExpectedCount)
{
m_xStop->set_sensitive(false);
+ m_xCancel->set_label(m_sClose);
// Leave open if some kind of error occurred
if (m_nErrorCount == 0)
{
diff --git a/sw/source/ui/inc/mmresultdialogs.hxx
b/sw/source/ui/inc/mmresultdialogs.hxx
index a5b96cf27175..d00e99044f0e 100644
--- a/sw/source/ui/inc/mmresultdialogs.hxx
+++ b/sw/source/ui/inc/mmresultdialogs.hxx
@@ -140,11 +140,13 @@ class SwSendMailDialog final : public
weld::GenericDialogController
{
OUString m_sContinue;
OUString m_sStop;
+ OUString m_sClose;
OUString m_sTransferStatus;
OUString m_sErrorStatus;
OUString m_sSendingTo;
OUString m_sCompleted;
OUString m_sFailed;
+ OUString m_sAddressInvalid;
bool m_bCancel;
bool m_bDestructionEnabled;
diff --git a/sw/uiconfig/swriter/ui/mmsendmails.ui
b/sw/uiconfig/swriter/ui/mmsendmails.ui
index 0f2d7f76b99a..15e97871639c 100644
--- a/sw/uiconfig/swriter/ui/mmsendmails.ui
+++ b/sw/uiconfig/swriter/ui/mmsendmails.ui
@@ -147,7 +147,7 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
- <property name="label" translatable="yes"
context="mmsendmails|transferstatus">%1 of %2 emails sent</property>
+ <property name="label" translatable="yes"
context="mmsendmails|transferstatus">%1 of %2 emails processed</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
</object>
