Commit 8cf5578d authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Merge remote-tracking branch 'origin/release/19.12'

parents 34c4f575 121a6b0a
......@@ -245,6 +245,7 @@
<binary>kmail</binary>
</provides>
<releases>
<release version="5.13.1" date="2020-01-09"/>
<release version="5.13.0" date="2019-12-12"/>
</releases>
</component>
......@@ -45,7 +45,7 @@ bool ValidateSendMailShortcut::validate()
i18n("Remove Shortcut"),
i18n("Ask Before Sending"),
i18n("Sending Without Confirmation"));
if (result == KMessageBox::Yes) {
if (result == QDialogButtonBox::Yes) {
QAction *act = mActionCollection->action(QStringLiteral("send_mail"));
if (act) {
act->setShortcut(QKeySequence());
......@@ -54,13 +54,13 @@ bool ValidateSendMailShortcut::validate()
qCDebug(KMAIL_LOG) << "Unable to find action named \"send_mail\"";
}
sendNow = false;
} else if (result == KMessageBox::No) {
} else if (result == QDialogButtonBox::No) {
KMailSettings::self()->setConfirmBeforeSendWhenUseShortcut(true);
sendNow = true;
} else if (result == KMessageBox::Ok) {
} else if (result == QDialogButtonBox::Ok) {
KMailSettings::self()->setConfirmBeforeSendWhenUseShortcut(false);
sendNow = true;
} else if (result == KMessageBox::Cancel) {
} else if (result == QDialogButtonBox::Cancel) {
return false;
}
KMailSettings::self()->setCheckSendDefaultActionShortcut(true);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment