Mercurial Repositories > eric / changeset

--- a/WebBrowser/Network/NetworkManager.py	Sun Mar 06 17:24:27 2016 +0100
+++ b/WebBrowser/Network/NetworkManager.py	Sun Mar 06 17:45:24 2016 +0100
@@ -114,6 +114,15 @@
             self.__permanentlyIgnoredSslErrors = dlg.getSslErrorExceptions()
             self.changed.emit()
     
+    def clearSslExceptions(self):
+        """
+        Public method to clear the permanent SSL certificate error exceptions.
+        """
+        self.__load()
+        
+        self.__permanentlyIgnoredSslErrors = {}
+        self.changed.emit()
+    
     def certificateError(self, error, view):
         """
         Public method to handle SSL certificate errors.

--- a/WebBrowser/WebBrowserClearPrivateDataDialog.py	Sun Mar 06 17:24:27 2016 +0100
+++ b/WebBrowser/WebBrowserClearPrivateDataDialog.py	Sun Mar 06 17:45:24 2016 +0100
@@ -38,9 +38,9 @@
         
         @return tuple with flags indicating which data to clear
             (browsing history, search history, favicons, disk cache, cookies,
-            passwords, web databases, downloads, flash, zoom values) and the
-            selected history period in milliseconds (tuple of booleans and
-            integer)
+            passwords, web databases, downloads, flash, zoom values, SSL
+            certificate error exceptions) and the selected history period in
+            milliseconds (tuple of booleans and integer)
         """
         index = self.historyCombo.currentIndex()
         if index == 0:
@@ -69,4 +69,5 @@
                 self.downloadsCheckBox.isChecked(),
                 self.flashCookiesCheckBox.isChecked(),
                 self.zoomCheckBox.isChecked(),
+                self.sslExceptionsCheckBox.isChecked(),
                 historyPeriod)

--- a/WebBrowser/WebBrowserClearPrivateDataDialog.ui	Sun Mar 06 17:24:27 2016 +0100
+++ b/WebBrowser/WebBrowserClearPrivateDataDialog.ui	Sun Mar 06 17:45:24 2016 +0100
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>305</width>
-    <height>353</height>
+    <height>380</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -187,6 +187,16 @@
     </widget>
    </item>
    <item>
+    <widget class="QCheckBox" name="sslExceptionsCheckBox">
+     <property name="text">
+      <string>SSL Certificate Error Exceptions</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
     <widget class="Line" name="line">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -226,6 +236,7 @@
   <tabstop>passwordsCheckBox</tabstop>
   <tabstop>databasesCheckBox</tabstop>
   <tabstop>zoomCheckBox</tabstop>
+  <tabstop>sslExceptionsCheckBox</tabstop>
   <tabstop>flashCookiesCheckBox</tabstop>
  </tabstops>
  <resources/>

--- a/WebBrowser/WebBrowserWindow.py	Sun Mar 06 17:24:27 2016 +0100
+++ b/WebBrowser/WebBrowserWindow.py	Sun Mar 06 17:45:24 2016 +0100
@@ -3274,7 +3274,7 @@
             # passwords, web databases, downloads, Flash cookies
             (history, searches, favicons, cache, cookies,
              passwords, databases, downloads, flashCookies, zoomValues,
-             historyPeriod) = dlg.getData()
+             sslExceptions, historyPeriod) = dlg.getData()
             if history:
                 self.historyManager().clear(historyPeriod)
                 self.__tabWidget.clearClosedTabsList()
@@ -3307,6 +3307,8 @@
                 self.flashCookieManager().removeAllCookies()
             if zoomValues:
                 ZoomManager.instance().clear()
+            if sslExceptions:
+                self.networkManager().clearSslExceptions()
         
     def __showEnginesConfigurationDialog(self):
         """