Mercurial Repositories > eric / changeset

--- a/eric7/EricWidgets/EricTextEditSearchWidget.py	Sun Dec 26 18:43:48 2021 +0100
+++ b/eric7/EricWidgets/EricTextEditSearchWidget.py	Sun Dec 26 18:49:26 2021 +0100
@@ -458,13 +458,12 @@
         @param error flag indicating an error condition
         @type bool
         """
-        if error:
-            styleSheet = "color: #000000; background-color: #ff6666"
-        else:
-            styleSheet = (
-                f"color: {self.__defaultTextColor};"
-                f" background-color: {self.__defaultBaseColor}"
-            )
+        styleSheet = (
+            "color: #000000; background-color: #ff6666"
+            if error else
+            f"color: {self.__defaultTextColor};"
+            f" background-color: {self.__defaultBaseColor}"
+        )
         self.findtextCombo.setStyleSheet(styleSheet)
     
     def __findTextFinished(self, result):

--- a/eric7/UI/FindFileWidget.py	Sun Dec 26 18:43:48 2021 +0100
+++ b/eric7/UI/FindFileWidget.py	Sun Dec 26 18:49:26 2021 +0100
@@ -599,8 +599,6 @@
             if self.__cancelSearch:
                 break
             
-#            self.findProgressLabel.setPath(file)
-            
             fn = (
                 os.path.join(self.project.getProjectPath(), file)
                 if self.projectButton.isChecked() else
@@ -790,8 +788,6 @@
                 file = itm.text(0)
                 origHash = itm.data(0, self.md5Role)
                 
-#                self.findProgressLabel.setPath(file)
-                
                 if self.projectButton.isChecked():
                     fn = os.path.join(self.project.getProjectPath(), file)
                 else:

--- a/eric7/UI/FindLocationWidget.py	Sun Dec 26 18:43:48 2021 +0100
+++ b/eric7/UI/FindLocationWidget.py	Sun Dec 26 18:49:26 2021 +0100
@@ -147,10 +147,11 @@
         
         self.findStatusLabel.clear()
         
-        if "*" in fileName or "?" in fileName:
-            patternFormat = "{0}{1}{2}"
-        else:
-            patternFormat = "{0}*{1}{2}"
+        patternFormat = (
+            "{0}{1}{2}"
+            if "*" in fileName or "?" in fileName else
+            "{0}*{1}{2}"
+        )
         
         fileNamePatterns = [patternFormat.format(
             fileName or "*", os.extsep, fileExt or "*")]

--- a/eric7/UI/Previewers/PreviewerQSS.py	Sun Dec 26 18:43:48 2021 +0100
+++ b/eric7/UI/Previewers/PreviewerQSS.py	Sun Dec 26 18:49:26 2021 +0100
@@ -23,6 +23,7 @@
 
 from eric7config import getConfig
 
+
 class PreviewerQSS(QWidget, Ui_PreviewerQSS):
     """
     Class implementing a previewer widget for Qt style sheet files.

--- a/eric7/WebBrowser/SearchWidget.py	Sun Dec 26 18:43:48 2021 +0100
+++ b/eric7/WebBrowser/SearchWidget.py	Sun Dec 26 18:49:26 2021 +0100
@@ -222,11 +222,10 @@
         
         @param error flag indicating an error condition (boolean)
         """
-        if error:
-            styleSheet = "color: #000000; background-color: #ff6666"
-        else:
-            styleSheet = (
-                f"color: {self.__defaultTextColor};"
-                f" background-color: {self.__defaultBaseColor}"
-            )
+        styleSheet = (
+            "color: #000000; background-color: #ff6666"
+            if error else
+            f"color: {self.__defaultTextColor};"
+            f" background-color: {self.__defaultBaseColor}"
+        )
         self.findtextCombo.setStyleSheet(styleSheet)