--- a/FileOperation.st Tue Mar 30 20:47:54 2004 +0200
+++ b/FileOperation.st Tue Mar 30 20:48:27 2004 +0200
@@ -202,7 +202,7 @@
!FileOperation::Copy class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.46 2004-03-22 22:01:08 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.47 2004-03-30 18:48:27 cg Exp $'
! !
!FileOperation::Copy methodsFor:'accessing'!
@@ -409,7 +409,7 @@
!FileOperation::Create class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.46 2004-03-22 22:01:08 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.47 2004-03-30 18:48:27 cg Exp $'
! !
!FileOperation::Create methodsFor:'accessing'!
@@ -682,7 +682,7 @@
!FileOperation::Delete class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.46 2004-03-22 22:01:08 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.47 2004-03-30 18:48:27 cg Exp $'
! !
!FileOperation::Delete methodsFor:'actions'!
@@ -724,7 +724,7 @@
deleteFiles:colOfFiles confirm:confirm
"delete current selected files/directories
"
- |resources answer nFilesToDelete ask labels values fileTypeString|
+ |resources answer nFilesToDelete ask labels values fileTypeString msg lbls vals|
ask := confirm.
resources := AbstractFileBrowser classResources.
@@ -760,12 +760,15 @@
labels := #('Cancel' 'No' 'Yes' 'Yes to All' ).
values := #(#cancel #no #yes #yesToAll).
].
+ msg := nFilesToDelete = 1
+ ifTrue:'Really delete\\%1%2 ?'
+ ifFalse:'Really delete\\%1%2 \\(%3 files alltogether)'.
answer := Dialog
confirmWithCancel:(resources
- stringWithCRs:'Really delete\\ %1%2%3 ?'
+ stringWithCRs:msg
with:fileTypeString
with:(filename asString allBold)
- with:(nFilesToDelete = 1 ifTrue:'' ifFalse:['\\(' , nFilesToDelete printString , ' files alltogether)']) withCRs )
+ with:nFilesToDelete)
labels:(resources array:labels)
values:values
default:(values indexOf:#yes).
@@ -786,12 +789,20 @@
askForNonEmptyDirectory := true.
filename isSymbolicLink ifFalse:[
filename isNonEmptyDirectory ifTrue:[
+ colOfFiles size == 1 ifTrue:[
+ lbls := #('Cancel' 'Remove').
+ vals := #(false true).
+ ] ifFalse:[
+ lbls := #('Cancel All' 'Keep' 'Remove').
+ vals := #(nil false true).
+ ].
askForNonEmptyDirectory := Dialog
- confirmWithCancel:(('Directory ''%1'' is not empty', Character cr asString, 'remove anyway ?')
- bindWith:filename pathName allBold)
- labels:( #('Cancel' 'Keep' 'Remove') )
- values:#(nil false true)
- default:3.
+ confirmWithCancel:(resources
+ stringWithCRs:'Directory ''%1'' is not empty\remove anyway ?'
+ with:filename pathName allBold)
+ labels:( resources array:lbls )
+ values:vals
+ default:vals size.
askForNonEmptyDirectory == nil ifTrue:[
^ self
].
@@ -876,7 +887,7 @@
!FileOperation::Move class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.46 2004-03-22 22:01:08 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.47 2004-03-30 18:48:27 cg Exp $'
! !
!FileOperation::Move methodsFor:'accessing'!
@@ -1047,7 +1058,7 @@
!FileOperation::Rename class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.46 2004-03-22 22:01:08 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.47 2004-03-30 18:48:27 cg Exp $'
! !
!FileOperation::Rename methodsFor:'accessing'!
@@ -1153,5 +1164,5 @@
!FileOperation class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.46 2004-03-22 22:01:08 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.47 2004-03-30 18:48:27 cg Exp $'
! !