OpenSSL does not work any more on Mac, check status in about; refs #130

13 years ago · b72b755ba3
parent fecde07296
commit b72b755ba3
5 changed files with 48 additions and 46 deletions
--- a/src/browser.hxx
+++ b/src/browser.hxx
@ -832,7 +832,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
                            "%3\n"
                            "%4\n"
                            "qt-%5 (%6)\n"
-                            "openssl-%7")
+                            "openssl-%7 (%9) %10")
                         .arg(VERSION)
                         .arg(BUILDDATE)
                         .arg(QString::fromStdString(proxy::version()))
@ -840,7 +840,9 @@ class Browser: public QMainWindow, protected Ui::Browser {
                         .arg(qVersion())
                         .arg(QT_VERSION_STR)
                         .arg(SHLIB_VERSION_NUMBER)
-                         .arg(QApplication::applicationName()));
+                         .arg(QApplication::applicationName())
+                         .arg(OPENSSL_VERSION_TEXT)
+                         .arg(QSslSocket::supportsSsl()?"ok":"failed"));
    }

    void on_actionDebugLog_triggered() {
--- a/src/swissbrowser_de.ts
+++ b/src/swissbrowser_de.ts
@ -344,17 +344,6 @@
        <source>About</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>%8
-Version: %1
-Builddate: %2
-Libraries:
-%3
-%4
-qt-%5 (%6)
-openssl-%7</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>%1</source>
        <translation type="unfinished"></translation>
@ -403,6 +392,17 @@ openssl-%7</source>
        <source>Debug Log</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>%8
+Version: %1
+Builddate: %2
+Libraries:
+%3
+%4
+qt-%5 (%6)
+openssl-%7 (%9) %10</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>Certificate</name>
--- a/src/swissbrowser_en.ts
+++ b/src/swissbrowser_en.ts
@ -344,17 +344,6 @@
        <source>About</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>%8
-Version: %1
-Builddate: %2
-Libraries:
-%3
-%4
-qt-%5 (%6)
-openssl-%7</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>%1</source>
        <translation type="unfinished"></translation>
@ -403,6 +392,17 @@ openssl-%7</source>
        <source>Debug Log</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>%8
+Version: %1
+Builddate: %2
+Libraries:
+%3
+%4
+qt-%5 (%6)
+openssl-%7 (%9) %10</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>Certificate</name>
--- a/src/swissbrowser_fr.ts
+++ b/src/swissbrowser_fr.ts
@ -344,17 +344,6 @@
        <source>About</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>%8
-Version: %1
-Builddate: %2
-Libraries:
-%3
-%4
-qt-%5 (%6)
-openssl-%7</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>%1</source>
        <translation type="unfinished"></translation>
@ -403,6 +392,17 @@ openssl-%7</source>
        <source>Debug Log</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>%8
+Version: %1
+Builddate: %2
+Libraries:
+%3
+%4
+qt-%5 (%6)
+openssl-%7 (%9) %10</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>Certificate</name>
--- a/src/swissbrowser_it.ts
+++ b/src/swissbrowser_it.ts
@ -344,17 +344,6 @@
        <source>About</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>%8
-Version: %1
-Builddate: %2
-Libraries:
-%3
-%4
-qt-%5 (%6)
-openssl-%7</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>%1</source>
        <translation type="unfinished"></translation>
@ -403,6 +392,17 @@ openssl-%7</source>
        <source>Debug Log</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>%8
+Version: %1
+Builddate: %2
+Libraries:
+%3
+%4
+qt-%5 (%6)
+openssl-%7 (%9) %10</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>Certificate</name>