Mercurial Repositories > eric / file diff

--- a/eric6/E5Gui/E5TextEditSearchWidget.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5TextEditSearchWidget.py	Tue Mar 02 17:17:09 2021 +0100
@@ -42,10 +42,12 @@
         self.__findBackwards = True
         
         self.__defaultBaseColor = (
-            self.findtextCombo.lineEdit().palette().color(QPalette.Base)
+            self.findtextCombo.lineEdit().palette().color(
+                QPalette.ColorRole.Base)
         )
         self.__defaultTextColor = (
-            self.findtextCombo.lineEdit().palette().color(QPalette.Text)
+            self.findtextCombo.lineEdit().palette().color(
+                QPalette.ColorRole.Text)
         )
         
         self.findHistory = []
@@ -82,7 +84,8 @@
         self.horizontalLayout1.addWidget(self.label)
         
         self.findtextCombo = E5ClearableComboBox(self)
-        sizePolicy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
+        sizePolicy = QSizePolicy(QSizePolicy.Policy.Expanding,
+                                 QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(
@@ -90,7 +93,7 @@
         self.findtextCombo.setSizePolicy(sizePolicy)
         self.findtextCombo.setMinimumSize(QSize(100, 0))
         self.findtextCombo.setEditable(True)
-        self.findtextCombo.setInsertPolicy(QComboBox.InsertAtTop)
+        self.findtextCombo.setInsertPolicy(QComboBox.InsertPolicy.InsertAtTop)
         self.findtextCombo.setDuplicatesEnabled(False)
         self.findtextCombo.setObjectName("findtextCombo")
         self.horizontalLayout1.addWidget(self.findtextCombo)
@@ -200,8 +203,8 @@
         
         @param event reference to the key press event (QKeyEvent)
         """
-        if self.__textedit and event.key() == Qt.Key_Escape:
-            self.__textedit.setFocus(Qt.ActiveWindowFocusReason)
+        if self.__textedit and event.key() == Qt.Key.Key_Escape:
+            self.__textedit.setFocus(Qt.FocusReason.ActiveWindowFocusReason)
             event.accept()
     
     @pyqtSlot(str)
@@ -289,22 +292,25 @@
         @rtype bool
         """
         if backwards:
-            flags = QTextDocument.FindFlags(QTextDocument.FindBackward)
+            flags = QTextDocument.FindFlags(
+                QTextDocument.FindFlag.FindBackward)
         else:
             flags = QTextDocument.FindFlags()
         if self.caseCheckBox.isChecked():
-            flags |= QTextDocument.FindCaseSensitively
+            flags |= QTextDocument.FindFlag.FindCaseSensitively
         if self.wordCheckBox.isChecked():
-            flags |= QTextDocument.FindWholeWords
+            flags |= QTextDocument.FindFlag.FindWholeWords
         
         ok = self.__textedit.find(self.findtextCombo.currentText(), flags)
         if not ok:
             # wrap around once
             cursor = self.__textedit.textCursor()
             if backwards:
-                moveOp = QTextCursor.End        # move to end of document
+                moveOp = QTextCursor.MoveOperation.End
+                # move to end of document
             else:
-                moveOp = QTextCursor.Start      # move to start of document
+                moveOp = QTextCursor.MoveOperation.Start
+                # move to start of document
             cursor.movePosition(moveOp)
             self.__textedit.setTextCursor(cursor)
             ok = self.__textedit.find(self.findtextCombo.currentText(), flags)
@@ -323,9 +329,9 @@
         
         findFlags = QWebEnginePage.FindFlags()
         if self.caseCheckBox.isChecked():
-            findFlags |= QWebEnginePage.FindCaseSensitively
+            findFlags |= QWebEnginePage.FindFlag.FindCaseSensitively
         if backwards:
-            findFlags |= QWebEnginePage.FindBackward
+            findFlags |= QWebEnginePage.FindFlag.FindBackward
         self.__textedit.findText(self.findtextCombo.currentText(),
                                  findFlags, self.__findNextPrevCallback)
     
@@ -353,10 +359,10 @@
         le = self.findtextCombo.lineEdit()
         p = le.palette()
         if error:
-            p.setBrush(QPalette.Base, QBrush(QColor("#FF6666")))
-            p.setBrush(QPalette.Text, QBrush(QColor("#000000")))
+            p.setBrush(QPalette.ColorRole.Base, QBrush(QColor("#FF6666")))
+            p.setBrush(QPalette.ColorRole.Text, QBrush(QColor("#000000")))
         else:
-            p.setBrush(QPalette.Base, self.__defaultBaseColor)
-            p.setBrush(QPalette.Text, self.__defaultTextColor)
+            p.setBrush(QPalette.ColorRole.Base, self.__defaultBaseColor)
+            p.setBrush(QPalette.ColorRole.Text, self.__defaultTextColor)
         le.setPalette(p)
         le.update()