[squeak-dev] The Trunk: EToys-cmm.111.mcz

commits at source.squeak.org commits at source.squeak.org
Mon Nov 11 21:57:31 UTC 2013


Chris Muller uploaded a new version of EToys to project The Trunk:
http://source.squeak.org/trunk/EToys-cmm.111.mcz

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

Name: EToys-cmm.111
Author: cmm
Time: 11 November 2013, 3:56:49.138 pm
UUID: 658d3896-c8c2-40b8-acdd-9717d124075f
Ancestors: EToys-dtl.110

- One less conflict with Connectors.

=============== Diff against EToys-dtl.110 ===============

Item was changed:
  ----- Method: ObjectPropertiesMorph>>rebuild (in category 'connectors-visual properties') -----
  rebuild
  	| buttons |
  	
  	self removeAllMorphs.
  	self addARow: {
  		self lockedString: ('Properties for {1}' translated format: {myTarget name}).
  	}.
  	self addARow: {
  		self inAColumn: {
  			self paneForCornerRoundingToggle.
  			self paneForStickinessToggle.
  			self paneForLockedToggle.
  		}.
  	}.
  
  	self addARow: {
  		self paneForMainColorPicker.
  		self paneFor2ndGradientColorPicker.
  	}.
  	self addARow: {
  		self paneForBorderColorPicker.
  		self paneForShadowColorPicker.
  	}.
  
  	buttons := OrderedCollection new.
  	buttons addAll: {
  	self 
  			buttonNamed: 'Accept' translated action: #doAccept color: color lighter 
  			help: 'keep changes made and close panel' translated.
  		self 
  			buttonNamed: 'Cancel' translated action: #doCancel color: color lighter 
  			help: 'cancel changes made and close panel' translated.
  	}.
+ 	"Support possible presence of Connectors package."
+ 	(self respondsTo: #addOptionalButtonsTo:) ifTrue: [ self addOptionalButtonsTo: buttons. ].
  	
- 	
  	self addARow: buttons.
  
  	thingsToRevert := Dictionary new.
  	"thingsToRevert at: #fillStyle: put: myTarget fillStyle."
  	myTarget isSystemWindow ifTrue: [
  		thingsToRevert at: #setWindowColor: put: myTarget paneColorToUse
  	].
  	thingsToRevert at: #hasDropShadow: put: myTarget hasDropShadow.
  	thingsToRevert at: #shadowColor: put: myTarget shadowColor.
  	(myTarget respondsTo: #borderColor:) ifTrue: [
  		thingsToRevert at: #borderColor: put: myTarget borderColor.
  	].
  
  	thingsToRevert at: #borderWidth: put: myTarget borderWidth.
  	thingsToRevert at: #cornerStyle: put: myTarget cornerStyle.
  	thingsToRevert at: #sticky: put: myTarget isSticky.
  	thingsToRevert at: #lock: put: myTarget isLocked.
  !



More information about the Squeak-dev mailing list