FileBrowser.st
changeset 3419 30bd78e28038
parent 3417 1fee40dd5af4
child 3420 a6e8d840f4bc
--- a/FileBrowser.st	Thu Nov 15 23:09:09 2001 +0100
+++ b/FileBrowser.st	Fri Nov 16 00:02:28 2001 +0100
@@ -6104,7 +6104,7 @@
 doRemove:filesToRemove
     "remove the selected file(s) - no questions asked"
 
-    |msg needUpdate toRemove updateRunning yesToAll mTime|
+    |msg needUpdate toRemove updateRunning yesToAll mTime x|
 
     self withWaitCursorDo:[
         updateRunning := listUpdateProcess notNil.
@@ -6115,7 +6115,9 @@
         "/ did the directory change in the meanwhile ?
         "/
         mTime := currentDirectory modificationTime.
+"/ x := timeOfLastCheck.
         needUpdate := mTime notNil and:[mTime > timeOfLastCheck].
+"/        needUpdate := mTime notNil and:[mTime > x].
 
         yesToAll := false.
         lockUpdate := true.
@@ -6126,7 +6128,7 @@
                 f := currentDirectory construct:fileName.
                 OperatingSystem accessDeniedErrorSignal handle:[:ex|
                     "was not able to remove it"
-                    msg := (resources string:'cannot remove ''%1'' !!' with:fileName).
+                    msg := (resources string:'Cannot remove ''%1'' !!' with:fileName).
                     self showAlert:msg with:(OperatingSystem lastErrorString)
                 ] do:[
                     |answer contents i|
@@ -6139,14 +6141,14 @@
                             yesToAll ifFalse:[
                                 idx == filesToRemove size ifTrue:[
                                     answer := Dialog
-                                                confirmWithCancel:(resources string:'directory ''%1'' is not empty\remove anyway ?' with:fileName allBold) withCRs
-                                                labels:(resources array:#('cancel' 'remove'))
+                                                confirmWithCancel:(resources string:'Directory ''%1'' is not empty\remove anyway ?' with:fileName allBold) withCRs
+                                                labels:(resources array:#('Cancel' 'Remove'))
                                                 values:#(false true) 
                                                 default:2.
                                 ] ifFalse:[
                                     answer := Dialog
-                                                confirmWithCancel:(resources string:'directory ''%1'' is not empty\remove anyway ?' with:fileName allBold) withCRs
-                                                labels:(resources array:#('cancel' 'remove all' 'remove'))
+                                                confirmWithCancel:(resources string:'Directory ''%1'' is not empty\remove anyway ?' with:fileName allBold) withCRs
+                                                labels:(resources array:#('Cancel' 'Remove all' 'Remove'))
                                                 values:#(false #removeAll true) 
                                                 default:3.
                                 ].
@@ -6198,7 +6200,7 @@
     ]
 
     "Modified: / 20.11.1997 / 17:39:14 / stefan"
-    "Modified: / 26.4.1999 / 23:03:12 / cg"
+    "Modified: / 15.11.2001 / 23:59:03 / cg"
 !
 
 doRename:oldName to:newName
@@ -6951,9 +6953,9 @@
      ST/X users love this behavior ;-)
     "
 
+    |files matchPattern list passDone f ignoreCase oldSelection newSelection|
+
     self withReadCursorDo:[
-        |files matchPattern list passDone f ignoreCase oldSelection newSelection|
-
         self stopUpdateProcess.
 
         timeOfLastCheck := currentDirectory modificationTime.
@@ -7390,7 +7392,7 @@
     "Modified: / 21.9.1995 / 11:40:23 / claus"
     "Modified: / 28.4.1997 / 22:30:30 / dq"
     "Modified: / 18.9.1997 / 18:28:30 / stefan"
-    "Modified: / 16.12.1999 / 01:25:23 / cg"
+    "Modified: / 15.11.2001 / 23:49:03 / cg"
 ! !
 
 !FileBrowser methodsFor:'queries'!
@@ -7434,5 +7436,5 @@
 !FileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.437 2001-11-15 21:05:35 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.438 2001-11-15 23:02:28 cg Exp $'
 ! !