[Pythoncard-cvs] PythonCard/tools/findfiles findfiles.py,1.83,1.84

[Kevin A. <ka...@us...>]

Update of /cvsroot/pythoncard/PythonCard/tools/findfiles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6966/tools/findfiles

Modified Files:
	findfiles.py 
Log Message:
refactored Search/Cancel toggle, added filename display to search


Index: findfiles.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/tools/findfiles/findfiles.py,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** findfiles.py	5 Oct 2004 21:49:06 -0000	1.83
--- findfiles.py	5 Oct 2004 23:03:11 -0000	1.84
***************
*** 235,242 ****
              pass
  
!     def doSearch(self):
!         self.components.btnSearch.enabled = False
!         self.components.btnCancel.enabled = True
  
          log.info("Grep for %s in %s" % (self.greppattern, self.filpattern))
          log.info('#Search '+self.dirpattern)
--- 235,245 ----
              pass
  
!     def toggleSearchCancel(self, state):
!         self.components.btnSearch.enabled = state
!         self.components.btnCancel.enabled = not state
  
+     def doSearch(self):
+         self.toggleSearchCancel(False)
+         
          log.info("Grep for %s in %s" % (self.greppattern, self.filpattern))
          log.info('#Search '+self.dirpattern)
***************
*** 265,275 ****
                  if self.SearchFile(filename):
                      found += 1
!                     self.statusBar.text = "Files found: %d" % found
!                     if self.stopSearching:
!                         break
!                 wx.SafeYield(self, True)
!         if self.statusBar.text == "Searching...":
!             self.statusBar.text = "Files found: 0"
!         self.components.btnSearch.enabled = True
  
      def SearchFile(self, filename):
--- 268,278 ----
                  if self.SearchFile(filename):
                      found += 1
!                 if self.stopSearching:
!                     break
!                 else:
!                     self.statusBar.text = "Files found: %d     Searching: %s" % (found, filename)
!                     wx.SafeYield(self, True)
!         self.statusBar.text = "Files found: %d" % found
!         self.toggleSearchCancel(True)
  
      def SearchFile(self, filename):
***************
*** 322,327 ****
      def on_btnCancel_mouseClick(self, event):
          self.stopSearching = True
!         self.components.btnCancel.enabled = False
!         self.components.btnSearch.enabled = True
  
      def on_btnAddDirs_mouseClick(self, event):
--- 325,329 ----
      def on_btnCancel_mouseClick(self, event):
          self.stopSearching = True
!         self.toggleSearchCancel(True)
  
      def on_btnAddDirs_mouseClick(self, event):