diff -r 95893a50b384 -r 7664dfcac0e4 FileOperation.st --- a/FileOperation.st Thu Feb 20 17:53:57 2003 +0100 +++ b/FileOperation.st Thu Feb 20 18:04:11 2003 +0100 @@ -205,7 +205,7 @@ !FileOperation::Copy class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.20 2003-02-20 16:52:25 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.21 2003-02-20 17:04:11 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.20 2003-02-20 16:52:25 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.21 2003-02-20 17:04:11 cg Exp $' ! ! !FileOperation::Create methodsFor:'accessing'! @@ -440,7 +440,9 @@ ! createDirectoryIn:startDirectory initialAnswer:initialAnswerArg - |initialAnswer msg startBaseName newName newDir| + |resources initialAnswer msg startBaseName newName newDir| + + resources := AbstractFileBrowser classResources. startBaseName := startDirectory baseName. initialAnswer := initialAnswerArg. @@ -448,10 +450,10 @@ initialAnswer := nil. ]. newName := Dialog - request:('Create new directory in ', startBaseName allBold) + request:(resources string:'Create new directory in %1' with:startBaseName allBold) initialAnswer:initialAnswer - okLabel:'Create' - title:'Create Directory' + okLabel:(resources string:'Create') + title:(resources string:'Create Directory') onCancel:[ self result:false. ^ self @@ -482,7 +484,9 @@ createFileIn:aFile "create an empty file" - |aStream msg file directory newName defaultFile| + |resources aStream msg file directory newName defaultFile| + + resources := AbstractFileBrowser classResources. aFile isDirectory ifTrue:[ directory := aFile @@ -496,10 +500,10 @@ defaultFile := LastCreatedFile baseName. ]. newName := Dialog - request:('Create new file in ', directory baseName) + request:(resources string:'Create new file in %1' with:directory baseName) initialAnswer:defaultFile - okLabel:'Create' - title:'Create a File' + okLabel:(resources string:'Create') + title:(resources string:'Create File') onCancel:[ self result:false. ^ self @@ -550,7 +554,9 @@ createLinkIn:aFile soft:symbolic "create an new soft or hard link in aFile's directory" - |newPath oldPath box string if1 if2 err newPathFile oldPathFile| + |resources newPath oldPath box string if1 if2 err newPathFile oldPathFile| + + resources := AbstractFileBrowser classResources. aFile isDirectory ifTrue:[ newPath := aFile asValue. @@ -562,9 +568,9 @@ box := Dialog new. string := 'Create ', (symbolic ifTrue:['symbolic'] ifFalse:['hard']) ,' link:'. - (box addTextLabel:string) adjust:#left. + (box addTextLabel:(resources string:string)) adjust:#left. if1 := box addFilenameInputFieldOn:newPath in:nil tabable:true. - (box addTextLabel:'to:') adjust:#left. + (box addTextLabel:(resources string:'to:')) adjust:#left. if2 := box addFilenameInputFieldOn:oldPath in:nil value tabable:true. box addAbortAndOkButtons. @@ -654,7 +660,7 @@ !FileOperation::Delete class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.20 2003-02-20 16:52:25 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.21 2003-02-20 17:04:11 cg Exp $' ! ! !FileOperation::Delete methodsFor:'actions'! @@ -690,7 +696,9 @@ deleteFiles:colOfFiles "delete current selected files/directories " - | retVal ask size labels values contents | + |resources retVal ask size labels values contents | + + resources := AbstractFileBrowser classResources. ask := true. size := colOfFiles size. @@ -711,8 +719,8 @@ values := #(#cancel #no #yes #yesToAll). ]. retVal := Dialog - confirmWithCancel:(FileBrowser classResources string:'Really delete %1 ?' with:(filename asString allBold)) - labels:(FileBrowser classResources array:labels) + confirmWithCancel:(resources string:'Really delete %1 ?' with:(filename asString allBold)) + labels:(resources array:labels) values:values default:1. ]. @@ -818,7 +826,7 @@ !FileOperation::Move class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.20 2003-02-20 16:52:25 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.21 2003-02-20 17:04:11 cg Exp $' ! ! !FileOperation::Move methodsFor:'accessing'! @@ -988,7 +996,7 @@ !FileOperation::Rename class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.20 2003-02-20 16:52:25 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.21 2003-02-20 17:04:11 cg Exp $' ! ! !FileOperation::Rename methodsFor:'accessing'! @@ -1043,17 +1051,19 @@ renameFiles:aColOfFiles "rename the selected file(s)" - |queryBox b lastNewName lastOldName initialText oldName| + |resources queryBox b lastNewName lastOldName initialText oldName| + + resources := AbstractFileBrowser classResources. queryBox := FilenameEnterBox new. - queryBox okText:(FileBrowser classResources string:'Rename'). + queryBox okText:(resources string:'Rename'). aColOfFiles size > 1 ifTrue:[ - b := queryBox addAbortButtonLabelled:(FileBrowser classResources string:'Cancel All'). + b := queryBox addAbortButtonLabelled:(resources string:'Cancel All'). b action:[^ self] ]. aColOfFiles do:[:oldFile | oldName := oldFile baseName asString. - queryBox title:(FileBrowser classResources string:'Rename %1 to:' with:(oldName allBold)). + queryBox title:(resources string:'Rename %1 to:' with:(oldName allBold)). lastNewName notNil ifTrue:[ initialText := FileBrowser goodRenameDefaultForFile:oldName lastOld:lastOldName lastNew:lastNewName ]. @@ -1073,5 +1083,5 @@ !FileOperation class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.20 2003-02-20 16:52:25 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.21 2003-02-20 17:04:11 cg Exp $' ! !