[squeak-dev] The Trunk: Monticello-mt.759.mcz

commits at source.squeak.org commits at source.squeak.org
Tue Dec 7 10:51:22 UTC 2021


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

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

Name: Monticello-mt.759
Author: mt
Time: 7 December 2021, 11:51:21.548083 am
UUID: 87340429-9d9f-4748-a982-680ca2c21e53
Ancestors: Monticello-mt.758

Do not annoy the user with "modal dialog was interrupted" if they cancel the dialog anyway.

Have I forgotten about a more complex workflow where cancelling a multi-part operation would actually benefit from telling the user about such an interruption?

=============== Diff against Monticello-mt.758 ===============

Item was changed:
  ----- Method: MCChangeSelector>>cancel (in category 'actions') -----
  cancel
+ 
+ 	self wasInterrupted
+ 		ifTrue: [self close]
+ 		ifFalse: [self answer: nil].!
- 	self answer: nil!

Item was changed:
  ----- Method: MCMergeBrowser>>cancel (in category 'actions') -----
  cancel
+ 	
+ 	self wasInterrupted
+ 		ifTrue: [self close]
+ 		ifFalse: [self answer: false].!
- 	self answer: false!

Item was changed:
  ----- Method: MCSaveVersionDialog>>cancel (in category 'actions') -----
  cancel
+ 
+ 	self wasInterrupted
+ 		ifTrue: [self close]
+ 		ifFalse: [self answer: nil].!
- 	self answer: nil!

Item was changed:
  ----- Method: MCTool>>answer: (in category 'morphic ui') -----
  answer: anObject
+ 	self wasInterrupted
+ 		ifTrue: [^ self inform: 'This modal dialog was interrupted\and thus cannot proceed.\\Please close it or cancel the operation.' withCRs translated].
- 	(modalProcess notNil and: [modalProcess ~~ Processor activeProcess])
- 		ifTrue: [^self inform: 'This modal dialog was interrupted, please close it'].
  	modalValue := anObject.
  	self close.!

Item was added:
+ ----- Method: MCTool>>wasInterrupted (in category 'morphic ui') -----
+ wasInterrupted
+ 	^ modalProcess notNil and: [modalProcess ~~ Processor activeProcess]!



More information about the Squeak-dev mailing list