The Trunk: Monticello-nice.403.mcz

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

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

Name: Monticello-nice.403
Author: nice
Time: 22 September 2010, 1:27:06.41 am
UUID: 392da834-2db0-4a47-80fa-4e60770d14c3
Ancestors: Monticello-nice.402

Let keyboard short cuts work in a merger.
While at it, add cmd+k -> keep cmd+r -> reject

=============== Diff against Monticello-nice.402 ===============

Item was added:
+ ----- Method: MCMergeBrowser>>methodListKey:from: (in category 'as yet unclassified') -----
+ methodListKey: aKeystroke from: aListMorph
+ aKeystroke caseOf: {
+ [$k] -> [self chooseRemote].
+ [$r] -> [self chooseLocal]}
+ otherwise: [super methodListKey: aKeystroke from: aListMorph ]!

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))
- ((listMorph:selection:menu: list selection methodListMenu:) (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))
- ((listMorph:selection:menu: list selection methodListMenu:) (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))
  )!