--- a/AbstractFileBrowser.st	Fri Oct 25 13:33:52 2002 +0200
+++ b/AbstractFileBrowser.st	Fri Oct 25 14:03:21 2002 +0200
@@ -3459,7 +3459,7 @@
 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:[
@@ -3478,8 +3478,18 @@
             ]
         ].
         name2 := files first.
-        title := 'show difference between ', name2 baseName.
-        name1 := FileSelectionBox requestFileName:title default:(name1 baseName) fromDirectory:(name2 asFilename pathName).
+        title := 'show difference between ', name2 baseName, ' and:'.
+        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:[
@@ -3488,16 +3498,17 @@
         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:[
@@ -3526,7 +3537,7 @@
             d := DiffTextView 
                     openOn:text1 label:l1
                     and:text2 label:name2 pathName.
-            d label:'file differences'.
+            d topView label:'file differences'.
         ]
     ]
 !
@@ -4865,5 +4876,5 @@
 !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 $'
 ! !

--- a/FileApplicationNoteBook.st	Fri Oct 25 13:33:52 2002 +0200
+++ b/FileApplicationNoteBook.st	Fri Oct 25 14:03:21 2002 +0200
@@ -3676,7 +3676,7 @@
     text2 := self getContents.
     l2 := 'current version'.
     diffView := DiffTextView openOn:text1 label:l1 and:text2 label:l2.
-    diffView label:'file differences of ', self fileName asString.
+    diffView topView label:'file differences of ', self fileName asString.
 !
 
 reload
@@ -4608,5 +4608,5 @@
 !FileApplicationNoteBook class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileApplicationNoteBook.st,v 1.20 2002-10-25 11:10:33 penk Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileApplicationNoteBook.st,v 1.21 2002-10-25 12:02:49 penk Exp $'
 ! !

--- a/FileBrowserV2.st	Fri Oct 25 13:33:52 2002 +0200
+++ b/FileBrowserV2.st	Fri Oct 25 14:03:21 2002 +0200
@@ -264,37 +264,37 @@
 'Search a File'
 
 #directoryUp
-'Up'
+'Directory Up'
 
 #directoryBack
-'Back'
+'Directory Back'
 
 #copyFile
-'CopyFile'
+'Copy File'
 
 #cutFile
-'CutFile'
+'Cut File'
 
 #fileHome
-'Home'
+'Home Directory'
 
 #pasteFile
 'PasteFile'
 
 #deleteFile
-'DeleteFile'
+'Delete File'
 
 #fileIn
-'FileIn'
+'File In'
 
 #directoryForward
-'Forward'
+'Directory Forward'
 
 #directoryHistory
 'Directory'
 
 #fileHistory
-'History'
+'File History'
 
 #hideToolBar
 'Hide Toolbar'
@@ -680,34 +680,34 @@
         #(
          #(#MenuItem
             #label: 'Spawn'
+            #itemValue: #doSpawn
             #translateLabel: true
-            #value: #doSpawn
           )
          #(#MenuItem
             #label: 'Save Settings'
+            #itemValue: #saveSettingsAspectValues
             #translateLabel: true
-            #value: #saveSettingsAspectValues
           )
          #(#MenuItem
             #label: '-'
           )
          #(#MenuItem
             #label: 'Search Files'
+            #itemValue: #doOpenSearchFile
             #translateLabel: true
-            #value: #doOpenSearchFile
           )
          #(#MenuItem
-            #label: 'Open Terminal'
+            #label: 'Shell Terminal'
+            #itemValue: #doAddTerminal
             #translateLabel: true
-            #value: #doAddTerminal
           )
          #(#MenuItem
             #label: '-'
           )
          #(#MenuItem
             #label: 'Exit'
+            #itemValue: #closeRequest
             #translateLabel: true
-            #value: #closeRequest
           )
          )
         nil
@@ -1513,7 +1513,7 @@
 !FileBrowserV2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2.st,v 1.25 2002-10-24 14:43:42 penk Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2.st,v 1.26 2002-10-25 12:03:21 penk Exp $'
 ! !
 
 FileBrowserV2 initialize!