hg/stx-libtool: comparison FileBrowser.st

equal deleted inserted replaced

-:bb2070a26bd2
+:f8c010698b75
 dialog addTextLabel:(resources string:'ENCODING_MSG') withCRs.
 dialog addVerticalSpace.
 dialog addListBoxOn:list withNumberOfLines:5.
-dialog addAbortButton; addOkButton.
+dialog addAbortAndOkButtons.
 dialog open.
 dialog accepted ifTrue:[
-	idx := list selectionIndex.
+idx := list selectionIndex.
-	fileEncoding := encodings at:idx.
+fileEncoding := encodings at:idx.
-	subView externalEncoding:fileEncoding.
+subView externalEncoding:fileEncoding.
-	self validateFontEncodingFor:fileEncoding ask:true.
+self validateFontEncodingFor:fileEncoding ask:true.
 ].
 "Modified: 30.6.1997 / 14:41:12 / cg"
 !
 (box addTextLabel:(resources string:'Create hard link from:')) adjust:#left.
 if1 := box addFilenameInputFieldOn:name1 in:here tabable:true.
 (box addTextLabel:(resources string:'to:')) adjust:#left.
 if2 := box addFilenameInputFieldOn:name2 in:here tabable:true.
-box addAbortButton; addOkButton.
+box addAbortAndOkButtons.
 orgName1 size > 0 ifTrue:[
 box focusOnField:if2.
 ].
 box showAtPointer.
 sel := self getSelectedFileName.
 orgName1 := ''.
 (sel size > 0) ifTrue:[
-	orgName1 := sel
+orgName1 := sel
 ].
 name1 := orgName1 asValue.
 name2 := '' asValue.
 (box addTextLabel:'Create symbolic link to:') adjust:#left.
 if1 := box addFilenameInputFieldOn:name1 in:here tabable:true.
 (box addTextLabel:'as:') adjust:#left.
 if2 := box addFilenameInputFieldOn:name2 in:here tabable:true.
-box addAbortButton; addOkButton.
+box addAbortAndOkButtons.
 orgName1 size > 0 ifTrue:[
-	box focusOnField:if2.
+box focusOnField:if2.
 ].
 box showAtPointer.
 box accepted ifTrue:[
-	name1 := name1 value.
+name1 := name1 value.
-	(name1 size == 0) ifTrue:[
+(name1 size == 0) ifTrue:[
-	    err := 'no name entered'.
+err := 'no name entered'.
-	] ifFalse:[
+] ifFalse:[
-	    f1 := name1 asFilename.
+f1 := name1 asFilename.
-	    name2 := name2 value.
+name2 := name2 value.
-	    (name2 size == 0) ifTrue:[
+(name2 size == 0) ifTrue:[
-		err := 'no name entered'.
+err := 'no name entered'.
-	    ] ifFalse:[
+] ifFalse:[
-		f2 := name2 asFilename.
+f2 := name2 asFilename.
-		f2 exists ifTrue:[
+f2 exists ifTrue:[
-		    err := '''%2'' already exists'.
+err := '''%2'' already exists'.
-		] ifFalse:[
+] ifFalse:[
-		    f1 exists ifFalse:[
+f1 exists ifFalse:[
-			err := '''%1'' does not exist (link created anyway)'.
+err := '''%1'' does not exist (link created anyway)'.
-		    ].
+].
-		    ErrorSignal handle:[:ex |
+ErrorSignal handle:[:ex |
-			err := ex errorString
+err := ex errorString
-		    ] do:[
+] do:[
-			OperatingSystem createSymbolicLinkFrom:name1 to:name2
+OperatingSystem createSymbolicLinkFrom:name1 to:name2
-		    ]
+]
-		]
+]
-	    ]
+]
-	].
+].
-	err notNil ifTrue:[
+err notNil ifTrue:[
-	    self warn:(resources string:err with:(name1 ? '') asText allBold with:(name2 ? '') asText allBold).
+self warn:(resources string:err with:(name1 ? '') asText allBold with:(name2 ? '') asText allBold).
-	    ^ self
+^ self
-	].
+].
 ].
 "Modified: / 13.8.1998 / 21:26:59 / cg"
 "Created: / 13.8.1998 / 21:47:14 / cg"
 !
 orgName1 := ''.
 (sel size > 0
 and:[lastFileDiffDirectory notNil
 and:[lastFileDiffDirectory asFilename isDirectory]]) ifTrue:[
-	f := lastFileDiffDirectory asFilename construct:sel.
+f := lastFileDiffDirectory asFilename construct:sel.
-	(f exists
+(f exists
-	and:[f isReadable]) ifTrue:[
+and:[f isReadable]) ifTrue:[
-	    orgName1 := f name
+orgName1 := f name
-	]
+]
 ].
 name1 := orgName1 asValue.
 name2 := self getSelectedFileName asValue.
 here := currentDirectory pathName.
 (box addTextLabel:'show difference between:\\file1 (empty for views contents):' withCRs) adjust:#left.
 box addFilenameInputFieldOn:name1 in:here tabable:true.
 (box addTextLabel:'and file2:') adjust:#left.
 box addFilenameInputFieldOn:name2 in:here tabable:true.
-box addAbortButton; addOkButton.
+box addAbortAndOkButtons.
 box showAtPointer.
 box accepted ifTrue:[
-	name1 := name1 value.
+name1 := name1 value.
-	(name1 isNil or:[name1 isEmpty]) ifTrue:[
+(name1 isNil or:[name1 isEmpty]) ifTrue:[
-	    text1 := subView contents.
+text1 := subView contents.
-	    name1 := nil.
+name1 := nil.
-	    l1 := 'browser contents'
+l1 := 'browser contents'
-	] ifFalse:[
+] ifFalse:[
-	    name1 := currentDirectory filenameFor:name1.
+name1 := currentDirectory filenameFor:name1.
-	    name1 isReadable ifFalse:[
+name1 isReadable ifFalse:[
-		nm := name1.
+nm := name1.
-		name1 exists ifFalse:[
+name1 exists ifFalse:[
-		    err := '%1 does not exist'.
+err := '%1 does not exist'.
-		] ifTrue:[
+] ifTrue:[
-		    err := '%1 is not readable'
+err := '%1 is not readable'
-		].
+].
-	    ].
+].
-	    l1 := name1 pathName
+l1 := name1 pathName
-	].
+].
-	name2 := currentDirectory filenameFor:name2 value.
+name2 := currentDirectory filenameFor:name2 value.
-	err isNil ifTrue:[
+err isNil ifTrue:[
-	    name2 isReadable ifFalse:[
+name2 isReadable ifFalse:[
-		nm := name2.
+nm := name2.
-		name2 exists ifFalse:[
+name2 exists ifFalse:[
-		    err := '%1 does not exist'.
+err := '%1 does not exist'.
-		] ifTrue:[
+] ifTrue:[
-		    err := '%1 is not readable'
+err := '%1 is not readable'
-		].
+].
-	    ].
+].
-	].
+].
-	err notNil ifTrue:[
+err notNil ifTrue:[
-	    self warn:(resources string:err with:nm pathName).
+self warn:(resources string:err with:nm pathName).
-	    ^ self
+^ self
-	].
+].
-	self withWaitCursorDo:[
+self withWaitCursorDo:[
-	    (name1 notNil and:[name1 name ~= orgName1]) ifTrue:[
+(name1 notNil and:[name1 name ~= orgName1]) ifTrue:[
-		lastFileDiffDirectory := name1 directoryName
+lastFileDiffDirectory := name1 directoryName
-	    ].
+].
-	    name1 notNil ifTrue:[
+name1 notNil ifTrue:[
-		text1 := name1 contents.
+text1 := name1 contents.
-	    ].
+].
-	    text2 := name2 contents.
+text2 := name2 contents.
-	    text1 = text2 ifTrue:[
+text1 = text2 ifTrue:[
-		self information:'same contents'
+self information:'same contents'
-	    ] ifFalse:[
+] ifFalse:[
-		d := DiffTextView
+d := DiffTextView
-			openOn:text1 label:l1
+openOn:text1 label:l1
-			and:text2 label:name2 pathName.
+and:text2 label:name2 pathName.
-		d label:'file differences'.
+d label:'file differences'.
-	    ]
+]
-	]
+]
 ].
 "Created: / 7.12.1995 / 20:33:58 / cg"
 "Modified: / 18.9.1997 / 17:31:46 / stefan"
 "Modified: / 25.8.1998 / 21:11:46 / cg"
 ! !
 !FileBrowser class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.293 1999-02-25 18:42:37 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.294 1999-03-06 02:14:22 cg Exp $'
 ! !

changeset 2048	f8c010698b75
parent 2035	307ed5143d8b
child 2050	5ef6404d6172