diff -r 8f8cad8f989e -r f2e7957924cb Helpviewer/Network/NetworkAccessManager.py
--- a/Helpviewer/Network/NetworkAccessManager.py Mon Oct 10 18:54:15 2011 +0200
+++ b/Helpviewer/Network/NetworkAccessManager.py Wed Oct 12 19:39:30 2011 +0200
@@ -9,7 +9,7 @@
import os
-from PyQt4.QtCore import pyqtSignal, QByteArray
+from PyQt4.QtCore import pyqtSignal, QByteArray, Qt
from PyQt4.QtGui import QDialog
from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply
try:
@@ -245,9 +245,10 @@
certinfos.append(self.__certToString(cert))
ret = E5MessageBox.yesNo(None,
self.trUtf8("Certificates"),
- self.trUtf8("""<p>Certificates:<br/>{0}<br/>"""
- """Do you want to accept all these certificates?</p>""")\
- .format("".join(certinfos)))
+ self.trUtf8("""Certificates:\n\n{0}\n\n"""
+ """Do you want to accept all these certificates?""")\
+ .format("\n\n".join(certinfos)),
+ textFormat=Qt.PlainText)
if ret:
if server not in caMerge:
caMerge[server] = []
@@ -287,26 +288,24 @@
@param cert certificate to convert (QSslCertificate)
@return formatted string (string)
"""
- result = "<p>"
+ result = ""
result += self.trUtf8("Name: {0}")\
.format(Utilities.decodeString(
cert.subjectInfo(QSslCertificate.CommonName)))
- result += self.trUtf8("<br/>Organization: {0}")\
+ result += self.trUtf8("\nOrganization: {0}")\
.format(Utilities.decodeString(
cert.subjectInfo(QSslCertificate.Organization)))
- result += self.trUtf8("<br/>Issuer: {0}")\
+ result += self.trUtf8("\nIssuer: {0}")\
.format(Utilities.decodeString(
cert.issuerInfo(QSslCertificate.CommonName)))
- result += self.trUtf8("<br/>Not valid before: {0}<br/>Valid Until: {1}")\
+ result += self.trUtf8("\nNot valid before: {0}\nValid Until: {1}")\
.format(cert.effectiveDate().toString("yyyy-MM-dd"),
cert.expiryDate().toString("yyyy-MM-dd"))
- result += "</p>"
-
return result
def __getSystemCaCertificates(self):
