Update of /cvsroot/pythoncard/PythonCard/tools/findfiles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19963
Modified Files:
findfiles.py findfiles.rsrc.py
Log Message:
added Cancel button, moved wx.SafeYield call and set yieldIfNeeded flag
Index: findfiles.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/tools/findfiles/findfiles.py,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** findfiles.py 1 Oct 2004 00:05:00 -0000 1.82
--- findfiles.py 5 Oct 2004 21:49:06 -0000 1.83
***************
*** 76,80 ****
def sizerLayout(self):
sizer1 = wx.BoxSizer(wx.VERTICAL)
! sizer2 = wx.FlexGridSizer(5, 3, 3, 10)
sizer3 = wx.BoxSizer(wx.HORIZONTAL)
--- 76,80 ----
def sizerLayout(self):
sizer1 = wx.BoxSizer(wx.VERTICAL)
! sizer2 = wx.FlexGridSizer(5, 4, 3, 10)
sizer3 = wx.BoxSizer(wx.HORIZONTAL)
***************
*** 94,109 ****
--- 94,113 ----
sizer2.Add(comp.fldSearchPattern, flag=fldSizerAttrs)
sizer2.Add(comp.btnSearch, flag=fldSizerAttrs)
+ sizer2.Add(comp.btnCancel, flag=fldSizerAttrs)
sizer2.Add(comp.lblDirectories, flag=stcSizerAttrs)
sizer2.Add(comp.fldDirectories, flag=fldSizerAttrs)
sizer2.Add(comp.btnAddDirs, flag=fldSizerAttrs)
+ sizer2.Add((5, 5), 0) # spacer
sizer2.Add(comp.lblFileTypes, flag=stcSizerAttrs)
sizer2.Add(comp.fldWildcard, flag=fldSizerAttrs)
sizer2.Add((5, 5), 0) # spacer
+ sizer2.Add((5, 5), 0) # spacer
sizer2.Add((5, 5), 0) # spacer
sizer2.Add((5, 5), 0) # spacer
sizer2.Add((5, 5), 0) # spacer
+ sizer2.Add((5, 5), 0) # spacer
sizer2.Add((5, 5), 0) # spacer
***************
*** 170,174 ****
def on_close(self, event):
# kill search loop if needed
! self.stopSearching = 1
path = os.path.join(self.configPath, LASTGREPFILE)
self.saveGrepFile(path)
--- 174,178 ----
def on_close(self, event):
# kill search loop if needed
! self.stopSearching = True
path = os.path.join(self.configPath, LASTGREPFILE)
self.saveGrepFile(path)
***************
*** 232,235 ****
--- 236,242 ----
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)
***************
*** 253,257 ****
self.statusBar.text = "Searching..."
found = 0
! self.stopSearching = 0
for dir in self.dirpattern.split(';'):
for filename in util.dirwalk(dir, patterns, self.recurse):
--- 260,264 ----
self.statusBar.text = "Searching..."
found = 0
! self.stopSearching = False
for dir in self.dirpattern.split(';'):
for filename in util.dirwalk(dir, patterns, self.recurse):
***************
*** 261,267 ****
if self.stopSearching:
break
! wx.SafeYield(self)
if self.statusBar.text == "Searching...":
self.statusBar.text = "Files found: 0"
def SearchFile(self, filename):
--- 268,275 ----
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):
***************
*** 312,315 ****
--- 320,328 ----
self.doSearch()
+ 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):
wFldDirectories = self.components.fldDirectories
Index: findfiles.rsrc.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/tools/findfiles/findfiles.rsrc.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** findfiles.rsrc.py 24 Aug 2004 14:19:32 -0000 1.24
--- findfiles.rsrc.py 5 Oct 2004 21:49:07 -0000 1.25
***************
*** 88,91 ****
--- 88,97 ----
},
+ {'type':'Button',
+ 'name':'btnCancel',
+ 'position':(655, 2),
+ 'label':'Cancel',
+ },
+
{'type':'TextField',
'name':'fldDirectories',
|
