Mercurial Repositories > eric / file diff

diff -r 0233bbe9a9c4 -r 6c0a430b19df ViewManager/ViewManager.py
--- a/ViewManager/ViewManager.py	Wed Nov 13 23:30:59 2013 +0100
+++ b/ViewManager/ViewManager.py	Sat Nov 16 10:06:28 2013 +0100
@@ -5182,9 +5182,13 @@
         if self.quickFindtextCombo.lastActive:
             self.quickFindtextCombo.lastActive.setFocus()
             aw = self.activeWindow()
-            if aw and self.quickFindtextCombo.lastCursorPos:
-                aw.setCursorPosition(self.quickFindtextCombo.lastCursorPos[0],
-                                     self.quickFindtextCombo.lastCursorPos[1])
+            if aw:
+                aw.hideFindIndicator()
+                if self.quickFindtextCombo.lastCursorPos:
+                    aw.setCursorPosition(
+                        self.quickFindtextCombo.lastCursorPos[0],
+                        self.quickFindtextCombo.lastCursorPos[1])
+                
         if self.__quickSearchToolbarVisibility is not None:
             self.__quickSearchToolbar.setVisible(
                 self.__quickSearchToolbarVisibility)
@@ -5255,6 +5259,8 @@
         if not aw:
             return
         
+        aw.hideFindIndicator()
+        
         text = self.quickFindtextCombo.lineEdit().text()
         if not text and again:
                 text = self.quickFindtextCombo.lastSearchText
@@ -5288,6 +5294,9 @@
         else:
             ok = aw.findFirst(text, False, False, False, True, not back,
                               lineFrom, indexFrom)
+        if ok:
+            sline, sindex, eline, eindex = aw.getSelection()
+            aw.showFindIndicator(sline, sindex, eline, eindex)
         self.__quickSearchSetEditColors(not ok)
     
     def __quickSearchSetEditColors(self, error):
@@ -5733,7 +5742,7 @@
         else:
             self.syntaxErrorGotoAct.setEnabled(False)
             self.syntaxErrorClearAct.setEnabled(False)
-        if editor.hasFlakesWarnings():
+        if editor.hasWarnings():
             self.warningsNextAct.setEnabled(True)
             self.warningsPreviousAct.setEnabled(True)
             self.warningsClearAct.setEnabled(True)
@@ -5747,20 +5756,20 @@
         """
         Private method to handle the next warning action.
         """
-        self.activeWindow().nextFlakesWarning()
+        self.activeWindow().nextWarning()
         
     def __previousWarning(self):
         """
         Private method to handle the previous warning action.
         """
-        self.activeWindow().previousFlakesWarning()
+        self.activeWindow().previousWarning()
         
     def __clearAllWarnings(self):
         """
         Private method to handle the clear all warnings action.
         """
         for editor in self.editors:
-            editor.clearFlakesWarnings()
+            editor.clearWarnings()
         
     def __nextUncovered(self):
         """
@@ -6141,7 +6150,7 @@
                 self.syntaxErrorGotoAct.setEnabled(False)
                 self.syntaxErrorClearAct.setEnabled(False)
             
-            if editor.hasFlakesWarnings():
+            if editor.hasWarnings():
                 self.warningsNextAct.setEnabled(True)
                 self.warningsPreviousAct.setEnabled(True)
                 self.warningsClearAct.setEnabled(True)