equal
deleted
inserted
replaced
514 items isEmptyOrNil ifTrue:[^ self]. |
514 items isEmptyOrNil ifTrue:[^ self]. |
515 |
515 |
516 resolvedItems := OrderedCollection new. |
516 resolvedItems := OrderedCollection new. |
517 |
517 |
518 items do:[:anItem | |
518 items do:[:anItem | |
519 anItem isMenuSlice ifTrue:[ |resItems| |
519 anItem isMenuSlice ifTrue:[ |
|
520 |resItems| |
|
521 |
520 rcv := aResourceContainerOrApplication. |
522 rcv := aResourceContainerOrApplication. |
521 [rcv notNil and:[resItems isNil]] whileTrue:[ |
523 [rcv notNil and:[resItems isNil]] whileTrue:[ |
522 resItems := anItem resolveSliceMenuItemsIn:rcv |
524 resItems := anItem resolveSliceMenuItemsIn:rcv |
523 rememberResourcesIn:aValueHolderOrNil. |
525 rememberResourcesIn:aValueHolderOrNil. |
524 rcv := rcv perform:#masterApplication ifNotUnderstood:nil. |
526 rcv := rcv perform:#masterApplication ifNotUnderstood:nil. |
535 resolvedItems add:anItem. |
537 resolvedItems add:anItem. |
536 ]. |
538 ]. |
537 ]. |
539 ]. |
538 items := resolvedItems. |
540 items := resolvedItems. |
539 |
541 |
540 "Modified: / 26-10-2006 / 16:45:14 / cg" |
542 "Modified: / 22-09-2010 / 13:34:38 / cg" |
541 ! ! |
543 ! ! |
542 |
544 |
543 !Menu methodsFor:'adding & removing'! |
545 !Menu methodsFor:'adding & removing'! |
544 |
546 |
545 addItem:aMenuItem |
547 addItem:aMenuItem |
667 asOldStylePopUpMenuFor:anApplicationOrNil |
669 asOldStylePopUpMenuFor:anApplicationOrNil |
668 "a temporary kludge - will vanish, when oldStyle MenuView and PopUpMenu are gone" |
670 "a temporary kludge - will vanish, when oldStyle MenuView and PopUpMenu are gone" |
669 |
671 |
670 |menuView itemsShown| |
672 |menuView itemsShown| |
671 |
673 |
672 itemsShown := items select:[:each | |
674 itemsShown := items |
|
675 select:[:each | |
673 |visibilityInItem| |
676 |visibilityInItem| |
674 |
677 |
675 visibilityInItem := each isVisible. |
678 visibilityInItem := each isVisible. |
676 visibilityInItem isNil ifTrue:[ |
679 visibilityInItem isNil ifTrue:[ |
677 true |
680 true |
714 ]. |
717 ]. |
715 |
718 |
716 menuView actions:(itemsShown collect:[:each | [ receiver perform:each value ]]). |
719 menuView actions:(itemsShown collect:[:each | [ receiver perform:each value ]]). |
717 |
720 |
718 ^ PopUpMenu forMenu:menuView |
721 ^ PopUpMenu forMenu:menuView |
|
722 |
|
723 "Modified: / 22-09-2010 / 13:52:06 / cg" |
719 ! |
724 ! |
720 |
725 |
721 fromLiteralArrayEncoding:aLiteralEncodedArray |
726 fromLiteralArrayEncoding:aLiteralEncodedArray |
722 "read my contents from a aLiteralEncodedArray" |
727 "read my contents from a aLiteralEncodedArray" |
723 |
728 |
1180 ! ! |
1185 ! ! |
1181 |
1186 |
1182 !Menu class methodsFor:'documentation'! |
1187 !Menu class methodsFor:'documentation'! |
1183 |
1188 |
1184 version |
1189 version |
1185 ^ '$Header: /cvs/stx/stx/libview2/Menu.st,v 1.76 2010-08-08 12:43:12 cg Exp $' |
1190 ^ '$Header: /cvs/stx/stx/libview2/Menu.st,v 1.77 2010-09-22 12:21:41 cg Exp $' |
1186 ! |
1191 ! |
1187 |
1192 |
1188 version_CVS |
1193 version_CVS |
1189 ^ '$Header: /cvs/stx/stx/libview2/Menu.st,v 1.76 2010-08-08 12:43:12 cg Exp $' |
1194 ^ '$Header: /cvs/stx/stx/libview2/Menu.st,v 1.77 2010-09-22 12:21:41 cg Exp $' |
1190 ! ! |
1195 ! ! |