From e49a8a9ffe4bdfc9f7f8d509c00c5de001c96210 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 3 Sep 2015 16:14:14 +0200 Subject: [PATCH] SSL Certificate Error Dialog: show account name #3729 Change the wording of the certificate error dialog to include the account URL and be a bit more accurate. (Do not mention "SSL" in user facing messages) --- src/gui/sslerrordialog.cpp | 5 +++-- src/gui/sslerrordialog.ui | 16 ++-------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/gui/sslerrordialog.cpp b/src/gui/sslerrordialog.cpp index ec8acd952..21a420691 100644 --- a/src/gui/sslerrordialog.cpp +++ b/src/gui/sslerrordialog.cpp @@ -63,7 +63,7 @@ SslErrorDialog::SslErrorDialog(AccountPtr account, QWidget *parent) : { setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); _ui->setupUi( this ); - setWindowTitle( tr("SSL Connection") ); + setWindowTitle( tr("Untrusted Certificate") ); QPushButton *okButton = _ui->_dialogButtonBox->button( QDialogButtonBox::Ok ); QPushButton *cancelButton = @@ -131,8 +131,9 @@ bool SslErrorDialog::checkFailingCertsKnown( const QList &errors ) msg += QL(""); msg += QL(""); + auto host = _account->url().host(); + msg += QL("

") + tr("Cannot connect securely to %1:").arg(host) + QL("

"); // loop over the unknown certs and line up their errors. - msg += QL("

") + tr("Warnings about current SSL Connection:") + QL("

"); msg += QL("

"); foreach( const QSslCertificate& cert, _unknownCerts ) { msg += QL("

"); diff --git a/src/gui/sslerrordialog.ui b/src/gui/sslerrordialog.ui index 4b8e98739..900e746fc 100644 --- a/src/gui/sslerrordialog.ui +++ b/src/gui/sslerrordialog.ui @@ -14,7 +14,7 @@ Form - + @@ -26,7 +26,7 @@ - + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -34,18 +34,6 @@ - - - - 14 - - - - SSL Connection - - - - true -- 2.30.2