Mercurial Repositories > eric / changeset
changeset
Changed the various search related combo boxes to show an error using style sheets.
Sun, 26 Dec 2021 18:43:48 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 26 Dec 2021 18:43:48 +0100
- branch
- eric7
- changeset 8858
- a70a980e7d4f
- parent 8857
- 8191d15b8974
- child 8859
- 64252c7bfb87
Changed the various search related combo boxes to show an error using style sheets.
diff -r 8191d15b8974 -r a70a980e7d4f eric7/EricWidgets/EricTextEditSearchWidget.py --- a/eric7/EricWidgets/EricTextEditSearchWidget.py Sun Dec 26 17:40:29 2021 +0100 +++ b/eric7/EricWidgets/EricTextEditSearchWidget.py Sun Dec 26 18:43:48 2021 +0100 @@ -10,7 +10,7 @@ import enum from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt, QMetaObject, QSize -from PyQt6.QtGui import QPalette, QBrush, QColor, QTextDocument, QTextCursor +from PyQt6.QtGui import QPalette, QTextDocument, QTextCursor from PyQt6.QtWidgets import ( QWidget, QVBoxLayout, QHBoxLayout, QLabel, QComboBox, QCheckBox, QToolButton, QSizePolicy @@ -58,8 +58,6 @@ self.__texteditType = EricTextEditType.UNKNOWN self.__findBackwards = False - # TODO: change to use style sheets - # get style sheet or create one from palette self.__defaultBaseColor = ( self.findtextCombo.lineEdit().palette().color( QPalette.ColorRole.Base) @@ -460,17 +458,14 @@ @param error flag indicating an error condition @type bool """ - le = self.findtextCombo.lineEdit() - p = le.palette() - # TODO: change to use style sheets if error: - p.setBrush(QPalette.ColorRole.Base, QBrush(QColor("#FF6666"))) - p.setBrush(QPalette.ColorRole.Text, QBrush(QColor("#000000"))) + styleSheet = "color: #000000; background-color: #ff6666" else: - p.setBrush(QPalette.ColorRole.Base, self.__defaultBaseColor) - p.setBrush(QPalette.ColorRole.Text, self.__defaultTextColor) - le.setPalette(p) - le.update() + styleSheet = ( + f"color: {self.__defaultTextColor};" + f" background-color: {self.__defaultBaseColor}" + ) + self.findtextCombo.setStyleSheet(styleSheet) def __findTextFinished(self, result): """
diff -r 8191d15b8974 -r a70a980e7d4f eric7/QScintilla/SearchReplaceWidget.py --- a/eric7/QScintilla/SearchReplaceWidget.py Sun Dec 26 17:40:29 2021 +0100 +++ b/eric7/QScintilla/SearchReplaceWidget.py Sun Dec 26 18:43:48 2021 +0100 @@ -162,8 +162,8 @@ self.ui.regexpCheckBox.toggled.connect( self.__updateQuickSearchMarkers) - self.__findtextStyleSheet = ( - self.ui.findtextCombo.lineEdit().styleSheet() + self.__findtextComboStyleSheet = ( + self.ui.findtextCombo.styleSheet() ) # define actions @@ -439,12 +439,12 @@ @type bool """ if not ok: - self.ui.findtextCombo.lineEdit().setStyleSheet( - "QLineEdit { color: #ffffff; background-color: #ff0000; }" + self.ui.findtextCombo.setStyleSheet( + "color: #000000; background-color: #ff6666;" ) else: - self.ui.findtextCombo.lineEdit().setStyleSheet( - self.__findtextStyleSheet) + self.ui.findtextCombo.setStyleSheet( + self.__findtextComboStyleSheet) @pyqtSlot() def on_extendButton_clicked(self):
diff -r 8191d15b8974 -r a70a980e7d4f eric7/WebBrowser/SearchWidget.py --- a/eric7/WebBrowser/SearchWidget.py Sun Dec 26 17:40:29 2021 +0100 +++ b/eric7/WebBrowser/SearchWidget.py Sun Dec 26 18:43:48 2021 +0100 @@ -8,7 +8,7 @@ """ from PyQt6.QtCore import pyqtSlot, Qt -from PyQt6.QtGui import QPalette, QBrush, QColor +from PyQt6.QtGui import QPalette from PyQt6.QtWidgets import QWidget from .Ui_SearchWidget import Ui_SearchWidget @@ -36,9 +36,6 @@ self.findPrevButton.setIcon(UI.PixmapCache.getIcon("1leftarrow")) self.findNextButton.setIcon(UI.PixmapCache.getIcon("1rightarrow")) - # TODO: change to use style sheets - # get style sheet or create one from palette - # see EricTextEditSearchWidget self.__defaultBaseColor = ( self.findtextCombo.lineEdit().palette().color( QPalette.ColorRole.Base) @@ -225,13 +222,11 @@ @param error flag indicating an error condition (boolean) """ - le = self.findtextCombo.lineEdit() - p = le.palette() if error: - p.setBrush(QPalette.ColorRole.Base, QBrush(QColor("#FF6666"))) - p.setBrush(QPalette.ColorRole.Text, QBrush(QColor("#000000"))) + styleSheet = "color: #000000; background-color: #ff6666" else: - p.setBrush(QPalette.ColorRole.Base, self.__defaultBaseColor) - p.setBrush(QPalette.ColorRole.Text, self.__defaultTextColor) - le.setPalette(p) - le.update() + styleSheet = ( + f"color: {self.__defaultTextColor};" + f" background-color: {self.__defaultBaseColor}" + ) + self.findtextCombo.setStyleSheet(styleSheet)
