Consistent use of 'update' and 'write' in the user interface
w.r.t. change file.
--- a/CBrowser.st Mon Aug 23 19:59:07 1999 +0200
+++ b/CBrowser.st Tue Aug 24 09:49:46 1999 +0200
@@ -540,27 +540,28 @@
|box|
(what == #aboutToExit) ifTrue:[
- "
- smalltalk is about to shut down -
- - if change list was modified, ask user and save if requested.
- "
- anyChanges ifTrue:[
- self raiseDeiconified.
-
- box := YesNoBox new.
- box title:(resources at:'changefile has not been updated from the modified changelist.\\Update before exiting ?') withCRs.
- box okText:(resources at:'update') noText:(resources at:'don''t update').
- box yesAction:[self writeBackChanges]
- noAction:[].
- box showAtPointer.
- box destroy
- ].
- ^ self
+ "
+ smalltalk is about to shut down -
+ - if change list was modified, ask user and save if requested.
+ "
+ anyChanges ifTrue:[
+ self raiseDeiconified.
+
+ box := YesNoBox new.
+ box title:('the modified changelist has not been written back to the change file.\\Write change file before exiting ?') withCRs.
+ box okText:(resources at:'write') noText:(resources at:'don''t write').
+ box yesAction:[self writeBackChanges]
+ noAction:[].
+ box showAtPointer.
+ box destroy
+ ].
+ ^ self
].
super update:what
- "Created: 15.6.1996 / 15:26:30 / cg"
- "Modified: 7.1.1997 / 23:03:47 / cg"
+ "Created: / 15.6.1996 / 15:26:30 / cg"
+ "Modified: / 7.1.1997 / 23:03:47 / cg"
+ "Modified: / 24.8.1999 / 09:45:06 / stefan"
! !
!ChangesBrowser methodsFor:'private'!
@@ -2265,10 +2266,10 @@
again := true.
[again] whileTrue:[
action := OptionBox
- request:(resources at:'changefile has not been updated from the modified changelist.\\Update before closing ?') withCRs
+ request:(resources at:'the modified changelist has not been written back to the change file.\\Write change file before closing ?') withCRs
label:'ChangesBrowser'
form:(WarningBox iconBitmap)
- buttonLabels:(resources array:#('cancel' 'don''t update' 'update'))
+ buttonLabels:(resources array:#('cancel' 'don''t write' 'write'))
values:#(#abort #ignore #save)
default:#save.
@@ -2283,6 +2284,7 @@
"Modified: / 31.7.1997 / 18:29:06 / cg"
"Created: / 3.8.1998 / 19:54:13 / cg"
+ "Modified: / 24.8.1999 / 09:45:04 / stefan"
!
saveAndTerminate
@@ -3138,5 +3140,5 @@
!ChangesBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Attic/CBrowser.st,v 1.171 1999-08-19 01:22:39 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Attic/CBrowser.st,v 1.172 1999-08-24 07:49:46 stefan Exp $'
! !
--- a/ChangesBrowser.st Mon Aug 23 19:59:07 1999 +0200
+++ b/ChangesBrowser.st Tue Aug 24 09:49:46 1999 +0200
@@ -540,27 +540,28 @@
|box|
(what == #aboutToExit) ifTrue:[
- "
- smalltalk is about to shut down -
- - if change list was modified, ask user and save if requested.
- "
- anyChanges ifTrue:[
- self raiseDeiconified.
-
- box := YesNoBox new.
- box title:(resources at:'changefile has not been updated from the modified changelist.\\Update before exiting ?') withCRs.
- box okText:(resources at:'update') noText:(resources at:'don''t update').
- box yesAction:[self writeBackChanges]
- noAction:[].
- box showAtPointer.
- box destroy
- ].
- ^ self
+ "
+ smalltalk is about to shut down -
+ - if change list was modified, ask user and save if requested.
+ "
+ anyChanges ifTrue:[
+ self raiseDeiconified.
+
+ box := YesNoBox new.
+ box title:('the modified changelist has not been written back to the change file.\\Write change file before exiting ?') withCRs.
+ box okText:(resources at:'write') noText:(resources at:'don''t write').
+ box yesAction:[self writeBackChanges]
+ noAction:[].
+ box showAtPointer.
+ box destroy
+ ].
+ ^ self
].
super update:what
- "Created: 15.6.1996 / 15:26:30 / cg"
- "Modified: 7.1.1997 / 23:03:47 / cg"
+ "Created: / 15.6.1996 / 15:26:30 / cg"
+ "Modified: / 7.1.1997 / 23:03:47 / cg"
+ "Modified: / 24.8.1999 / 09:45:06 / stefan"
! !
!ChangesBrowser methodsFor:'private'!
@@ -2265,10 +2266,10 @@
again := true.
[again] whileTrue:[
action := OptionBox
- request:(resources at:'changefile has not been updated from the modified changelist.\\Update before closing ?') withCRs
+ request:(resources at:'the modified changelist has not been written back to the change file.\\Write change file before closing ?') withCRs
label:'ChangesBrowser'
form:(WarningBox iconBitmap)
- buttonLabels:(resources array:#('cancel' 'don''t update' 'update'))
+ buttonLabels:(resources array:#('cancel' 'don''t write' 'write'))
values:#(#abort #ignore #save)
default:#save.
@@ -2283,6 +2284,7 @@
"Modified: / 31.7.1997 / 18:29:06 / cg"
"Created: / 3.8.1998 / 19:54:13 / cg"
+ "Modified: / 24.8.1999 / 09:45:04 / stefan"
!
saveAndTerminate
@@ -3138,5 +3140,5 @@
!ChangesBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.171 1999-08-19 01:22:39 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.172 1999-08-24 07:49:46 stefan Exp $'
! !