Mercurial Repositories > eric / file diff

--- a/eric7/WebBrowser/WebBrowserPage.py	Sun Aug 29 17:48:26 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserPage.py	Sun Aug 29 17:48:44 2021 +0200
@@ -13,8 +13,7 @@
 )
 from PyQt6.QtGui import QDesktopServices
 from PyQt6.QtWebEngineCore import (
-    QWebEnginePage, QWebEngineSettings, QWebEngineScript,
-    PYQT_WEBENGINE_VERSION
+    QWebEnginePage, QWebEngineSettings, QWebEngineScript
 )
 from PyQt6.QtWebChannel import QWebChannel
 
@@ -64,11 +63,20 @@
     
     sslConfigurationChanged = pyqtSignal()
     
-    def __init__(self, parent=None):
+    def __init__(self, view, parent=None):
         """
         Constructor
         
-        @param parent parent widget of this window (QWidget)
+        @param view reference to the WebBrowserView associated with the page
+        @type WebBrowserView
+        @param parent reference to the parent widget (defaults to None)
+        @type QWidget (optional)
+        """
+        """
+        Constructor
+        
+        @param parent parent widget of this window (optional)
+        @type QWidget
         """
         super().__init__(
             WebBrowserWindow.webProfile(), parent)
@@ -77,6 +85,8 @@
         self.__badSite = False
         self.__registerProtocolHandlerRequest = None
         
+        self.__view = view
+        
         self.featurePermissionRequested.connect(
             self.__featurePermissionRequested)
         self.authenticationRequired.connect(
@@ -153,7 +163,7 @@
         if url.scheme() == "eric":
             if url.path() == "AddSearchProvider":
                 query = QUrlQuery(url)
-                self.view().mainWindow().openSearchManager().addEngine(
+                self.__view.mainWindow().openSearchManager().addEngine(
                     QUrl(query.queryItemValue("url")))
                 return False
             elif url.path() == "PrintPage":
@@ -435,7 +445,7 @@
         @rtype bool
         """
         return WebBrowserWindow.networkManager().certificateError(
-            error, self.view())
+            error, self.__view)
     
     def __fullScreenRequested(self, request):
         """
@@ -444,9 +454,9 @@
         @param request reference to the full screen request
         @type QWebEngineFullScreenRequest
         """
-        self.view().requestFullScreen(request.toggleOn())
+        self.__view.requestFullScreen(request.toggleOn())
         
-        accepted = request.toggleOn() == self.view().isFullScreen()
+        accepted = request.toggleOn() == self.__view.isFullScreen()
         
         if accepted:
             request.accept()
@@ -506,7 +516,7 @@
         @param sourceId source URL causing the error
         @type str
         """
-        self.view().mainWindow().javascriptConsole().javaScriptConsoleMessage(
+        self.__view.mainWindow().javascriptConsole().javaScriptConsoleMessage(
             level, message, lineNumber, sourceId)
     
     ###########################################################################
@@ -534,7 +544,7 @@
             @return web site icon
             @rtype QIcon
             """
-            return self.view().icon()
+            return self.__view.icon()
     
     if not hasattr(QWebEnginePage, "scrollPosition"):
         def scrollPosition(self):
@@ -687,11 +697,11 @@
         if SSL_AVAILABLE and self.__sslConfiguration is not None:
             from EricNetwork.EricSslInfoWidget import EricSslInfoWidget
             widget = EricSslInfoWidget(self.url(), self.__sslConfiguration,
-                                       self.view())
+                                       self.__view)
             widget.showAt(pos)
         else:
             EricMessageBox.warning(
-                self.view(),
+                self.__view,
                 self.tr("SSL Info"),
                 self.tr("""This site does not contain SSL information."""))