--- a/FBrowser.st Sat Mar 06 02:59:44 1999 +0100
+++ b/FBrowser.st Sat Mar 06 03:15:15 1999 +0100
@@ -1492,15 +1492,15 @@
dialog addVerticalSpace.
dialog addListBoxOn:list withNumberOfLines:5.
- dialog addAbortButton; addOkButton.
+ dialog addAbortAndOkButtons.
dialog open.
dialog accepted ifTrue:[
- idx := list selectionIndex.
- fileEncoding := encodings at:idx.
- subView externalEncoding:fileEncoding.
-
- self validateFontEncodingFor:fileEncoding ask:true.
+ idx := list selectionIndex.
+ fileEncoding := encodings at:idx.
+ subView externalEncoding:fileEncoding.
+
+ self validateFontEncodingFor:fileEncoding ask:true.
].
"Modified: 30.6.1997 / 14:41:12 / cg"
@@ -2456,7 +2456,7 @@
(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.
@@ -2512,7 +2512,7 @@
orgName1 := ''.
(sel size > 0) ifTrue:[
- orgName1 := sel
+ orgName1 := sel
].
name1 := orgName1 asValue.
@@ -2524,43 +2524,43 @@
(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 size == 0) ifTrue:[
- err := 'no name entered'.
- ] ifFalse:[
- f1 := name1 asFilename.
- name2 := name2 value.
- (name2 size == 0) ifTrue:[
- err := 'no name entered'.
- ] ifFalse:[
- f2 := name2 asFilename.
- f2 exists ifTrue:[
- err := '''%2'' already exists'.
- ] ifFalse:[
- f1 exists ifFalse:[
- err := '''%1'' does not exist (link created anyway)'.
- ].
- ErrorSignal handle:[:ex |
- err := ex errorString
- ] do:[
- OperatingSystem createSymbolicLinkFrom:name1 to:name2
- ]
- ]
- ]
- ].
-
- err notNil ifTrue:[
- self warn:(resources string:err with:(name1 ? '') asText allBold with:(name2 ? '') asText allBold).
- ^ self
- ].
+ name1 := name1 value.
+ (name1 size == 0) ifTrue:[
+ err := 'no name entered'.
+ ] ifFalse:[
+ f1 := name1 asFilename.
+ name2 := name2 value.
+ (name2 size == 0) ifTrue:[
+ err := 'no name entered'.
+ ] ifFalse:[
+ f2 := name2 asFilename.
+ f2 exists ifTrue:[
+ err := '''%2'' already exists'.
+ ] ifFalse:[
+ f1 exists ifFalse:[
+ err := '''%1'' does not exist (link created anyway)'.
+ ].
+ ErrorSignal handle:[:ex |
+ err := ex errorString
+ ] do:[
+ OperatingSystem createSymbolicLinkFrom:name1 to:name2
+ ]
+ ]
+ ]
+ ].
+
+ err notNil ifTrue:[
+ self warn:(resources string:err with:(name1 ? '') asText allBold with:(name2 ? '') asText allBold).
+ ^ self
+ ].
].
"Modified: / 13.8.1998 / 21:26:59 / cg"
@@ -2616,11 +2616,11 @@
(sel size > 0
and:[lastFileDiffDirectory notNil
and:[lastFileDiffDirectory asFilename isDirectory]]) ifTrue:[
- f := lastFileDiffDirectory asFilename construct:sel.
- (f exists
- and:[f isReadable]) ifTrue:[
- orgName1 := f name
- ]
+ f := lastFileDiffDirectory asFilename construct:sel.
+ (f exists
+ and:[f isReadable]) ifTrue:[
+ orgName1 := f name
+ ]
].
name1 := orgName1 asValue.
@@ -2633,62 +2633,62 @@
(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 isNil or:[name1 isEmpty]) ifTrue:[
- text1 := subView contents.
- name1 := nil.
- l1 := 'browser contents'
- ] ifFalse:[
- name1 := currentDirectory filenameFor:name1.
- name1 isReadable ifFalse:[
- nm := name1.
- name1 exists ifFalse:[
- err := '%1 does not exist'.
- ] ifTrue:[
- err := '%1 is not readable'
- ].
- ].
- l1 := name1 pathName
- ].
-
- name2 := currentDirectory filenameFor:name2 value.
- err isNil ifTrue:[
- name2 isReadable ifFalse:[
- nm := name2.
- name2 exists ifFalse:[
- err := '%1 does not exist'.
- ] ifTrue:[
- err := '%1 is not readable'
- ].
- ].
- ].
- err notNil ifTrue:[
- self warn:(resources string:err with:nm pathName).
- ^ self
- ].
-
- self withWaitCursorDo:[
- (name1 notNil and:[name1 name ~= orgName1]) ifTrue:[
- lastFileDiffDirectory := name1 directoryName
- ].
- name1 notNil ifTrue:[
- text1 := name1 contents.
- ].
- text2 := name2 contents.
- text1 = text2 ifTrue:[
- self information:'same contents'
- ] ifFalse:[
- d := DiffTextView
- openOn:text1 label:l1
- and:text2 label:name2 pathName.
- d label:'file differences'.
- ]
- ]
+ name1 := name1 value.
+ (name1 isNil or:[name1 isEmpty]) ifTrue:[
+ text1 := subView contents.
+ name1 := nil.
+ l1 := 'browser contents'
+ ] ifFalse:[
+ name1 := currentDirectory filenameFor:name1.
+ name1 isReadable ifFalse:[
+ nm := name1.
+ name1 exists ifFalse:[
+ err := '%1 does not exist'.
+ ] ifTrue:[
+ err := '%1 is not readable'
+ ].
+ ].
+ l1 := name1 pathName
+ ].
+
+ name2 := currentDirectory filenameFor:name2 value.
+ err isNil ifTrue:[
+ name2 isReadable ifFalse:[
+ nm := name2.
+ name2 exists ifFalse:[
+ err := '%1 does not exist'.
+ ] ifTrue:[
+ err := '%1 is not readable'
+ ].
+ ].
+ ].
+ err notNil ifTrue:[
+ self warn:(resources string:err with:nm pathName).
+ ^ self
+ ].
+
+ self withWaitCursorDo:[
+ (name1 notNil and:[name1 name ~= orgName1]) ifTrue:[
+ lastFileDiffDirectory := name1 directoryName
+ ].
+ name1 notNil ifTrue:[
+ text1 := name1 contents.
+ ].
+ text2 := name2 contents.
+ text1 = text2 ifTrue:[
+ self information:'same contents'
+ ] ifFalse:[
+ d := DiffTextView
+ openOn:text1 label:l1
+ and:text2 label:name2 pathName.
+ d label:'file differences'.
+ ]
+ ]
].
"Created: / 7.12.1995 / 20:33:58 / cg"
@@ -6325,5 +6325,5 @@
!FileBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Attic/FBrowser.st,v 1.293 1999-02-25 18:42:37 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Attic/FBrowser.st,v 1.294 1999-03-06 02:14:22 cg Exp $'
! !