--- a/eric6/E5Gui/E5TextEditSearchWidget.py Mon Sep 09 18:52:08 2019 +0200 +++ b/eric6/E5Gui/E5TextEditSearchWidget.py Thu Oct 03 11:12:10 2019 +0200 @@ -7,12 +7,13 @@ Module implementing a horizontal search widget for QTextEdit. """ -from __future__ import unicode_literals from PyQt5.QtCore import pyqtSlot, Qt, QMetaObject, QSize from PyQt5.QtGui import QPalette, QBrush, QColor, QTextDocument, QTextCursor -from PyQt5.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QLabel, \ - QComboBox, QCheckBox, QToolButton, QSizePolicy +from PyQt5.QtWidgets import ( + QWidget, QVBoxLayout, QHBoxLayout, QLabel, QComboBox, QCheckBox, + QToolButton, QSizePolicy +) from E5Gui.E5ComboBox import E5ClearableComboBox @@ -41,10 +42,12 @@ self.__texteditType = "" self.__findBackwards = True - self.__defaultBaseColor = \ + self.__defaultBaseColor = ( self.findtextCombo.lineEdit().palette().color(QPalette.Base) - self.__defaultTextColor = \ + ) + self.__defaultTextColor = ( self.findtextCombo.lineEdit().palette().color(QPalette.Text) + ) self.findHistory = [] @@ -273,9 +276,6 @@ self.__findNextPrevCallback(ok) elif self.__texteditType == "QWebEngineView": self.__findPrevNextQWebEngineView(backwards) - elif self.__texteditType == "QWebView": - ok = self.__findPrevNextQWebView(backwards) - self.__findNextPrevCallback(ok) def __findPrevNextQTextEdit(self, backwards): """ @@ -310,27 +310,6 @@ return ok - def __findPrevNextQWebView(self, backwards): - """ - Private method to to search the associated edit widget of - type QWebView. - - @param backwards flag indicating a backwards search - @type bool - @return flag indicating the search result - @rtype bool - """ - from PyQt5.QtWebKitWidgets import QWebPage - - findFlags = QWebPage.FindFlags(QWebPage.FindWrapsAroundDocument) - if self.caseCheckBox.isChecked(): - findFlags |= QWebPage.FindCaseSensitively - if backwards: - findFlags |= QWebPage.FindBackward - - return self.__textedit.findText(self.findtextCombo.currentText(), - findFlags) - def __findPrevNextQWebEngineView(self, backwards): """ Private method to to search the associated edit widget of