eric: comparison eric6/WebBrowser/WebBrowserView.py

-:cf988a30ba47
+:76daafe10009
 from .Tools.WebBrowserTools import getHtmlPage, pixmapToDataUrl
 import Preferences
 import UI.PixmapCache
 import Utilities
-from Globals import qVersionTuple
 class WebBrowserView(QWebEngineView):
 """
 Class implementing the web browser view widget.
 self.__restoreData = None
 if self.parentWidget() is not None:
 self.parentWidget().installEventFilter(self)
-if qVersionTuple() < (5, 11, 0):
-lay = self.layout()
-lay.currentChanged.connect(
-lambda: QTimer.singleShot(0, self.__setRwhvqt))
-self.__setRwhvqt()
 self.grabGesture(Qt.PinchGesture)
 def __createNewPage(self):
 """
 if not hitTest.isContentEditable() and not hitTest.isContentSelected():
 self.__menu.addSeparator()
 self.__menu.addAction(self.__mw.adBlockIcon().menuAction())
-if (
+self.__menu.addSeparator()
-qVersionTuple() >= (5, 11, 0) or
+self.__menu.addAction(
-Preferences.getWebBrowser("WebInspectorEnabled")
+UI.PixmapCache.getIcon("webInspector"),
-):
+self.tr("Inspect Element..."), self.__webInspector)
-self.__menu.addSeparator()
-self.__menu.addAction(
-UI.PixmapCache.getIcon("webInspector"),
-self.tr("Inspect Element..."), self.__webInspector)
 if not self.__menu.isEmpty():
 pos = evt.globalPos()
 self.__menu.popup(QPoint(pos.x(), pos.y() + 1))
 ):
 self.parentWidget().installEventFilter(self)
 # find the render widget receiving events for the web page
 if obj is self and evt.type() == QEvent.ChildAdded:
-if qVersionTuple() >= (5, 11, 0):
+QTimer.singleShot(0, self.__setRwhvqt)
-QTimer.singleShot(0, self.__setRwhvqt)
 # forward events to WebBrowserView
 if (
 obj is self.__rwhvqt and
 evt.type() in [QEvent.KeyPress, QEvent.KeyRelease,
 ###########################################################################
 ## Methods below implement slots for Qt 5.11+
 ###########################################################################
-if qVersionTuple() >= (5, 11, 0):
+@pyqtSlot("QWebEngineQuotaRequest")
-@pyqtSlot("QWebEngineQuotaRequest")
+def __quotaRequested(self, quotaRequest):
-def __quotaRequested(self, quotaRequest):
+"""
-"""
+Private slot to handle quota requests of the web page.
-Private slot to handle quota requests of the web page.
+@param quotaRequest reference to the quota request object
+@type QWebEngineQuotaRequest
+"""
+acceptRequest = Preferences.getWebBrowser("AcceptQuotaRequest")
+# map yes/no/ask from (0, 1, 2)
+if acceptRequest == 0:
+# always yes
+ok = True
+elif acceptRequest == 1:
+# always no
+ok = False
+else:
+# ask user
+from .Download.DownloadUtilities import dataString
+sizeStr = dataString(quotaRequest.requestedSize())
-@param quotaRequest reference to the quota request object
+ok = E5MessageBox.yesNo(
-@type QWebEngineQuotaRequest
+self,
-"""
+self.tr("Quota Request"),
-acceptRequest = Preferences.getWebBrowser("AcceptQuotaRequest")
+self.tr("""<p> Allow the website at <b>{0}</b> to use"""
-# map yes/no/ask from (0, 1, 2)
+""" <b>{1}</b> of persistent storage?</p>""")
-if acceptRequest == 0:
+.format(quotaRequest.origin().host(), sizeStr)
-# always yes
+)
-ok = True
-elif acceptRequest == 1:
+if ok:
-# always no
+quotaRequest.accept()
-ok = False
+else:
-else:
+quotaRequest.reject()
-# ask user
-from .Download.DownloadUtilities import dataString
-sizeStr = dataString(quotaRequest.requestedSize())
-ok = E5MessageBox.yesNo(
-self,
-self.tr("Quota Request"),
-self.tr("""<p> Allow the website at <b>{0}</b> to use"""
-""" <b>{1}</b> of persistent storage?</p>""")
-.format(quotaRequest.origin().host(), sizeStr)
-)
-if ok:
-quotaRequest.accept()
-else:
-quotaRequest.reject()
 ###########################################################################
 ## Methods below implement slots for Qt 5.12+
 ###########################################################################
-if qVersionTuple() >= (5, 12, 0):
+@pyqtSlot("QWebEngineClientCertificateSelection")
-@pyqtSlot("QWebEngineClientCertificateSelection")
+def __selectClientCertificate(self, clientCertificateSelection):
-def __selectClientCertificate(self, clientCertificateSelection):
+"""
-"""
+Private slot to handle the client certificate selection request.
-Private slot to handle the client certificate selection request.
+@param clientCertificateSelection list of client SSL certificates
+found in system's client certificate store
+@type QWebEngineClientCertificateSelection
+"""
+certificates = clientCertificateSelection.certificates()
+if len(certificates) == 0:
+clientCertificateSelection.selectNone()
+elif len(certificates) == 1:
+clientCertificateSelection.select(certificates[0])
+else:
+certificate = None
+from E5Network.E5SslCertificateSelectionDialog import (
+E5SslCertificateSelectionDialog
+)
+dlg = E5SslCertificateSelectionDialog(certificates, self)
+if dlg.exec() == QDialog.Accepted:
+certificate = dlg.getSelectedCertificate()
-@param clientCertificateSelection list of client SSL certificates
+if certificate is None:
-found in system's client certificate store
-@type QWebEngineClientCertificateSelection
-"""
-certificates = clientCertificateSelection.certificates()
-if len(certificates) == 0:
 clientCertificateSelection.selectNone()
-elif len(certificates) == 1:
-clientCertificateSelection.select(certificates[0])
 else:
-certificate = None
+clientCertificateSelection.select(certificate)
-from E5Network.E5SslCertificateSelectionDialog import (
-E5SslCertificateSelectionDialog
-)
-dlg = E5SslCertificateSelectionDialog(certificates, self)
-if dlg.exec() == QDialog.Accepted:
-certificate = dlg.getSelectedCertificate()
-if certificate is None:
-clientCertificateSelection.selectNone()
-else:
-clientCertificateSelection.select(certificate)

Mercurial Repositories > eric / file comparison

comparison: eric6/WebBrowser/WebBrowserView.py

eric6/WebBrowser/WebBrowserView.py