[etoys-dev] Etoys: Connectors-kfr.195.mcz

[commits at source.squeak.org]

Karl Ramberg uploaded a new version of Connectors to project Etoys:
http://source.squeak.org/etoys/Connectors-kfr.195.mcz

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

Name: Connectors-kfr.195
Author: kfr
Time: 8 March 2012, 9:39:50 pm
UUID: 63d76bfe-1caf-d342-9169-2c6a1f90e515
Ancestors: Connectors-kfr.194

Show simpler properties panel initially

=============== Diff against Connectors-kfr.194 ===============

Item was changed:
  ----- Method: ObjectPropertiesMorph>>rebuild (in category '*connectors-visual properties') -----
  rebuild
  	"Rebuild the contents of the property sheet."
  
  	| buttons |
  	self removeAllMorphs.
  	self addARow: {
  		self lockedString: ('Properties for {1}' translated format: {myTarget topRendererOrSelf externalName}).
  	}.
  "	self addARow: {
  		self inAColumn: {
  			self paneForCornerRoundingToggle.
  			self paneForStickinessToggle.
  			self paneForLockedToggle.
  		}.
  	}."
  
  	self addARow: {
+ 		self paneForMainColorPicker },
+ 		(simplePanel 
+ 					ifFalse:[{self paneFor2ndGradientColorPicker}]
+ 					ifTrue:[{}]).
+ 	simplePanel ifFalse:[
- 		self paneForMainColorPicker.
- 		self paneFor2ndGradientColorPicker.
- 	}.
- 
  	(myTarget isMorph and: [myTarget isWorldMorph]) ifFalse:
  		[self addARow: {
  			self paneForBorderColorPicker.
+ 			self paneForShadowColorPicker}]].
- 			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.
  	}.
+ 	simplePanel ifTrue:[buttons addAll:{self 
+ 			buttonNamed: 'More controls' translated action: #toggleSimplePanel color: color lighter help: 'add controls for gradient and border to the panel' translated}]
+ 		 ifFalse:[buttons addAll:{self 
+ 			buttonNamed: 'Fewer controls' translated action: #toggleSimplePanel color: color lighter help: 'show only color picker for solid color' translated}].
- 	
  	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.
  !