[squeak-dev] The Trunk: ST80-mt.184.mcz

commits at source.squeak.org commits at source.squeak.org
Sun May 3 09:30:11 UTC 2015


Marcel Taeumel uploaded a new version of ST80 to project The Trunk:
http://source.squeak.org/trunk/ST80-mt.184.mcz

==================== Summary ====================

Name: ST80-mt.184
Author: mt
Time: 3 May 2015, 11:29:52.063 am
UUID: 435ddd17-290f-9447-a3fd-bbf5b6d7af81
Ancestors: ST80-mt.183

Added some missing stuff due to changes in Morphic land.

=============== Diff against ST80-mt.183 ===============

Item was changed:
  ----- Method: PluggableTextController>>accept (in category 'as yet unclassified') -----
  accept 
  	view hasUnacceptedEdits ifFalse: [^ view flash].
  	view hasEditingConflicts ifTrue:
  		[(self confirm: 
  'Caution!! This method may have been
  changed elsewhere since you started
  editing it here.  Accept anyway?' translated) ifFalse: [^ self flash]].
  
+ 	(view setText: paragraph text from: self) == true ifTrue:
- 	(view setText: paragraph text from: self) ifTrue:
  		[initialText := paragraph text copy.
  		view ifNotNil: [view hasUnacceptedEdits: false]]    .
  !

Item was changed:
  ----- Method: PluggableTextView>>update: (in category 'updating') -----
  update: aSymbol
  	"Refer to the comment in View|update:. Do nothing if the given symbol does not match any action. "
  
  	aSymbol == #wantToChange ifTrue:
  			[self canDiscardEdits ifFalse: [self promptForCancel].  ^ self].
  	aSymbol == #flash ifTrue: [^ controller flash].
  	aSymbol == getTextSelector ifTrue: [^ self updateDisplayContents].
  	aSymbol == getSelectionSelector ifTrue: [^ self setSelection: self getSelection].
  	aSymbol == #clearUserEdits ifTrue: [^ self hasUnacceptedEdits: false].
  	(aSymbol == #autoSelect and: [getSelectionSelector ~~ nil]) ifTrue:
  			[ParagraphEditor abandonChangeText.	"no replacement!!"
  			^ controller setSearch: model autoSelectString;
  					againOrSame: true].
  	aSymbol == #appendEntry ifTrue:
  			[^ controller doOccluded: [controller appendEntry]].
  	aSymbol == #clearText ifTrue:
  			[^ controller doOccluded:
  				[controller changeText: Text new]].
  	aSymbol == #bs ifTrue:
  			[^ controller doOccluded:
  				[controller bsText]].
  	aSymbol == #codeChangedElsewhere ifTrue:
  			[^ self hasEditingConflicts: true].
  	aSymbol == #saveContents ifTrue:
  			[^self controller saveContentsInFile].
  	aSymbol == #close ifTrue:
+ 			[^self topView controller closeAndUnscheduleNoTerminate].
+ 	aSymbol == #acceptChanges ifTrue:
+ 			[^ self controller accept].
+ 	aSymbol == #revertChanges ifTrue:
+ 			[^ self controller cancel].!
- 			[^self topView controller closeAndUnscheduleNoTerminate]
- 
- !

Item was added:
+ ----- Method: View>>balloonText: (in category 'morphic compatibility') -----
+ balloonText: aString
+ 	"Unfortunately we just ignore this help text because we are not morphic"
+ !

Item was changed:
  ----- Method: View>>setBalloonText: (in category 'morphic compatibility') -----
  setBalloonText: aString
- 	"Unfortunately we just ignore this help text because we are not morphic"
  
  	self flag: #deprecated. "mt: Use #balloonText: or just remove."!



More information about the Squeak-dev mailing list