[squeak-dev] The Trunk: Monticello-nice.455.mcz

commits at source.squeak.org commits at source.squeak.org
Mon Apr 11 19:57:06 UTC 2011


Nicolas Cellier uploaded a new version of Monticello to project The Trunk:
http://source.squeak.org/trunk/Monticello-nice.455.mcz

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

Name: Monticello-nice.455
Author: nice
Time: 11 April 2011, 9:56:44.996 pm
UUID: 43fa5741-9063-4549-8d86-4708ccd4de21
Ancestors: Monticello-cmm.454, Monticello-nice.404

Merge Monticello-nice.404
(Give MCTool a chance to be ToolBuilder-ized)

=============== Diff against Monticello-cmm.454 ===============

Item was changed:
  ----- Method: MCChangeSelector>>innerButtonRow (in category 'as yet unclassified') -----
  innerButtonRow
+ 	^ self buttonRow: self innerButtonSpecs!
- 	^ self buttonRow:
- 		#(('Select All' selectAll 'select all changes')
- 		  ('Select None' selectNone 'select no changes'))!

Item was added:
+ ----- Method: MCChangeSelector>>innerButtonSpecs (in category 'as yet unclassified') -----
+ innerButtonSpecs
+ 	^
+ 		#(('Select All' selectAll 'select all changes')
+ 		  ('Select None' selectNone 'select no changes'))!

Item was changed:
  ----- Method: MCMergeBrowser>>innerButtonRow (in category 'as yet unclassified') -----
  innerButtonRow
+ 	^ self buttonRow: self innerButtonSpecs!
- 	^ self buttonRow:
- 		#((Keep chooseRemote 'keep the selected change' )
- 		  (Reject chooseLocal 'reject the selected change' ))!

Item was added:
+ ----- Method: MCMergeBrowser>>innerButtonSpecs (in category 'as yet unclassified') -----
+ innerButtonSpecs
+ 	^
+ 		#((Keep chooseRemote 'keep the selected change' )
+ 		  (Reject chooseLocal 'reject the selected change' ))!

Item was changed:
  ----- Method: MCTool>>buildWindow (in category 'morphic ui') -----
  buildWindow
  	| window |
+ 	Smalltalk at: #ToolBuilder ifPresent: [:tb | ^tb build: self].
  	window := SystemWindow labelled: self label.
  	window model: self.
  	self widgetSpecs do: [:spec |
  		| send fractions offsets |
  		send := spec first.
  		fractions := spec at: 2 ifAbsent: [#(0 0 1 1)].
  		offsets := spec at: 3 ifAbsent: [#(0 0 0 0)].
  		window
  			addMorph: (self perform: send first withArguments: send allButFirst)
  			fullFrame:
  				(LayoutFrame
  					fractions: 
  						((fractions first)@(fractions second) corner: 
  							(fractions third)@(fractions fourth))
  					offsets:
  						((offsets first)@(offsets second)  corner:
  							(offsets third)@(offsets fourth)))].
  	^ window!

Item was added:
+ ----- Method: MCToolWindowBuilder>>innerButtonRow (in category 'as yet unclassified') -----
+ innerButtonRow
+ 	^ self buttonRow: tool innerButtonSpecs!




More information about the Squeak-dev mailing list