class: MenuEditor
authorClaus Gittinger <cg@exept.de>
Tue, 08 Jul 2014 16:36:48 +0200
changeset 3138 6fe10704089b
parent 3137 3f3d24b1bed7
child 3139 209cc60527a4
class: MenuEditor changed: #submenuTest MenuItem creation code cleanup
MenuEditor.st
--- a/MenuEditor.st	Tue Jul 08 15:16:23 2014 +0200
+++ b/MenuEditor.st	Tue Jul 08 16:36:48 2014 +0200
@@ -2355,40 +2355,40 @@
     menu isNil ifTrue:[^ nil ].
 
     menu allItemsDo:[:anItem|
-	anItem ignoreShortcutKeys:true.
-	anItem isVisible:true.
-	anItem enabled:true.
-	anItem translateLabel:false.
-
-	anItem itemValue notNil ifTrue:[
-	    anItem itemValue:[ Transcript showCR:(anItem label) ].
-	].
-	anItem indication notNil ifTrue:[
-	    indication isNil ifTrue:[ indication := true asValue ].
-	    anItem indication:indication
-	].
-	anItem choice notNil ifTrue:[
-	    choice isNil ifTrue:[ choice := anItem choiceValue asValue ].
-	    anItem choice:choice
-	].
-	anItem isMenuSlice ifTrue:[
-	    anItem submenuChannel:nil.
-	    anItem label:'... Slice Menu ...'.
-	].
-	anItem submenuChannel notNil ifTrue:[
-	    anItem submenuChannel:nil.
-	    anItem submenu isNil ifTrue:[
-		submenu isNil ifTrue:[
-		    submenu := Menu new.
-		    submenu addItem:(MenuItem labeled:'Linked Menu...').
-		].
-		anItem submenu:submenu.
-	    ].
-	].
-	retriever := anItem resourceRetriever.
-	retriever notNil ifTrue:[
-	    retriever labelText notNil ifTrue:[ retriever labelText:(anItem label) ]
-	].
+        anItem ignoreShortcutKeys:true.
+        anItem isVisible:true.
+        anItem enabled:true.
+        anItem translateLabel:false.
+
+        anItem itemValue notNil ifTrue:[
+            anItem itemValue:[ Transcript showCR:(anItem label) ].
+        ].
+        anItem indication notNil ifTrue:[
+            indication isNil ifTrue:[ indication := true asValue ].
+            anItem indication:indication
+        ].
+        anItem choice notNil ifTrue:[
+            choice isNil ifTrue:[ choice := anItem choiceValue asValue ].
+            anItem choice:choice
+        ].
+        anItem isMenuSlice ifTrue:[
+            anItem submenuChannel:nil.
+            anItem label:'... Slice Menu ...'.
+        ].
+        anItem submenuChannel notNil ifTrue:[
+            anItem submenuChannel:nil.
+            anItem submenu isNil ifTrue:[
+                submenu isNil ifTrue:[
+                    submenu := Menu new.
+                    submenu addItem:(MenuItem label:'Linked Menu...').
+                ].
+                anItem submenu:submenu.
+            ].
+        ].
+        retriever := anItem resourceRetriever.
+        retriever notNil ifTrue:[
+            retriever labelText notNil ifTrue:[ retriever labelText:(anItem label) ]
+        ].
     ].
     menu findGuiResourcesIn:(self resolveName:specClass).
     ^ menu
@@ -3829,14 +3829,14 @@
     "
     |value|
 
-    menuItem := MenuItem labeled:(self rawLabel).
+    menuItem := MenuItem label:(self rawLabel).
 
     MenuEditor aspects do:[:aKey|
-	value := self validateValue:(aMenuItem perform:aKey).
-
-	value notNil ifTrue:[
-	    self aspectAt:aKey put:value.
-	].
+        value := self validateValue:(aMenuItem perform:aKey).
+
+        value notNil ifTrue:[
+            self aspectAt:aKey put:value.
+        ].
     ].
 !