Merged remote changes. 5_0_x

Wed, 11 Aug 2010 18:08:21 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Wed, 11 Aug 2010 18:08:21 +0200
branch
5_0_x
changeset 494
24553e4f9886
parent 493
9b1e1a1212e3 (current diff)
parent 490
13ca483834f7 (diff)
child 497
a529427b15ed

Merged remote changes.

--- a/UI/FindFileDialog.py	Wed Aug 11 18:06:54 2010 +0200
+++ b/UI/FindFileDialog.py	Wed Aug 11 18:08:21 2010 +0200
@@ -265,9 +265,6 @@
             return
         
         self.__cancelSearch = False
-        self.stopButton.setEnabled(True)
-        self.stopButton.setDefault(True)
-        self.findButton.setEnabled(False)
         
         if self.filterCheckBox.isChecked():
             fileFilter = self.filterEdit.text()
@@ -372,6 +369,11 @@
             Preferences.Prefs.settings.setValue("FindFileDialog/DirectoryHistory", 
                                                 self.dirHistory[:30])
         
+        # set the button states
+        self.stopButton.setEnabled(True)
+        self.stopButton.setDefault(True)
+        self.findButton.setEnabled(False)
+        
         # now go through all the files
         self.__populating = True
         self.findList.setUpdatesEnabled(False)

eric ide

mercurial