Mercurial Repositories > eric / changeset

--- a/Helpviewer/HelpBrowserWV.py	Sun Feb 27 11:30:26 2011 +0100
+++ b/Helpviewer/HelpBrowserWV.py	Thu Mar 03 18:58:01 2011 +0100
@@ -26,7 +26,11 @@
 from .Bookmarks.AddBookmarkDialog import AddBookmarkDialog
 from .JavaScriptResources import fetchLinks_js
 from .HTMLResources import notFoundPage_html
-from .SslInfoDialog import SslInfoDialog
+try:
+    from .SslInfoDialog import SslInfoDialog
+    SSL_AVAILABLE = True
+except ImportError:
+    SSL_AVAILABLE = False
 import Helpviewer.HelpWindow
 
 from .Network.NetworkAccessManagerProxy import NetworkAccessManagerProxy
@@ -348,7 +352,7 @@
         """
         Public slot to show some SSL information for the loaded page.
         """
-        if self.__sslInfo is not None:
+        if SSL_AVAILABLE and self.__sslInfo is not None:
             dlg = SslInfoDialog(self.__sslInfo, self.view())
             dlg.exec_()
         else:

--- a/Helpviewer/HelpWindow.py	Sun Feb 27 11:30:26 2011 +0100
+++ b/Helpviewer/HelpWindow.py	Thu Mar 03 18:58:01 2011 +0100
@@ -1064,19 +1064,20 @@
             self.adblockAct.triggered[()].connect(self.__showAdBlockDialog)
         self.__actions.append(self.adblockAct)
         
-        self.certificatesAct = E5Action(self.trUtf8('Manage Certificates'), 
-                      self.trUtf8('Manage Certificates...'), 
-                      0, 0,
-                      self, 'help_manage_certificates')
-        self.certificatesAct.setStatusTip(self.trUtf8(
-                'Manage the saved certificates'))
-        self.certificatesAct.setWhatsThis(self.trUtf8(
-                """<b>Manage Saved Certificates...</b>"""
-                """<p>Opens a dialog to manage the saved certificates.</p>"""
-        ))
-        if not self.initShortcutsOnly:
-            self.certificatesAct.triggered[()].connect(self.__showCertificatesDialog)
-        self.__actions.append(self.certificatesAct)
+        if SSL_AVAILABLE:
+            self.certificatesAct = E5Action(self.trUtf8('Manage Certificates'), 
+                          self.trUtf8('Manage Certificates...'), 
+                          0, 0,
+                          self, 'help_manage_certificates')
+            self.certificatesAct.setStatusTip(self.trUtf8(
+                    'Manage the saved certificates'))
+            self.certificatesAct.setWhatsThis(self.trUtf8(
+                    """<b>Manage Saved Certificates...</b>"""
+                    """<p>Opens a dialog to manage the saved certificates.</p>"""
+            ))
+            if not self.initShortcutsOnly:
+                self.certificatesAct.triggered[()].connect(self.__showCertificatesDialog)
+            self.__actions.append(self.certificatesAct)
         
         self.toolsMonitorAct = E5Action(self.trUtf8('Show Network Monitor'), 
                       self.trUtf8('Show &Network Monitor'), 

--- a/Helpviewer/SslCertificatesDialog.py	Sun Feb 27 11:30:26 2011 +0100
+++ b/Helpviewer/SslCertificatesDialog.py	Thu Mar 03 18:58:01 2011 +0100
@@ -18,7 +18,10 @@
 
 from .Ui_SslCertificatesDialog import Ui_SslCertificatesDialog
 
-from .SslInfoDialog import SslInfoDialog
+try:
+    from .SslInfoDialog import SslInfoDialog
+except ImportError:
+    pass
 
 import Preferences
 import Utilities