diff -r ebab8ba287e6 -r 6b42677d7043 eric6/WebBrowser/WebBrowserView.py
--- a/eric6/WebBrowser/WebBrowserView.py Sun Sep 01 19:58:00 2019 +0200
+++ b/eric6/WebBrowser/WebBrowserView.py Mon Sep 02 18:50:38 2019 +0200
@@ -12,9 +12,9 @@
import os
-from PyQt5.QtCore import pyqtSignal, pyqtSlot, PYQT_VERSION, Qt, QUrl, \
- QFileInfo, QTimer, QEvent, QPoint, QPointF, QDateTime, QStandardPaths, \
- QByteArray, QIODevice, QDataStream
+from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QUrl, QFileInfo, QTimer, \
+ QEvent, QPoint, QPointF, QDateTime, QStandardPaths, QByteArray, \
+ QIODevice, QDataStream
from PyQt5.QtGui import QDesktopServices, QClipboard, QIcon, \
QContextMenuEvent, QPixmap, QCursor
from PyQt5.QtWidgets import qApp, QStyle, QMenu, QApplication, QDialog
@@ -129,11 +129,10 @@
self.__restoreData = None
- if qVersionTuple() >= (5, 8, 0):
- if self.parentWidget() is not None:
- self.parentWidget().installEventFilter(self)
+ if self.parentWidget() is not None:
+ self.parentWidget().installEventFilter(self)
- if qVersionTuple() >= (5, 8, 0) and qVersionTuple() < (5, 11, 0):
+ if qVersionTuple() < (5, 11, 0):
lay = self.layout()
lay.currentChanged.connect(
lambda: QTimer.singleShot(0, self.__setRwhvqt))
@@ -574,26 +573,24 @@
@type WebHitTestResult
"""
spellCheckActionCount = 0
- if qVersionTuple() >= (5, 7, 0) and PYQT_VERSION >= 0x50700:
- contextMenuData = self.page().contextMenuData()
- hitTest.updateWithContextMenuData(contextMenuData)
+ contextMenuData = self.page().contextMenuData()
+ hitTest.updateWithContextMenuData(contextMenuData)
+
+ if bool(contextMenuData.misspelledWord()):
+ boldFont = menu.font()
+ boldFont.setBold(True)
- if qVersionTuple() >= (5, 8, 0) and PYQT_VERSION >= 0x50800 and \
- bool(contextMenuData.misspelledWord()):
- boldFont = menu.font()
- boldFont.setBold(True)
-
- for suggestion in contextMenuData.spellCheckerSuggestions():
- act = menu.addAction(suggestion)
- act.setFont(boldFont)
- act.triggered.connect(
- lambda: self.__replaceMisspelledWord)(act)
-
- if not bool(menu.actions()):
- menu.addAction(self.tr("No suggestions")).setEnabled(False)
-
- menu.addSeparator()
- spellCheckActionCount = len(menu.actions())
+ for suggestion in contextMenuData.spellCheckerSuggestions():
+ act = menu.addAction(suggestion)
+ act.setFont(boldFont)
+ act.triggered.connect(
+ lambda: self.__replaceMisspelledWord)(act)
+
+ if not bool(menu.actions()):
+ menu.addAction(self.tr("No suggestions")).setEnabled(False)
+
+ menu.addSeparator()
+ spellCheckActionCount = len(menu.actions())
if not hitTest.linkUrl().isEmpty() and \
hitTest.linkUrl().scheme() != "javascript":
@@ -1523,16 +1520,7 @@
# find the render widget receiving events for the web page
if obj is self and evt.type() == QEvent.ChildAdded:
- if qVersionTuple() < (5, 8, 0):
- child = evt.child()
- if child and child.inherits(
- "QtWebEngineCore::"
- "RenderWidgetHostViewQtDelegateWidget"):
- self.__rwhvqt = child
- self.grabGesture(Qt.PinchGesture)
- self.__rwhvqt.grabGesture(Qt.PinchGesture)
- self.__rwhvqt.installEventFilter(self)
- elif qVersionTuple() >= (5, 11, 0):
+ if qVersionTuple() >= (5, 11, 0):
QTimer.singleShot(0, self.__setRwhvqt)
# forward events to WebBrowserView
@@ -1857,13 +1845,9 @@
if url.isEmpty():
return
- if qVersionTuple() >= (5, 8, 0) and PYQT_VERSION >= 0x50800:
- # since Qt 5.8.0
- fileName, savePageFormat = self.__getSavePageFileNameAndFormat()
- if fileName:
- self.page().save(fileName, savePageFormat)
- else:
- self.triggerPageAction(QWebEnginePage.SavePage)
+ fileName, savePageFormat = self.__getSavePageFileNameAndFormat()
+ if fileName:
+ self.page().save(fileName, savePageFormat)
def __getSavePageFileNameAndFormat(self):
"""
