Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric5.api	Sun Apr 14 13:12:53 2013 +0200
+++ b/APIs/Python3/eric5.api	Sun Apr 14 18:38:50 2013 +0200
@@ -2413,6 +2413,7 @@
 eric5.Helpviewer.HelpBrowserWV.HelpWebPage.event?4(evt)
 eric5.Helpviewer.HelpBrowserWV.HelpWebPage.extension?4(extension, option, output)
 eric5.Helpviewer.HelpBrowserWV.HelpWebPage.getAdBlockedPageEntries?4()
+eric5.Helpviewer.HelpBrowserWV.HelpWebPage.getSslConfiguration?4()
 eric5.Helpviewer.HelpBrowserWV.HelpWebPage.getSslInfo?4()
 eric5.Helpviewer.HelpBrowserWV.HelpWebPage.hasValidSslInfo?4()
 eric5.Helpviewer.HelpBrowserWV.HelpWebPage.pageAttributeId?4()

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Sun Apr 14 13:12:53 2013 +0200
+++ b/Documentation/Help/source.qhp	Sun Apr 14 18:38:50 2013 +0200
@@ -5069,6 +5069,7 @@
       <keyword name="HelpWebPage.event" id="HelpWebPage.event" ref="eric5.Helpviewer.HelpBrowserWV.html#HelpWebPage.event" />
       <keyword name="HelpWebPage.extension" id="HelpWebPage.extension" ref="eric5.Helpviewer.HelpBrowserWV.html#HelpWebPage.extension" />
       <keyword name="HelpWebPage.getAdBlockedPageEntries" id="HelpWebPage.getAdBlockedPageEntries" ref="eric5.Helpviewer.HelpBrowserWV.html#HelpWebPage.getAdBlockedPageEntries" />
+      <keyword name="HelpWebPage.getSslConfiguration" id="HelpWebPage.getSslConfiguration" ref="eric5.Helpviewer.HelpBrowserWV.html#HelpWebPage.getSslConfiguration" />
       <keyword name="HelpWebPage.getSslInfo" id="HelpWebPage.getSslInfo" ref="eric5.Helpviewer.HelpBrowserWV.html#HelpWebPage.getSslInfo" />
       <keyword name="HelpWebPage.hasValidSslInfo" id="HelpWebPage.hasValidSslInfo" ref="eric5.Helpviewer.HelpBrowserWV.html#HelpWebPage.hasValidSslInfo" />
       <keyword name="HelpWebPage.pageAttributeId" id="HelpWebPage.pageAttributeId" ref="eric5.Helpviewer.HelpBrowserWV.html#HelpWebPage.pageAttributeId" />

--- a/Documentation/Source/eric5.Helpviewer.HelpBrowserWV.html	Sun Apr 14 13:12:53 2013 +0200
+++ b/Documentation/Source/eric5.Helpviewer.HelpBrowserWV.html	Sun Apr 14 18:38:50 2013 +0200
@@ -1127,6 +1127,9 @@
 <td><a href="#HelpWebPage.getAdBlockedPageEntries">getAdBlockedPageEntries</a></td>
 <td>Public method to get the list of AdBlock page entries.</td>
 </tr><tr>
+<td><a href="#HelpWebPage.getSslConfiguration">getSslConfiguration</a></td>
+<td>Public method to return a reference to the current SSL configuration.</td>
+</tr><tr>
 <td><a href="#HelpWebPage.getSslInfo">getSslInfo</a></td>
 <td>Public method to get a reference to the SSL info object.</td>
 </tr><tr>
@@ -1279,6 +1282,16 @@
 <dd>
 list of AdBlock page entries (list of AdBlockedPageEntry)
 </dd>
+</dl><a NAME="HelpWebPage.getSslConfiguration" ID="HelpWebPage.getSslConfiguration"></a>
+<h4>HelpWebPage.getSslConfiguration</h4>
+<b>getSslConfiguration</b>(<i></i>)
+<p>
+        Public method to return a reference to the current SSL configuration.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+reference to the SSL configuration in use (QSslConfiguration)
+</dd>
 </dl><a NAME="HelpWebPage.getSslInfo" ID="HelpWebPage.getSslInfo"></a>
 <h4>HelpWebPage.getSslInfo</h4>
 <b>getSslInfo</b>(<i></i>)

--- a/Helpviewer/HelpBrowserWV.py	Sun Apr 14 13:12:53 2013 +0200
+++ b/Helpviewer/HelpBrowserWV.py	Sun Apr 14 18:38:50 2013 +0200
@@ -486,6 +486,14 @@
         sslInfo.url = QUrl(self.__sslConfiguration.url)
         return sslInfo
     
+    def getSslConfiguration(self):
+        """
+        Public method to return a reference to the current SSL configuration.
+        
+        @return reference to the SSL configuration in use (QSslConfiguration)
+        """
+        return self.__sslConfiguration
+    
     def showSslInfo(self):
         """
         Public slot to show some SSL information for the loaded page.

--- a/Helpviewer/UrlBar/UrlBar.py	Sun Apr 14 13:12:53 2013 +0200
+++ b/Helpviewer/UrlBar/UrlBar.py	Sun Apr 14 18:38:50 2013 +0200
@@ -202,6 +202,10 @@
                         valid = not sslInfo.isBlacklisted()
                     else:
                         valid = sslInfo.isValid()
+                    if valid:
+                        config = self.__browser.page().getSslConfiguration()
+                        if config is None or config.sessionCipher().isNull():
+                            valid = False
                     self.__sslLabel.setValidity(valid)
                     return