The Trunk: Morphic-tbn.295.mcz

Torsten Bergmann uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-tbn.295.mcz

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

Name: Morphic-tbn.295
Author: tbn
Time: 4 January 2010, 1:07:16 am
UUID: d03e5d98-ae01-bb4e-bdc9-f09a9b91c0e6
Ancestors: Morphic-ar.294

Fix for issue http://bugs.squeak.org/view.php?id=7435
now based on Morphic-ar.294.mcz

(Same as Morphic-tbn.293.mcz - which was based on Morphic-ar.292.mcz and had conflict since Andreas was committing again)

=============== Diff against Morphic-ar.294 ===============

Item was changed:
  ----- Method: PasteUpMorph>>addCustomMenuItems:hand: (in category 'menu & halo') -----
  addCustomMenuItems: menu hand: aHandMorph
  "Add morph-specific menu itemns to the menu for the hand"
  super addCustomMenuItems: menu hand: aHandMorph.
 
  menu addLine.
  Preferences noviceMode
  ifFalse: [
  self addStackMenuItems: menu hand: aHandMorph.
  self addPenMenuItems: menu hand: aHandMorph.
  self addPlayfieldMenuItems: menu hand: aHandMorph].
 
  self isWorldMorph
  ifTrue: [
  menu addLine.
  Preferences noviceMode
  ifFalse: [(owner isKindOf: BOBTransformationMorph)
  ifTrue: [self addScalingMenuItems: menu hand: aHandMorph]].
  menu addUpdating: #showWorldMainDockingBarString action: #toggleShowWorldMainDockingBar.
 
  Flaps sharedFlapsAllowed ifTrue: [
  menu
  addUpdating: #suppressFlapsString
  target: Project current
  action: #toggleFlapsSuppressed.
  ].
+
-
- Project current showWorldMainDockingBar ifFalse:[
- menu addLine.
- TheWorldMainDockingBar instance fillMenuItemsBar: menu.
- ].
-
  Preferences noviceMode ifFalse: [| twm |
  menu addLine.
 
  twm := TheWorldMenu new.
  twm world: self project: Project current hand: aHandMorph.
 
  menu add: 'old desktop menu... (W)' translated subMenu: twm buildWorldMenu.
  ].
  ].
  !

[hidden email] wrote:
Apologies for the conflict, but I was in the midst of a multi-package
commit. BTW, a small technical note on the merge: Usually, it's better
to simply merge the other package if you note a conflict instead of
loading the other package, adding your patch, and committing again. If
you merge the package, it won't be shown in bold so it avoids a bit of
confusion if you look for conflicts at a later time. Not that it
terribly matters but it makes things a little easier when many people
commit and have to check for conflicts regularly.

Cheers,
   - Andreas