Mercurial Repositories > eric / changeset

--- a/ViewManager/ViewManager.py	Wed Jun 29 19:01:43 2011 +0200
+++ b/ViewManager/ViewManager.py	Thu Jun 30 08:07:32 2011 +0200
@@ -3935,6 +3935,7 @@
                 self.quickFindtextCombo.lineEdit().setText(tff)
             self.quickFindtextCombo.lineEdit().setFocus()
             self.quickFindtextCombo.lineEdit().selectAll()
+            self.__quickSearchSetEditColors(False)
         else:
             self.__quickSearchInEditor(True, False)
         
@@ -3998,6 +3999,7 @@
                 self.quickFindtextCombo.lineEdit().setText(tff)
             self.quickFindtextCombo.lineEdit().setFocus()
             self.quickFindtextCombo.lineEdit().selectAll()
+            self.__quickSearchSetEditColors(False)
         else:
             self.__quickSearchInEditor(True, True)
         
@@ -4038,7 +4040,8 @@
         
         text = self.quickFindtextCombo.lineEdit().text()
         if not text:
-            text = self.quickFindtextCombo.lastSearchText
+            if again:
+                text = self.quickFindtextCombo.lastSearchText
         if not text:
             if Preferences.getEditor("QuickSearchMarkersEnabled"):
                 aw.clearSearchIndicators()
@@ -4068,7 +4071,15 @@
         else:
             ok = aw.findFirst(text, False, False, False, True, not back,
                               lineFrom, indexFrom)
-        if not ok:
+        self.__quickSearchSetEditColors(not ok)
+    
+    def __quickSearchSetEditColors(self, error):
+        """
+        Private method to set the quick search edit colors.
+        
+        @param error flag indicating an error (boolean)
+        """
+        if error:
             palette = self.quickFindtextCombo.lineEdit().palette()
             palette.setColor(QPalette.Base, QColor("red"))
             palette.setColor(QPalette.Text, QColor("white"))
@@ -4080,7 +4091,7 @@
             palette.setColor(QPalette.Text,
                              self.quickFindtextCombo.palette().color(QPalette.Text))
             self.quickFindtextCombo.lineEdit().setPalette(palette)
-        
+    
     def __quickSearchExtend(self):
         """
         Private method to handle the quicksearch extend action.