*** empty log message ***
authorClaus Gittinger <cg@exept.de>
Fri, 19 Sep 2003 19:08:32 +0200
changeset 5201 979c36ed9a22
parent 5200 65cde33029a4
child 5202 2e7e98a20780
*** empty log message ***
FileApplicationNoteBook.st
--- a/FileApplicationNoteBook.st	Fri Sep 19 19:05:37 2003 +0200
+++ b/FileApplicationNoteBook.st	Fri Sep 19 19:08:32 2003 +0200
@@ -3935,10 +3935,11 @@
     answer isNil ifTrue:[^ AbortOperationRequest raise ].
 
     answer == #showDiffs ifTrue:[
-        d := DiffTextView 
-                openOn:self fileName contentsOfEntireFile label:arg
-                and:editView contents label:'Editor'.
-        d topView label:'File vs. Editor Contents '.
+        self openDiffView.
+"/        d := DiffTextView 
+"/                openOn:self fileName contentsOfEntireFile label:arg
+"/                and:editView contents label:'Editor'.
+"/        d topView label:'File vs. Editor Contents '.
         AbortOperationRequest raise
     ].
 
@@ -4049,11 +4050,11 @@
     |diffView text1 l1 text2 l2|
 
     text1 := editView contents asText.
-    l1 := 'changed version'.
+    l1 := 'Editor'.
     text2 := self getContents.
-    l2 := 'current version'.
+    l2 := 'File: ' , self fileName baseName.
     diffView := DiffTextView openOn:text1 label:l1 and:text2 label:l2.
-    diffView topView label:'file differences of ', self fileName asString.
+    diffView topView label:'File ' , self fileName baseName , ' vs. Editor Contents'.
 !
 
 reload
@@ -4963,5 +4964,5 @@
 !FileApplicationNoteBook class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileApplicationNoteBook.st,v 1.109 2003-09-19 16:28:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileApplicationNoteBook.st,v 1.110 2003-09-19 17:08:32 cg Exp $'
 ! !