*** empty log message ***
authorClaus Gittinger <cg@exept.de>
Sun, 25 Jan 1998 15:10:24 +0100
changeset 1418 c6cce50bf135
parent 1417 9c3590232965
child 1419 89b47621cf99
*** empty log message ***
FBrowser.st
FileBrowser.st
--- a/FBrowser.st	Fri Jan 23 19:12:36 1998 +0100
+++ b/FBrowser.st	Sun Jan 25 15:10:24 1998 +0100
@@ -284,16 +284,16 @@
     <resource: #keyboard (#GotoLine #InspectIt #CmdI #Cmdu #DoIt #Delete #BackSpace #Accept #CmdF #CmdD)>
 
     view == fileListView ifTrue:[
-        (key == #Delete 
-        or:[key == #BackSpace
-        or:[key == #Accept
-        or:[key == #CmdI
-        or:[key == #CmdF
-        or:[key == #CmdD
-        or:[key == #Cmdu
-        or:[key == #InspectIt
-        or:[key == #GotoLine
-        or:[key == #DoIt]]]]]]]]]) ifTrue:[^ true].
+	(key == #Delete 
+	or:[key == #BackSpace
+	or:[key == #Accept
+	or:[key == #CmdI
+	or:[key == #CmdF
+	or:[key == #CmdD
+	or:[key == #Cmdu
+	or:[key == #InspectIt
+	or:[key == #GotoLine
+	or:[key == #DoIt]]]]]]]]]) ifTrue:[^ true].
     ].
     ^ false
 
@@ -308,40 +308,40 @@
     <resource: #keyboard (#GotoLine #InspectIt #CmdI #Cmdu #DoIt #Delete #BackSpace #Accept)>
 
     (key == #Delete or:[key == #BackSpace]) ifTrue:[
-        self fileRemove.
-        ^ self
+	self fileRemove.
+	^ self
     ].
     (key == #Accept) ifTrue:[
-        self fileFileIn.
-        ^ self
+	self fileFileIn.
+	^ self
     ].
     (key == #GotoLine) ifTrue:[
-        self fileGet.
-        ^ self
+	self fileGet.
+	^ self
     ].
     (key == #DoIt) ifTrue:[
-        self fileExecute.
-        ^ self
+	self fileExecute.
+	^ self
     ].
     (key == #InspectIt) ifTrue:[
-        self fileGetInfo.
-        ^ self
+	self fileGetInfo.
+	^ self
     ].
     (key == #CmdI) ifTrue:[
-        self fileGetLongInfo.
-        ^ self
+	self fileGetLongInfo.
+	^ self
     ].
     (key == #Cmdu) ifTrue:[
-        self updateCurrentDirectory.
-        ^ self
+	self updateCurrentDirectory.
+	^ self
     ].
     (key == #CmdF) ifTrue:[
-        self newFile.
-        ^ self
+	self newFile.
+	^ self
     ].
     (key == #CmdD) ifTrue:[
-        self newDirectory.
-        ^ self
+	self newDirectory.
+	^ self
     ].
     fileListView keyPress:key x:x y:y
 
@@ -642,140 +642,140 @@
     |labels shorties selectors m sel ns subLabels subSelectors|
 
     labels := #(
-                 'spawn'                   
-                 '-'                               
-                 'get contents'                    
-                 'insert contents'                    
-                 'show info'             
-                 'show full info'
-               ).
+		 'spawn'                   
+		 '-'                               
+		 'get contents'                    
+		 'insert contents'                    
+		 'show info'             
+		 'show full info'
+	       ).
 
     ((ns := Project current defaultNameSpace) notNil 
     and:[ns ~~ Smalltalk]) ifTrue:[
-        labels := labels copyWith:'fileIn (into ''' , Project current defaultNameSpace name , ''')'
+	labels := labels copyWith:'fileIn (into ''' , Project current defaultNameSpace name , ''')'
     ] ifFalse:[
-        labels := labels copyWith:'fileIn'
+	labels := labels copyWith:'fileIn'
     ].
 
     labels := labels , #(
-                 '-'                               
-                 'update'                 
-                 '-'                               
-                 'execute unix command ...'                
-                 'st/x tools'                
-                 '-'                               
-                 'remove'                 
-                 'rename ...'                 
-                 '-'                               
-                 'display long list'           
-                 'show all files'           
-                 'encoding ...'           
-                 '-'                               
-                 'create directory ...'         
-                 'create file ...'
-               ).             
+		 '-'                               
+		 'update'                 
+		 '-'                               
+		 'execute unix command ...'                
+		 'st/x tools'                
+		 '-'                               
+		 'remove'                 
+		 'rename ...'                 
+		 '-'                               
+		 'display long list'           
+		 'show all files'           
+		 'encoding ...'           
+		 '-'                               
+		 'create directory ...'         
+		 'create file ...'
+	       ).             
 
     selectors := #(
-                 fileSpawn
-                 nil
-                 fileGet
-                 fileInsert
-                 fileGetInfo
-                 fileGetLongInfo
-                 fileFileIn
-                 nil
-                 updateCurrentDirectory
-                 nil
-                 fileExecute
-                 stxTools
-                 nil
-                 fileRemove
-                 fileRename
-                 nil
-                 changeDisplayMode
-                 changeDotFileVisibility
-                 fileEncoding
-                 nil
-                 newDirectory
-                 newFile
-                ).
+		 fileSpawn
+		 nil
+		 fileGet
+		 fileInsert
+		 fileGetInfo
+		 fileGetLongInfo
+		 fileFileIn
+		 nil
+		 updateCurrentDirectory
+		 nil
+		 fileExecute
+		 stxTools
+		 nil
+		 fileRemove
+		 fileRename
+		 nil
+		 changeDisplayMode
+		 changeDotFileVisibility
+		 fileEncoding
+		 nil
+		 newDirectory
+		 newFile
+		).
 
     shorties := #(
-                 nil
-                 nil
-                 GotoLine
-                 nil
-                 InspectIt
-                 CmdI
-                 Accept
-                 nil
-                 Cmdu
-                 nil
-                 DoIt
-                 nil
-                 nil
-                 Delete
-                 nil
-                 nil
-                 nil
-                 nil
-                 nil
-                 nil
-                 CmdD
-                 CmdF
-                ).
+		 nil
+		 nil
+		 GotoLine
+		 nil
+		 InspectIt
+		 CmdI
+		 Accept
+		 nil
+		 Cmdu
+		 nil
+		 DoIt
+		 nil
+		 nil
+		 Delete
+		 nil
+		 nil
+		 nil
+		 nil
+		 nil
+		 nil
+		 CmdD
+		 CmdF
+		).
 
     m := PopUpMenu 
-            labels:(resources array:labels)
-            selectors:selectors
-            accelerators:shorties
-            receiver:self.
+	    labels:(resources array:labels)
+	    selectors:selectors
+	    accelerators:shorties
+	    receiver:self.
 
     showDotFiles ifTrue:[
-        m labelAt:#changeDotFileVisibility put:(resources string:'hide hidden files')
+	m labelAt:#changeDotFileVisibility put:(resources string:'hide hidden files')
     ].
     showLongList ifTrue:[
-        m labelAt:#changeDisplayMode put:(resources string:'display short list')
+	m labelAt:#changeDisplayMode put:(resources string:'display short list')
     ].
 
     subLabels := #(
-                              'Changes browser'
-                              'Editor'
-                              'HTML reader'
-                              'Image inspect'
-                              'show file differences'
-                  ).
+			      'Changes browser'
+			      'Editor'
+			      'HTML reader'
+			      'Image inspect'
+			      'show file differences'
+		  ).
 
     subSelectors := #(
-                              openChangesBrowser
-                              openEditor
-                              openHTMLReader
-                              openImageInspector
-                              openDiffView
-                     ).
+			      openChangesBrowser
+			      openEditor
+			      openHTMLReader
+			      openImageInspector
+			      openDiffView
+		     ).
 
     JavaInterpreter notNil ifTrue:[
-        subLabels := subLabels , #('Java Applet Viewer').
-        subSelectors := subSelectors , #(openAppletViewer).
+	subLabels := subLabels , #('Java Applet Viewer').
+	subSelectors := subSelectors , #(openAppletViewer).
     ].
 
     m subMenuAt:#stxTools 
-            put:(PopUpMenu
-                    labels:(resources array:subLabels)
-                    selectors:subSelectors
-                    receiver:self).
+	    put:(PopUpMenu
+		    labels:(resources array:subLabels)
+		    selectors:subSelectors
+		    receiver:self).
 
     ((sel := fileListView selection) isNil or:[sel isEmpty]) ifTrue:[
-        m disableAll:#(fileGet fileInsert
-                       fileGetInfo fileGetLongInfo
-                       fileFileIn fileFileInLazy
-                       fileRemove fileRename).
-        (m subMenuAt:#stxTools)
-            disableAll:#(openChangesBrowser openEditor openHTMLReader openImageInspector)
+	m disableAll:#(fileGet fileInsert
+		       fileGetInfo fileGetLongInfo
+		       fileFileIn fileFileInLazy
+		       fileRemove fileRename).
+	(m subMenuAt:#stxTools)
+	    disableAll:#(openChangesBrowser openEditor openHTMLReader openImageInspector)
     ] ifFalse:[
-        fileListView selection size > 1 ifTrue:[
-            m disableAll:#( fileGet fileInsert fileGetInfo fileGetLongInfo fileRename )
-        ]
+	fileListView selection size > 1 ifTrue:[
+	    m disableAll:#( fileGet fileInsert fileGetInfo fileGetLongInfo fileRename )
+	]
     ].
 
     ^m
@@ -898,12 +898,12 @@
     |sel queryBox|
 
     queryBox := FilenameEnterBox 
-                    title:(resources at:'create new file:') withCRs
-                    okText:(resources at:'create')
-                    action:[:newName | newName isEmpty ifFalse:[self doCreateFile:newName]].
+		    title:(resources at:'create new file:') withCRs
+		    okText:(resources at:'create')
+		    action:[:newName | newName isEmpty ifFalse:[self doCreateFile:newName]].
     sel := subView selection.
     sel notNil ifTrue:[
-        queryBox initialText:(sel asString)
+	queryBox initialText:(sel asString)
     ].
     queryBox showAtPointer
 
@@ -1142,6 +1142,7 @@
     |fs|
 
     fs := Array 
+	with:labelView
 	with:filterField 
 	with:fileListView 
 	with:subView.
@@ -1633,64 +1634,64 @@
     |labels selectors args menu|
 
     labels := #(
-                   'copy path'
-                   '-'                               
-                   'up'
-                   'back'
-                   'change to home-directory'
-                   'change to default-directory'
-                   'change directory ...'
-               ).             
+		   'copy path'
+		   '-'                               
+		   'up'
+		   'back'
+		   'change to home-directory'
+		   'change to default-directory'
+		   'change directory ...'
+	       ).             
 
     selectors := #(
-                    copyPath
-                    nil
-                    changeToParentDirectory
-                    changeToPreviousDirectory
-                    changeToHomeDirectory
-                    changeToDefaultDirectory
-                    changeCurrentDirectory
-                  ).
+		    copyPath
+		    nil
+		    changeToParentDirectory
+		    changeToPreviousDirectory
+		    changeToHomeDirectory
+		    changeToDefaultDirectory
+		    changeCurrentDirectory
+		  ).
 
     (JavaClassReader notNil and:[JavaClassReader isLoaded]) ifTrue:[
-        labels := labels , #('-' 'add to JavaClassPath' 'add to JavaSourcePath' 'remove from JavaClassPath' 'remove from JavaSourcePath').
-        selectors := selectors , #(nil #addDirToJavaClassPath #addDirToJavaSourcePath #removeDirFromJavaClassPath #removeDirFromJavaSourcePath).
+	labels := labels , #('-' 'add to JavaClassPath' 'add to JavaSourcePath' 'remove from JavaClassPath' 'remove from JavaSourcePath').
+	selectors := selectors , #(nil #addDirToJavaClassPath #addDirToJavaSourcePath #removeDirFromJavaClassPath #removeDirFromJavaSourcePath).
     ].
 
     args := Array new:(labels size).
 
     DirectoryHistory size > 0 ifTrue:[
-        labels := labels copyWith:'-'.
-        selectors := selectors copyWith:nil.
-        args := args copyWith:nil.
-
-        DirectoryHistory do:[:dirName |
-            labels := labels copyWith:dirName.
-            selectors := selectors copyWith:#changeDirectoryTo:.
-            args := args copyWith:dirName
-        ]
+	labels := labels copyWith:'-'.
+	selectors := selectors copyWith:nil.
+	args := args copyWith:nil.
+
+	DirectoryHistory do:[:dirName |
+	    labels := labels copyWith:dirName.
+	    selectors := selectors copyWith:#changeDirectoryTo:.
+	    args := args copyWith:dirName
+	]
     ].
 
     menu := PopUpMenu 
-                labels:(resources array:labels)
-                selectors:selectors
-                args:args
-                receiver:self.
+		labels:(resources array:labels)
+		selectors:selectors
+		args:args
+		receiver:self.
 
     previousDirectory isNil ifTrue:[
-        menu disable:#changeToPreviousDirectory.
+	menu disable:#changeToPreviousDirectory.
     ].
     (JavaClassReader notNil and:[JavaClassReader isLoaded]) ifTrue:[
-        (Java classPath includes:currentDirectory pathName) ifTrue:[
-            menu disable:#addDirToJavaClassPath
-        ] ifFalse:[
-            menu disable:#removeDirFromJavaClassPath
-        ].
-        (Java sourcePath includes:currentDirectory pathName) ifTrue:[
-            menu disable:#addDirToJavaSourcePath
-        ] ifFalse:[
-            menu disable:#removeDirFromJavaSourcePath
-        ].
+	(Java classPath includes:currentDirectory pathName) ifTrue:[
+	    menu disable:#addDirToJavaClassPath
+	] ifFalse:[
+	    menu disable:#removeDirFromJavaClassPath
+	].
+	(Java sourcePath includes:currentDirectory pathName) ifTrue:[
+	    menu disable:#addDirToJavaSourcePath
+	] ifFalse:[
+	    menu disable:#removeDirFromJavaSourcePath
+	].
     ].
     ^menu.
 
@@ -2182,12 +2183,12 @@
 
     (Image isImageFileSuffix:(aFilename asFilename suffix))
     ifTrue:[
-        img := Image fromFile:(currentDirectory construct:aFilename).
-        img notNil ifTrue:[
-            ImageEditor openOnImage:img.
+	img := Image fromFile:(currentDirectory construct:aFilename).
+	img notNil ifTrue:[
+	    ImageEditor openOnImage:img.
 "/            img inspect.
-            ^ true
-        ]
+	    ^ true
+	]
     ].
     ^ false
 
@@ -4014,5 +4015,5 @@
 !FileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Attic/FBrowser.st,v 1.215 1998-01-22 12:36:49 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Attic/FBrowser.st,v 1.216 1998-01-25 14:10:24 cg Exp $'
 ! !
--- a/FileBrowser.st	Fri Jan 23 19:12:36 1998 +0100
+++ b/FileBrowser.st	Sun Jan 25 15:10:24 1998 +0100
@@ -284,16 +284,16 @@
     <resource: #keyboard (#GotoLine #InspectIt #CmdI #Cmdu #DoIt #Delete #BackSpace #Accept #CmdF #CmdD)>
 
     view == fileListView ifTrue:[
-        (key == #Delete 
-        or:[key == #BackSpace
-        or:[key == #Accept
-        or:[key == #CmdI
-        or:[key == #CmdF
-        or:[key == #CmdD
-        or:[key == #Cmdu
-        or:[key == #InspectIt
-        or:[key == #GotoLine
-        or:[key == #DoIt]]]]]]]]]) ifTrue:[^ true].
+	(key == #Delete 
+	or:[key == #BackSpace
+	or:[key == #Accept
+	or:[key == #CmdI
+	or:[key == #CmdF
+	or:[key == #CmdD
+	or:[key == #Cmdu
+	or:[key == #InspectIt
+	or:[key == #GotoLine
+	or:[key == #DoIt]]]]]]]]]) ifTrue:[^ true].
     ].
     ^ false
 
@@ -308,40 +308,40 @@
     <resource: #keyboard (#GotoLine #InspectIt #CmdI #Cmdu #DoIt #Delete #BackSpace #Accept)>
 
     (key == #Delete or:[key == #BackSpace]) ifTrue:[
-        self fileRemove.
-        ^ self
+	self fileRemove.
+	^ self
     ].
     (key == #Accept) ifTrue:[
-        self fileFileIn.
-        ^ self
+	self fileFileIn.
+	^ self
     ].
     (key == #GotoLine) ifTrue:[
-        self fileGet.
-        ^ self
+	self fileGet.
+	^ self
     ].
     (key == #DoIt) ifTrue:[
-        self fileExecute.
-        ^ self
+	self fileExecute.
+	^ self
     ].
     (key == #InspectIt) ifTrue:[
-        self fileGetInfo.
-        ^ self
+	self fileGetInfo.
+	^ self
     ].
     (key == #CmdI) ifTrue:[
-        self fileGetLongInfo.
-        ^ self
+	self fileGetLongInfo.
+	^ self
     ].
     (key == #Cmdu) ifTrue:[
-        self updateCurrentDirectory.
-        ^ self
+	self updateCurrentDirectory.
+	^ self
     ].
     (key == #CmdF) ifTrue:[
-        self newFile.
-        ^ self
+	self newFile.
+	^ self
     ].
     (key == #CmdD) ifTrue:[
-        self newDirectory.
-        ^ self
+	self newDirectory.
+	^ self
     ].
     fileListView keyPress:key x:x y:y
 
@@ -642,140 +642,140 @@
     |labels shorties selectors m sel ns subLabels subSelectors|
 
     labels := #(
-                 'spawn'                   
-                 '-'                               
-                 'get contents'                    
-                 'insert contents'                    
-                 'show info'             
-                 'show full info'
-               ).
+		 'spawn'                   
+		 '-'                               
+		 'get contents'                    
+		 'insert contents'                    
+		 'show info'             
+		 'show full info'
+	       ).
 
     ((ns := Project current defaultNameSpace) notNil 
     and:[ns ~~ Smalltalk]) ifTrue:[
-        labels := labels copyWith:'fileIn (into ''' , Project current defaultNameSpace name , ''')'
+	labels := labels copyWith:'fileIn (into ''' , Project current defaultNameSpace name , ''')'
     ] ifFalse:[
-        labels := labels copyWith:'fileIn'
+	labels := labels copyWith:'fileIn'
     ].
 
     labels := labels , #(
-                 '-'                               
-                 'update'                 
-                 '-'                               
-                 'execute unix command ...'                
-                 'st/x tools'                
-                 '-'                               
-                 'remove'                 
-                 'rename ...'                 
-                 '-'                               
-                 'display long list'           
-                 'show all files'           
-                 'encoding ...'           
-                 '-'                               
-                 'create directory ...'         
-                 'create file ...'
-               ).             
+		 '-'                               
+		 'update'                 
+		 '-'                               
+		 'execute unix command ...'                
+		 'st/x tools'                
+		 '-'                               
+		 'remove'                 
+		 'rename ...'                 
+		 '-'                               
+		 'display long list'           
+		 'show all files'           
+		 'encoding ...'           
+		 '-'                               
+		 'create directory ...'         
+		 'create file ...'
+	       ).             
 
     selectors := #(
-                 fileSpawn
-                 nil
-                 fileGet
-                 fileInsert
-                 fileGetInfo
-                 fileGetLongInfo
-                 fileFileIn
-                 nil
-                 updateCurrentDirectory
-                 nil
-                 fileExecute
-                 stxTools
-                 nil
-                 fileRemove
-                 fileRename
-                 nil
-                 changeDisplayMode
-                 changeDotFileVisibility
-                 fileEncoding
-                 nil
-                 newDirectory
-                 newFile
-                ).
+		 fileSpawn
+		 nil
+		 fileGet
+		 fileInsert
+		 fileGetInfo
+		 fileGetLongInfo
+		 fileFileIn
+		 nil
+		 updateCurrentDirectory
+		 nil
+		 fileExecute
+		 stxTools
+		 nil
+		 fileRemove
+		 fileRename
+		 nil
+		 changeDisplayMode
+		 changeDotFileVisibility
+		 fileEncoding
+		 nil
+		 newDirectory
+		 newFile
+		).
 
     shorties := #(
-                 nil
-                 nil
-                 GotoLine
-                 nil
-                 InspectIt
-                 CmdI
-                 Accept
-                 nil
-                 Cmdu
-                 nil
-                 DoIt
-                 nil
-                 nil
-                 Delete
-                 nil
-                 nil
-                 nil
-                 nil
-                 nil
-                 nil
-                 CmdD
-                 CmdF
-                ).
+		 nil
+		 nil
+		 GotoLine
+		 nil
+		 InspectIt
+		 CmdI
+		 Accept
+		 nil
+		 Cmdu
+		 nil
+		 DoIt
+		 nil
+		 nil
+		 Delete
+		 nil
+		 nil
+		 nil
+		 nil
+		 nil
+		 nil
+		 CmdD
+		 CmdF
+		).
 
     m := PopUpMenu 
-            labels:(resources array:labels)
-            selectors:selectors
-            accelerators:shorties
-            receiver:self.
+	    labels:(resources array:labels)
+	    selectors:selectors
+	    accelerators:shorties
+	    receiver:self.
 
     showDotFiles ifTrue:[
-        m labelAt:#changeDotFileVisibility put:(resources string:'hide hidden files')
+	m labelAt:#changeDotFileVisibility put:(resources string:'hide hidden files')
     ].
     showLongList ifTrue:[
-        m labelAt:#changeDisplayMode put:(resources string:'display short list')
+	m labelAt:#changeDisplayMode put:(resources string:'display short list')
     ].
 
     subLabels := #(
-                              'Changes browser'
-                              'Editor'
-                              'HTML reader'
-                              'Image inspect'
-                              'show file differences'
-                  ).
+			      'Changes browser'
+			      'Editor'
+			      'HTML reader'
+			      'Image inspect'
+			      'show file differences'
+		  ).
 
     subSelectors := #(
-                              openChangesBrowser
-                              openEditor
-                              openHTMLReader
-                              openImageInspector
-                              openDiffView
-                     ).
+			      openChangesBrowser
+			      openEditor
+			      openHTMLReader
+			      openImageInspector
+			      openDiffView
+		     ).
 
     JavaInterpreter notNil ifTrue:[
-        subLabels := subLabels , #('Java Applet Viewer').
-        subSelectors := subSelectors , #(openAppletViewer).
+	subLabels := subLabels , #('Java Applet Viewer').
+	subSelectors := subSelectors , #(openAppletViewer).
     ].
 
     m subMenuAt:#stxTools 
-            put:(PopUpMenu
-                    labels:(resources array:subLabels)
-                    selectors:subSelectors
-                    receiver:self).
+	    put:(PopUpMenu
+		    labels:(resources array:subLabels)
+		    selectors:subSelectors
+		    receiver:self).
 
     ((sel := fileListView selection) isNil or:[sel isEmpty]) ifTrue:[
-        m disableAll:#(fileGet fileInsert
-                       fileGetInfo fileGetLongInfo
-                       fileFileIn fileFileInLazy
-                       fileRemove fileRename).
-        (m subMenuAt:#stxTools)
-            disableAll:#(openChangesBrowser openEditor openHTMLReader openImageInspector)
+	m disableAll:#(fileGet fileInsert
+		       fileGetInfo fileGetLongInfo
+		       fileFileIn fileFileInLazy
+		       fileRemove fileRename).
+	(m subMenuAt:#stxTools)
+	    disableAll:#(openChangesBrowser openEditor openHTMLReader openImageInspector)
     ] ifFalse:[
-        fileListView selection size > 1 ifTrue:[
-            m disableAll:#( fileGet fileInsert fileGetInfo fileGetLongInfo fileRename )
-        ]
+	fileListView selection size > 1 ifTrue:[
+	    m disableAll:#( fileGet fileInsert fileGetInfo fileGetLongInfo fileRename )
+	]
     ].
 
     ^m
@@ -898,12 +898,12 @@
     |sel queryBox|
 
     queryBox := FilenameEnterBox 
-                    title:(resources at:'create new file:') withCRs
-                    okText:(resources at:'create')
-                    action:[:newName | newName isEmpty ifFalse:[self doCreateFile:newName]].
+		    title:(resources at:'create new file:') withCRs
+		    okText:(resources at:'create')
+		    action:[:newName | newName isEmpty ifFalse:[self doCreateFile:newName]].
     sel := subView selection.
     sel notNil ifTrue:[
-        queryBox initialText:(sel asString)
+	queryBox initialText:(sel asString)
     ].
     queryBox showAtPointer
 
@@ -1142,6 +1142,7 @@
     |fs|
 
     fs := Array 
+	with:labelView
 	with:filterField 
 	with:fileListView 
 	with:subView.
@@ -1633,64 +1634,64 @@
     |labels selectors args menu|
 
     labels := #(
-                   'copy path'
-                   '-'                               
-                   'up'
-                   'back'
-                   'change to home-directory'
-                   'change to default-directory'
-                   'change directory ...'
-               ).             
+		   'copy path'
+		   '-'                               
+		   'up'
+		   'back'
+		   'change to home-directory'
+		   'change to default-directory'
+		   'change directory ...'
+	       ).             
 
     selectors := #(
-                    copyPath
-                    nil
-                    changeToParentDirectory
-                    changeToPreviousDirectory
-                    changeToHomeDirectory
-                    changeToDefaultDirectory
-                    changeCurrentDirectory
-                  ).
+		    copyPath
+		    nil
+		    changeToParentDirectory
+		    changeToPreviousDirectory
+		    changeToHomeDirectory
+		    changeToDefaultDirectory
+		    changeCurrentDirectory
+		  ).
 
     (JavaClassReader notNil and:[JavaClassReader isLoaded]) ifTrue:[
-        labels := labels , #('-' 'add to JavaClassPath' 'add to JavaSourcePath' 'remove from JavaClassPath' 'remove from JavaSourcePath').
-        selectors := selectors , #(nil #addDirToJavaClassPath #addDirToJavaSourcePath #removeDirFromJavaClassPath #removeDirFromJavaSourcePath).
+	labels := labels , #('-' 'add to JavaClassPath' 'add to JavaSourcePath' 'remove from JavaClassPath' 'remove from JavaSourcePath').
+	selectors := selectors , #(nil #addDirToJavaClassPath #addDirToJavaSourcePath #removeDirFromJavaClassPath #removeDirFromJavaSourcePath).
     ].
 
     args := Array new:(labels size).
 
     DirectoryHistory size > 0 ifTrue:[
-        labels := labels copyWith:'-'.
-        selectors := selectors copyWith:nil.
-        args := args copyWith:nil.
-
-        DirectoryHistory do:[:dirName |
-            labels := labels copyWith:dirName.
-            selectors := selectors copyWith:#changeDirectoryTo:.
-            args := args copyWith:dirName
-        ]
+	labels := labels copyWith:'-'.
+	selectors := selectors copyWith:nil.
+	args := args copyWith:nil.
+
+	DirectoryHistory do:[:dirName |
+	    labels := labels copyWith:dirName.
+	    selectors := selectors copyWith:#changeDirectoryTo:.
+	    args := args copyWith:dirName
+	]
     ].
 
     menu := PopUpMenu 
-                labels:(resources array:labels)
-                selectors:selectors
-                args:args
-                receiver:self.
+		labels:(resources array:labels)
+		selectors:selectors
+		args:args
+		receiver:self.
 
     previousDirectory isNil ifTrue:[
-        menu disable:#changeToPreviousDirectory.
+	menu disable:#changeToPreviousDirectory.
     ].
     (JavaClassReader notNil and:[JavaClassReader isLoaded]) ifTrue:[
-        (Java classPath includes:currentDirectory pathName) ifTrue:[
-            menu disable:#addDirToJavaClassPath
-        ] ifFalse:[
-            menu disable:#removeDirFromJavaClassPath
-        ].
-        (Java sourcePath includes:currentDirectory pathName) ifTrue:[
-            menu disable:#addDirToJavaSourcePath
-        ] ifFalse:[
-            menu disable:#removeDirFromJavaSourcePath
-        ].
+	(Java classPath includes:currentDirectory pathName) ifTrue:[
+	    menu disable:#addDirToJavaClassPath
+	] ifFalse:[
+	    menu disable:#removeDirFromJavaClassPath
+	].
+	(Java sourcePath includes:currentDirectory pathName) ifTrue:[
+	    menu disable:#addDirToJavaSourcePath
+	] ifFalse:[
+	    menu disable:#removeDirFromJavaSourcePath
+	].
     ].
     ^menu.
 
@@ -2182,12 +2183,12 @@
 
     (Image isImageFileSuffix:(aFilename asFilename suffix))
     ifTrue:[
-        img := Image fromFile:(currentDirectory construct:aFilename).
-        img notNil ifTrue:[
-            ImageEditor openOnImage:img.
+	img := Image fromFile:(currentDirectory construct:aFilename).
+	img notNil ifTrue:[
+	    ImageEditor openOnImage:img.
 "/            img inspect.
-            ^ true
-        ]
+	    ^ true
+	]
     ].
     ^ false
 
@@ -4014,5 +4015,5 @@
 !FileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.215 1998-01-22 12:36:49 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.216 1998-01-25 14:10:24 cg Exp $'
 ! !