--- a/AbstractFileFinderApplicationComponent.st Sat Feb 07 14:40:16 2015 +0100
+++ b/AbstractFileFinderApplicationComponent.st Sat Feb 07 15:21:50 2015 +0100
@@ -17,7 +17,7 @@
instanceVariableNames:'findFileView searchResultTable resultList enableStop enableSearch
stopSignal accessLock searchTask expanded searchRecursively
selectionHolder hasListEntries targetApplication matchedFilesList
- shownListHolder autoSelectInBrowserHolder'
+ shownListHolder autoSelectInBrowserHolder filesSearchedCount'
classVariableNames:''
poolDictionaries:''
category:'Interface-Tools-File'
@@ -128,7 +128,7 @@
searchTask := thisSearchTask :=
[
- |message t|
+ |message time|
[
(self stopSignal) catch:[
@@ -136,17 +136,23 @@
self resultList removeAll.
self matchedFilesList removeAll.
self notify:'Searching...'.
+ filesSearchedCount := 0.
-"/ self changeInformationTo:'Find File ' , '- searching ' toTab:true.
- t := Time millisecondsToRun:[
+ "/ self changeInformationTo:'Find File ' , '- searching ' toTab:true.
+ time := Time millisecondsToRun:[
aBlock value.
].
- t > 100 ifTrue:[
- t := ((t / 1000) asFixedPoint:2) printString , ' s'
+ time > 100 ifTrue:[
+ time := ((time / 1000) asFixedPoint:2) printString , ' s'
] ifFalse:[
- t := t printString , ' ms'
+ time := time printString , ' ms'
].
- message := 'Found %1 file%2 in %3.' bindWith:(resultList size) with:(resultList size == 1 ifTrue:'' ifFalse:'s') with:t.
+ message := resources
+ string:'Found %1 file%2 in %3 (%4 files visited).'
+ with:(resultList size)
+ with:(resultList size == 1 ifTrue:'' ifFalse:'s')
+ with:time
+ with:filesSearchedCount.
self enableStop value:false.
self enableSearch value:true.
self changeInformationTo:'Find File ' , '- done.' toTab:true.
@@ -479,10 +485,10 @@
!AbstractFileFinderApplicationComponent class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractFileFinderApplicationComponent.st,v 1.12 2015-02-07 13:27:25 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractFileFinderApplicationComponent.st,v 1.13 2015-02-07 14:21:50 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/AbstractFileFinderApplicationComponent.st,v 1.12 2015-02-07 13:27:25 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractFileFinderApplicationComponent.st,v 1.13 2015-02-07 14:21:50 cg Exp $'
! !