[Pkg] The Trunk: Monticello-nice.405.mcz

[commits at source.squeak.org]

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

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

Name: Monticello-nice.405
Author: nice
Time: 22 September 2010, 2:35:35.096 am
UUID: bd65511d-2781-4e6f-9bc7-a0895b52fba5
Ancestors: Monticello-nice.403

1) protect against missing timeStamp when annotation pane preference is on
2) adjust default annotation pane height for a double line
3) use this default in the merger

=============== Diff against Monticello-nice.403 ===============

Item was changed:
  ----- Method: MCMergeBrowser>>widgetSpecs (in category 'as yet unclassified') -----
  widgetSpecs
  	Preferences annotationPanes ifFalse: [ ^#(
  		((buttonRow) (0 0 1 0) (0 0 0 30))
  		((listMorph:selection:menu:keystroke: list selection methodListMenu: methodListKey:from:) (0 0 1 0.4) (0 30 0 0))
  		((innerButtonRow) (0 0.4 1 0.4) (0 0 0 30))
  		((textMorph: text) (0 0.4 1 1) (0 30 0 0))
  		)].
  
+ 	^ {
+ 		#((buttonRow) (0 0 1 0) (0 0 0 30)).
+ 		#((listMorph:selection:menu:keystroke: list selection methodListMenu: methodListKey:from:) (0 0 1 0.4) (0 30 0 0)).
+ 		#((innerButtonRow) (0 0.4 1 0.4) (0 0 0 30)).
+ 		{ #(textMorph: annotations). #(0 0.4 1 0.4). { 0. 30. 0. 30+self defaultAnnotationPaneHeight. }}.
+ 		{ #(textMorph: text). #(0 0.4 1 1). { 0. 30+self defaultAnnotationPaneHeight. 0. 0.}}
+ 	}!
- 	^ #(
- 		((buttonRow) (0 0 1 0) (0 0 0 30))
- 		((listMorph:selection:menu:keystroke: list selection methodListMenu: methodListKey:from:) (0 0 1 0.4) (0 30 0 0))
- 		((innerButtonRow) (0 0.4 1 0.4) (0 0 0 30))
- 		((textMorph: annotations) (0 0.4 1 0.4) (0 30 0 60))
- 		((textMorph: text) (0 0.4 1 1) (0 60 0 0))
- 		)!

Item was changed:
  ----- Method: MCMethodDefinition>>timeStamp (in category 'accessing') -----
  timeStamp
+ 	^ timeStamp ifNil: ['']!
- 	^ timeStamp!

Item was changed:
  ----- Method: MCTool>>defaultAnnotationPaneHeight (in category 'morphic ui') -----
  defaultAnnotationPaneHeight 
+ 	"Answer the receiver's preferred default height for new annotation panes.
+ 	Since MC compares two annotations, reserve a bit less than a double the traditional height."
+ 	^ (Preferences parameterAt: #defaultAnnotationPaneHeight ifAbsentPut: [25]) * 5 // 3!
- 	"Answer the receiver's preferred default height for new annotation panes."
- 	^ Preferences parameterAt: #defaultAnnotationPaneHeight ifAbsentPut: [25]!