hg/stx-libtool: comparison AbstractFileBrowser.st

equal deleted inserted replaced

-:47065a1ef813
+:efb0431e606d
 !
 openDiffView
 "open a diff-view"
-| name1 name2 text1 text2 f d err nm l1 files title|
+| name1 name2 text1 text2 f d err nm l1 files title defaultName|
 files := self currentSelectedFiles.
 files isEmpty ifTrue:[
 Dialog warn:'you have to select a file first'.
 ^ self.
 and:[LastFileDiffFile isReadable]) ifTrue:[
 name1 := f.
 ]
 ].
 name2 := files first.
-title := 'show difference between ', name2 baseName.
+title := 'show difference between ', name2 baseName, ' and:'.
-name1 := FileSelectionBox requestFileName:title default:(name1 baseName) fromDirectory:(name2 asFilename pathName).
+defaultName := name1 notNil ifTrue:[name1 baseName] ifFalse:[nil].
+name1 := DialogBox
+requestFileName:title
+default:defaultName
+ok:'OK'
+abort:'Use File List'
+pattern:'*'
+fromDirectory:(name2 asFilename directory).
 ].
 (name1 isNil or:[name1 asString isEmpty]) ifTrue:[
 text1 := self getAllFilesAsStringCollection asStringCollection withTabs.
 text1 := text1 collect:[:l | l isNil ifTrue:[' '] ifFalse:[l]].
 name1 := nil.
 l1 := 'browser contents'
 ] ifFalse:[
+name1 := name1 asFilename.
 LastFileDiffFile := name1.
-name1 isReadable ifFalse:[
+name1 asFilename isReadable ifFalse:[
 nm := name1.
-name1 exists ifFalse:[
+name1 asFilename exists ifFalse:[
 err := '%1 does not exist'.
 ] ifTrue:[
 err := '%1 is not readable'
 ].
 ].
-l1 := name1 pathName
+l1 := name1
 ].
 err isNil ifTrue:[
 name2 isReadable ifFalse:[
 nm := name2.
 self information:'same contents'
 ] ifFalse:[
 d := DiffTextView
 openOn:text1 label:l1
 and:text2 label:name2 pathName.
-d label:'file differences'.
+d topView label:'file differences'.
 ]
 ]
 !
 openEditor
 ! !
 !AbstractFileBrowser class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.31 2002-10-25 09:10:58 penk Exp $'
+^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.32 2002-10-25 12:02:22 penk Exp $'
 ! !

changeset 4060	efb0431e606d
parent 4050	d63d33ad9c41
child 4071	f923c8257818