Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric5.api	Sun Apr 14 17:13:32 2013 +0200
+++ b/APIs/Python3/eric5.api	Sun Apr 14 18:41:08 2013 +0200
@@ -2473,6 +2473,7 @@
 eric5.Helpviewer.HelpBrowserWV.HelpWebPage.getAdBlockedPageEntries?4()
 eric5.Helpviewer.HelpBrowserWV.HelpWebPage.getSslCertificate?4()
 eric5.Helpviewer.HelpBrowserWV.HelpWebPage.getSslCertificateChain?4()
+eric5.Helpviewer.HelpBrowserWV.HelpWebPage.getSslConfiguration?4()
 eric5.Helpviewer.HelpBrowserWV.HelpWebPage.hasValidSslInfo?4()
 eric5.Helpviewer.HelpBrowserWV.HelpWebPage.pageAttributeId?4()
 eric5.Helpviewer.HelpBrowserWV.HelpWebPage.populateNetworkRequest?4(request)
@@ -8693,6 +8694,7 @@
 eric5.install.progName?7
 eric5.install.pyModDir?7
 eric5.install.pyName?4(py_dir, py_file)
+eric5.install.scriptsDir?7
 eric5.install.shutilCopy?4(src, dst, perm=0o644)
 eric5.install.sourceDir?7
 eric5.install.usage?4(rcode=2)

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Sun Apr 14 17:13:32 2013 +0200
+++ b/Documentation/Help/source.qhp	Sun Apr 14 18:41:08 2013 +0200
@@ -5151,6 +5151,7 @@
       <keyword name="HelpWebPage.getAdBlockedPageEntries" id="HelpWebPage.getAdBlockedPageEntries" ref="eric5.Helpviewer.HelpBrowserWV.html#HelpWebPage.getAdBlockedPageEntries" />
       <keyword name="HelpWebPage.getSslCertificate" id="HelpWebPage.getSslCertificate" ref="eric5.Helpviewer.HelpBrowserWV.html#HelpWebPage.getSslCertificate" />
       <keyword name="HelpWebPage.getSslCertificateChain" id="HelpWebPage.getSslCertificateChain" ref="eric5.Helpviewer.HelpBrowserWV.html#HelpWebPage.getSslCertificateChain" />
+      <keyword name="HelpWebPage.getSslConfiguration" id="HelpWebPage.getSslConfiguration" ref="eric5.Helpviewer.HelpBrowserWV.html#HelpWebPage.getSslConfiguration" />
       <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" />
       <keyword name="HelpWebPage.populateNetworkRequest" id="HelpWebPage.populateNetworkRequest" ref="eric5.Helpviewer.HelpBrowserWV.html#HelpWebPage.populateNetworkRequest" />

--- a/Documentation/Source/eric5.Helpviewer.HelpBrowserWV.html	Sun Apr 14 17:13:32 2013 +0200
+++ b/Documentation/Source/eric5.Helpviewer.HelpBrowserWV.html	Sun Apr 14 18:41:08 2013 +0200
@@ -1162,6 +1162,9 @@
 <td><a href="#HelpWebPage.getSslCertificateChain">getSslCertificateChain</a></td>
 <td>Public method to get a reference to the SSL certificate chain.</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.hasValidSslInfo">hasValidSslInfo</a></td>
 <td>Public method to check, if the page has a valid SSL certificate.</td>
 </tr><tr>
@@ -1331,6 +1334,16 @@
 <dd>
 SSL certificate chain (list of QSslCertificate)
 </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.hasValidSslInfo" ID="HelpWebPage.hasValidSslInfo"></a>
 <h4>HelpWebPage.hasValidSslInfo</h4>
 <b>hasValidSslInfo</b>(<i></i>)

--- a/Documentation/Source/eric5.install.html	Sun Apr 14 17:13:32 2013 +0200
+++ b/Documentation/Source/eric5.install.html	Sun Apr 14 18:41:08 2013 +0200
@@ -25,7 +25,7 @@
 </p>
 <h3>Global Attributes</h3>
 <table>
-<tr><td>BlackLists</td></tr><tr><td>PlatformsBlackLists</td></tr><tr><td>apisDir</td></tr><tr><td>cfg</td></tr><tr><td>configLength</td></tr><tr><td>configName</td></tr><tr><td>currDir</td></tr><tr><td>defaultMacAppBundleName</td></tr><tr><td>distDir</td></tr><tr><td>doCleanup</td></tr><tr><td>doCompile</td></tr><tr><td>macAppBundleName</td></tr><tr><td>macPythonExe</td></tr><tr><td>modDir</td></tr><tr><td>platBinDir</td></tr><tr><td>progLanguages</td></tr><tr><td>progName</td></tr><tr><td>pyModDir</td></tr><tr><td>sourceDir</td></tr>
+<tr><td>BlackLists</td></tr><tr><td>PlatformsBlackLists</td></tr><tr><td>apisDir</td></tr><tr><td>cfg</td></tr><tr><td>configLength</td></tr><tr><td>configName</td></tr><tr><td>currDir</td></tr><tr><td>defaultMacAppBundleName</td></tr><tr><td>distDir</td></tr><tr><td>doCleanup</td></tr><tr><td>doCompile</td></tr><tr><td>macAppBundleName</td></tr><tr><td>macPythonExe</td></tr><tr><td>modDir</td></tr><tr><td>platBinDir</td></tr><tr><td>progLanguages</td></tr><tr><td>progName</td></tr><tr><td>pyModDir</td></tr><tr><td>scriptsDir</td></tr><tr><td>sourceDir</td></tr>
 </table>
 <h3>Classes</h3>
 <table>

--- a/Helpviewer/HelpBrowserWV.py	Sun Apr 14 17:13:32 2013 +0200
+++ b/Helpviewer/HelpBrowserWV.py	Sun Apr 14 18:41:08 2013 +0200
@@ -490,6 +490,14 @@
         chain = self.__sslConfiguration.peerCertificateChain()
         return chain
     
+    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, pos):
         """
         Public slot to show some SSL information for the loaded page.

--- a/Helpviewer/UrlBar/UrlBar.py	Sun Apr 14 17:13:32 2013 +0200
+++ b/Helpviewer/UrlBar/UrlBar.py	Sun Apr 14 18:41:08 2013 +0200
@@ -198,6 +198,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