diff -r fe99eb7101a7 -r b8083225b852 FileBrowser.st --- a/FileBrowser.st Mon Mar 06 09:44:24 2006 +0100 +++ b/FileBrowser.st Mon Mar 06 09:44:33 2006 +0100 @@ -2759,7 +2759,7 @@ " bring them to front, and turn hidden-mode off " - killButton label:(resources string:'stop'). + killButton label:(resources string:'Stop'). killButton raise; beVisible. " @@ -2885,7 +2885,7 @@ msg := 'Contents has not been saved.\\Modifications will be lost when new file is read.'. label := 'Get'. ]. - (self ask:(resources at:msg) yesButton:label) ifTrue:[ + (self ask:(resources string:msg) yesButton:label) ifTrue:[ subView modified:false. self doFileGet:viaDoubleClick ] @@ -3001,12 +3001,12 @@ |items m sel ns| items := #( - ('spawn' fileSpawn ) + ('Spawn' fileSpawn ) ('-' nil ) ('get contents' fileGet GotoLine) - ('insert contents' fileInsert ) - ('show info' fileGetInfo InspectIt) - ('show full info' fileGetLongInfo CmdI) + ('Insert contents' fileInsert ) + ('Show info' fileGetInfo InspectIt) + ('Show full info' fileGetLongInfo CmdI) ). ((ns := Project current defaultNameSpace) notNil @@ -3022,20 +3022,20 @@ items := items , #( ('-' ) - ('update' updateCurrentDirectory Cmdu) + ('Update' updateCurrentDirectory Cmdu) ('-' ) - ('execute unix command ...' fileExecute DoIt) - ('st/x tools' stxTools ) + ('Execute unix command ...' fileExecute DoIt) + ('ST/X tools' stxTools ) ('-' ) - ('remove' fileRemove Delete) - ('rename ...' fileRename ) + ('Remove' fileRemove Delete) + ('Rename ...' fileRename ) ('-' ) - ('display long list' changeDisplayMode ) - ('show all files' changeDotFileVisibility ) - ('encoding ...' fileEncoding ) + ('Display long list' changeDisplayMode ) + ('Show all files' changeDotFileVisibility ) + ('Encoding ...' fileEncoding ) ('-' ) - ('create directory ...' newDirectory CmdD) - ('create file ...' newFile CmdF) + ('Create directory ...' newDirectory CmdD) + ('Create file ...' newFile CmdF) ). m := PopUpMenu @@ -3043,22 +3043,22 @@ resources:resources. showingHiddenFiles value "showDotFiles" ifTrue:[ - m labelAt:#changeDotFileVisibility put:(resources string:'hide hidden files') + m labelAt:#changeDotFileVisibility put:(resources string:'Hide hidden files') ]. showingDetails value "showLongList" ifTrue:[ - m labelAt:#changeDisplayMode put:(resources string:'display short list') + m labelAt:#changeDisplayMode put:(resources string:'Display short list') ]. items := #( - ('Changes browser' openChangesBrowser ) + ('Changes Browser' openChangesBrowser ) ('Editor' openEditor ) - ('HTML reader' openHTMLReader ) - ('Image inspect' openImageInspector ) - ('show file differences' openDiffView ) + ('HTML Reader' openHTMLReader ) + ('Image Inspect' openImageInspector ) + ('Show File Differences' openDiffView ) ). OperatingSystem isUNIXlike ifTrue:[ - items := items , #( ('terminal' openTerminal )). + items := items , #( ('Terminal' openTerminal )). ]. JavaInterpreter notNil ifTrue:[ @@ -3149,9 +3149,9 @@ |queryBox b lastNewName lastOldName initialText| queryBox := FilenameEnterBox new. - queryBox okText:(resources at:'Rename'). + queryBox okText:(resources string:'Rename'). fileListView selection size > 1 ifTrue:[ - b := queryBox addAbortButtonLabelled:(resources at:'Cancel All'). + b := queryBox addAbortButtonLabelled:(resources string:'Cancel All'). b action:[^ self ]. ]. @@ -3286,7 +3286,7 @@ queryBox := FilenameEnterBox title:(resources stringWithCRs:'Create new directory:') - okText:(resources at:'Create') + okText:(resources string:'Create') action:[:newName | self doCreateDirectory:newName]. queryBox show. queryBox destroy. @@ -3301,7 +3301,7 @@ queryBox := FilenameEnterBox title:(resources stringWithCRs:'Create new file:') - okText:(resources at:'Create') + okText:(resources string:'Create') action:[:newName | newName isEmpty ifFalse:[ self doCreateFile:newName. self selectFile:newName. @@ -4543,7 +4543,7 @@ |sel log| log := Dialog - requestText:(resources string:'enter initial log message') + requestText:(resources string:'Enter initial log message') lines:10 columns:70 initialAnswer:nil. @@ -4740,7 +4740,7 @@ !FileBrowser methodsFor:'misc user interaction'! closeRequest - "exit FileBrowser" + "asks for permission before closing" (self askIfModified:'Contents has not been saved.\\Modifications will be lost when FileBrowser is closed.' yesButton:'Close') @@ -4850,7 +4850,7 @@ self raiseDeiconified. (self - ask:(resources at:'FileBrowser:\\contents has not been saved.\\Save before exiting ?') + ask:(resources string:'FileBrowser:\\contents has not been saved.\\Save before exiting ?') yesButton:'save' noButton:'don''t save') ifTrue:[ @@ -5166,7 +5166,7 @@ queryBox := FilenameEnterBox title:(resources stringWithCRs:'Change directory to:') - okText:(resources at:'Change') + okText:(resources string:'Change') action:[:newName | dirName := newName]. "/ queryBox initialText:''. queryBox show. @@ -5214,8 +5214,8 @@ ^ Dialog confirm:question withCRs - yesLabel:(resources at:yesButtonText) - noLabel:(resources at:noButtonText) + yesLabel:(resources string:yesButtonText) + noLabel:(resources string:noButtonText) "Modified: 21.2.1996 / 01:19:21 / cg" ! @@ -6521,7 +6521,7 @@ (filesModificationTime isNil or:[filesModificationTime <= timeOfFileRead or:[(self - ask:(resources at:'FileBrowser:\\The file has changed somehow in the meanwhile.\(Hint: use the file-difference menu function to see what has changed)\\Do you really want to save ?') + ask:(resources string:'FileBrowser:\\The file has changed somehow in the meanwhile.\(Hint: use the file-difference menu function to see what has changed)\\Do you really want to save ?') yesButton:(resources string:'Save') noButton:(resources string:'Cancel'))]]) ifTrue:[ @@ -6740,7 +6740,7 @@ fileOutput := f fileType. ]. - s := (resources at:'type: '). + s := (resources string:'type: '). fileOutput isNil ifTrue:[ s := s , type asString ] ifFalse:[ @@ -7520,5 +7520,5 @@ !FileBrowser class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.608 2006-01-17 12:16:53 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.609 2006-03-06 08:44:33 cg Exp $' ! !