diff --git a/src/filter/mdnadvicedialog.cpp b/src/filter/mdnadvicedialog.cpp index 3de0bc6..ee2bac9 100644 --- a/src/filter/mdnadvicedialog.cpp +++ b/src/filter/mdnadvicedialog.cpp @@ -107,8 +107,6 @@ MDNAdviceDialog::MDNAdviceDialog(const QString &text, bool canDeny, QWidget *par user1Button = new QPushButton; buttonBox->addButton(user1Button, QDialogButtonBox::ActionRole); connect(user1Button, &QPushButton::clicked, this, &MDNAdviceDialog::slotUser1Clicked); - connect(buttonBox, &QDialogButtonBox::accepted, this, &MDNAdviceDialog::accept); - connect(buttonBox, &QDialogButtonBox::rejected, this, &MDNAdviceDialog::reject); if (canDeny) { QPushButton *user2Button = new QPushButton; connect(user2Button, &QPushButton::clicked, this, &MDNAdviceDialog::slotUser2Clicked); diff --git a/src/filter/tests/mndadvicedialoggui.cpp b/src/filter/tests/mndadvicedialoggui.cpp index c5a8880..1d32c37 100644 --- a/src/filter/tests/mndadvicedialoggui.cpp +++ b/src/filter/tests/mndadvicedialoggui.cpp @@ -18,13 +18,27 @@ #include "filter/mdnadvicedialog.h" #include - +#include int main(int argc, char **argv) { QApplication app(argc, argv); - MailCommon::MDNAdviceDialog *w = new MailCommon::MDNAdviceDialog(QStringLiteral("test mnda"), false); - w->exec(); + MailCommon::MDNAdviceDialog *w = new MailCommon::MDNAdviceDialog(QStringLiteral("test mnda"), true); + MessageComposer::MDNAdvice rc = MessageComposer::MDNIgnore; + if (w->exec()) { + rc = w->result(); + } + switch (rc) { + case MessageComposer::MDNSend: + qDebug() << "MessageComposer::MDNSend "; + break; + case MessageComposer::MDNSendDenied: + qDebug() << "MessageComposer::MDNSendDenied "; + break; + case MessageComposer::MDNIgnore: + qDebug() << "MessageComposer::MDNIgnore "; + break; + } app.exec(); delete w; return 0;