Mercurial Repositories > eric / changeset

--- a/WebBrowser/UrlBar/UrlBar.py	Sun Feb 28 18:49:07 2016 +0100
+++ b/WebBrowser/UrlBar/UrlBar.py	Sun Feb 28 18:49:24 2016 +0100
@@ -314,13 +314,13 @@
                 p.setBrush(QPalette.Text, foregroundColor)
             else:
                 if self.__browser.url().scheme() == "https":
-                    if QSslCertificate is not None:
-                        if self.__browser.page().hasValidSslInfo():
-                            backgroundColor = Preferences.getWebBrowser(
-                                "SaveUrlColor")
-                    else:
-                        backgroundColor = Preferences.getWebBrowser(
-                            "SaveUrlColor")
+##                    if QSslCertificate is not None:
+##                        if self.__browser.page().hasValidSslInfo():
+##                            backgroundColor = Preferences.getWebBrowser(
+##                                "SaveUrlColor")
+##                    else:
+                    backgroundColor = Preferences.getWebBrowser(
+                        "SaveUrlColor")
                 highlight = QApplication.palette().color(QPalette.Highlight)
                 r = (highlight.red() + 2 * backgroundColor.red()) // 3
                 g = (highlight.green() + 2 * backgroundColor.green()) // 3

--- a/WebBrowser/WebBrowserPage.py	Sun Feb 28 18:49:07 2016 +0100
+++ b/WebBrowser/WebBrowserPage.py	Sun Feb 28 18:49:24 2016 +0100
@@ -165,6 +165,10 @@
         self.authenticationRequired.connect(
             WebBrowser.WebBrowserWindow.WebBrowserWindow.networkManager()
             .authentication)
+        
+        self.proxyAuthenticationRequired.connect(
+            WebBrowser.WebBrowserWindow.WebBrowserWindow.networkManager()
+            .proxyAuthentication)
     
     def acceptNavigationRequest(self, url, type_, isMainFrame):
         """

--- a/WebBrowser/WebBrowserWindow.py	Sun Feb 28 18:49:07 2016 +0100
+++ b/WebBrowser/WebBrowserWindow.py	Sun Feb 28 18:49:24 2016 +0100
@@ -1587,8 +1587,8 @@
 ##        self.__actions.append(self.flashblockAct)
         
         # TODO: Certificates
-        
-        from .Network.NetworkManager import SSL_AVAILABLE
+##        
+##        from .Network.NetworkManager import SSL_AVAILABLE
 ##        if SSL_AVAILABLE:
 ##            self.certificatesAct = E5Action(
 ##                self.tr('Manage SSL Certificates'),
@@ -1853,6 +1853,8 @@
         menu.addAction(self.searchEnginesAct)
         menu.addSeparator()
         menu.addAction(self.passwordsAct)
+        # TODO: Certificates
+##        from .Network.NetworkManager import SSL_AVAILABLE
 ##        if SSL_AVAILABLE:
 ##            menu.addAction(self.certificatesAct)
 ##        menu.addSeparator()

--- a/eric6_browser.py	Sun Feb 28 18:49:07 2016 +0100
+++ b/eric6_browser.py	Sun Feb 28 18:49:24 2016 +0100
@@ -67,10 +67,6 @@
 sys.path.insert(2, os.path.join(os.path.dirname(__file__),
                                 "ThirdParty", "Pygments"))
 
-##import Preferences
-##if Preferences.getWebBrowser("WebInspectorEnabled"):
-##    os.environ["QTWEBENGINE_REMOTE_DEBUGGING"] = \
-##        str(Preferences.getWebBrowser("WebInspectorPort"))
 from PyQt5 import QtWebEngineWidgets    # __IGNORE_WARNING__
 
 import Globals