projects / nextcloud-desktop.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b6e0802)
SSL Certificate Error Dialog: show account name #3729
authorOlivier Goffart <ogoffart@woboq.com>
Thu, 3 Sep 2015 14:14:14 +0000 (16:14 +0200)
committerOlivier Goffart <ogoffart@woboq.com>
Thu, 3 Sep 2015 14:19:53 +0000 (16:19 +0200)
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 patch | blob | history
src/gui/sslerrordialog.ui patch | blob | history

diff --git a/src/gui/sslerrordialog.cpp b/src/gui/sslerrordialog.cpp
index ec8acd95292b46a04ce2132bf9bdd158c7f9d71f..21a420691f0ff69e08c61740c600d44d1574f08b 100644 (file)
--- 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<QSslError> &errors )
             msg += QL("<link rel='stylesheet' type='text/css' href='format.css'>");
             msg += QL("</head><body>");
 
+    auto host = _account->url().host();
+    msg += QL("<h3>") + tr("Cannot connect securely to <i>%1</i>:").arg(host) + QL("</h3>");
     // loop over the unknown certs and line up their errors.
-            msg += QL("<h3>") + tr("Warnings about current SSL Connection:") + QL("</h3>");
     msg += QL("<div id=\"ca_errors\">");
     foreach( const QSslCertificate& cert, _unknownCerts ) {
         msg += QL("<div id=\"ca_error\">");
diff --git a/src/gui/sslerrordialog.ui b/src/gui/sslerrordialog.ui
index 4b8e98739c6b5021869f13360192144a0d994cd3..900e746fc26adebfb61157509e94e181cc59d68e 100644 (file)
--- a/src/gui/sslerrordialog.ui
+++ b/src/gui/sslerrordialog.ui
@@ -14,7 +14,7 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="2" column="0">
+   <item row="1" column="0">
     <widget class="QCheckBox" name="_cbTrustConnect">
      <property name="font">
       <font>
@@ -26,7 +26,7 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
+   <item row="2" column="0">
     <widget class="QDialogButtonBox" name="_dialogButtonBox">
      <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
@@ -34,18 +34,6 @@
     </widget>
    </item>
    <item row="0" column="0">
-    <widget class="QLabel" name="label">
-     <property name="font">
-      <font>
-       <pointsize>14</pointsize>
-      </font>
-     </property>
-     <property name="text">
-      <string>SSL Connection</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
     <widget class="QTextBrowser" name="_tbErrors">
      <property name="openExternalLinks">
       <bool>true</bool>
Unnamed repository; edit this file 'description' to name the repository.