Commit 6975c673 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

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

parents 9ee2fae8 f027ac7b
...@@ -1588,7 +1588,7 @@ void KMMainWidget::slotOverrideHtmlLoadExt() ...@@ -1588,7 +1588,7 @@ void KMMainWidget::slotOverrideHtmlLoadExt()
i18n("Security Warning"), i18n("Security Warning"),
KGuiItem(i18n("Load External References")), KGuiItem(i18n("Load External References")),
KStandardGuiItem::cancel(), KStandardGuiItem::cancel(),
QStringLiteral("OverrideHtmlLoadExtWarning"), nullptr); QStringLiteral("OverrideHtmlLoadExtWarning"), KMessageBox::Option());
if (result == KMessageBox::Cancel) { if (result == KMessageBox::Cancel) {
mPreferHtmlLoadExtAction->setChecked(false); mPreferHtmlLoadExtAction->setChecked(false);
return; return;
...@@ -4706,7 +4706,7 @@ void KMMainWidget::slotChangeDisplayMessageFormat(MessageViewer::Viewer::Display ...@@ -4706,7 +4706,7 @@ void KMMainWidget::slotChangeDisplayMessageFormat(MessageViewer::Viewer::Display
i18n("Security Warning"), i18n("Security Warning"),
KGuiItem(i18n("Use HTML")), KGuiItem(i18n("Use HTML")),
KStandardGuiItem::cancel(), KStandardGuiItem::cancel(),
QStringLiteral("OverrideHtmlWarning"), nullptr); QStringLiteral("OverrideHtmlWarning"), KMessageBox::Option());
if (result == KMessageBox::Cancel) { if (result == KMessageBox::Cancel) {
mDisplayMessageFormatMenu->setDisplayMessageFormat(MessageViewer::Viewer::Text); mDisplayMessageFormatMenu->setDisplayMessageFormat(MessageViewer::Viewer::Text);
return; return;
......
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