UIPainter.st
changeset 692 0530a994f2c8
parent 685 f8114ec98a82
child 697 ca492fc8390a
--- a/UIPainter.st	Fri Feb 27 15:53:44 1998 +0100
+++ b/UIPainter.st	Fri Feb 27 17:17:22 1998 +0100
@@ -734,168 +734,166 @@
           
            #(
              #(#MenuItem
-                #'label:' 'About'
-                #'labelImage:' #(#ResourceRetriever nil #menuIcon)
-                #'submenuChannel:' #menuAbout
+                #label: 'About'
+                #labelImage: #(#ResourceRetriever nil #menuIcon)
+                #submenuChannel: #menuAbout
             )
              #(#MenuItem
-                #'label:' 'File'
-                #'value:' #file
-                #'enabled:' #enableChannel
-                #'submenu:' 
+                #label: 'File'
+                #value: #file
+                #enabled: #enableChannel
+                #submenu: 
                  #(#Menu
                     
                      #(
                        #(#MenuItem
-                          #'label:' 'New'
-                          #'value:' #doNew
-                          #'activeHelpKey:' #fileNew
+                          #label: 'New'
+                          #value: #doNew
+                          #activeHelpKey: #fileNew
                       )
                        #(#MenuItem
-                          #'label:' '-'
+                          #label: '-'
                       )
                        #(#MenuItem
-                          #'label:' 'Load...'
-                          #'value:' #doFromClass
-                          #'activeHelpKey:' #fileLoad
+                          #label: 'Load...'
+                          #value: #doFromClass
+                          #activeHelpKey: #fileLoad
                       )
                        #(#MenuItem
-                          #'label:' 'Load Subspec...'
-                          #'value:' #loadSubspec
-                          #'activeHelpKey:' #fileLoadSubspec
+                          #label: 'Load Subspec...'
+                          #value: #loadSubspec
+                          #activeHelpKey: #fileLoadSubspec
                       )
                        #(#MenuItem
-                          #'label:' '-'
+                          #label: '-'
                       )
                        #(#MenuItem
-                          #'label:' 'Save'
-                          #'value:' #doInstallSpec
-                          #'activeHelpKey:' #fileSave
+                          #label: 'Save'
+                          #value: #doInstallSpec
+                          #activeHelpKey: #fileSave
                       )
                        #(#MenuItem
-                          #'label:' '-'
+                          #label: '-'
                       )
                        #(#MenuItem
-                          #'label:' 'Define Class And Selector...'
-                          #'value:' #defineClassAndSelector
+                          #label: 'Define Class And Selector...'
+                          #value: #defineClassAndSelector
                       )
                        #(#MenuItem
-                          #'label:' '-'
+                          #label: '-'
                       )
                        #(#MenuItem
-                          #'label:' 'Create Aspect Methods'
-                          #'value:' #doInstallAspects
-                          #'enabled:' #hasSpecClass
+                          #label: 'Create Aspect Methods'
+                          #value: #doInstallAspects
+                          #enabled: #hasSpecClass
                       )
                        #(#MenuItem
-                          #'label:' 'Create Hook Methods'
-                          #'value:' #doInstallHooks
-                          #'enabled:' #hasSpecClass
+                          #label: 'Create Hook Methods'
+                          #value: #doInstallHooks
+                          #enabled: #hasSpecClass
                       )
                        #(#MenuItem
-                          #'label:' '-'
+                          #label: '-'
                       )
                        #(#MenuItem
-                          #'label:' 'Pick An Interface'
-                          #'value:' #doPickAView
-                          #'activeHelpKey:' #filePickAnInterface
+                          #label: 'Pick An Interface'
+                          #value: #doPickAView
+                          #activeHelpKey: #filePickAnInterface
                       )
                        #(#MenuItem
-                          #'label:' '-'
+                          #label: '-'
                       )
                        #(#MenuItem
-                          #'label:' 'Show Interface Spec'
-                          #'value:' #doWindowSpec
+                          #label: 'Show Interface Spec'
+                          #value: #doWindowSpec
                       )
                        #(#MenuItem
-                          #'label:' 'Browse Interface Class'
-                          #'value:' #doBrowseAppClass
-                          #'enabled:' #hasSpecClass
+                          #label: 'Browse Interface Class'
+                          #value: #doBrowseAppClass
+                          #enabled: #hasSpecClass
                       )
                        #(#MenuItem
-                          #'label:' 'Browse Aspect Methods'
-                          #'value:' #doBrowseAspectMethods
-                          #'enabled:' #hasSpecClass
+                          #label: 'Browse Aspect Methods'
+                          #value: #doBrowseAspectMethods
+                          #enabled: #hasSpecClass
                       )
                        #(#MenuItem
-                          #'label:' '-'
+                          #label: '-'
                       )
                        #(#MenuItem
-                          #'label:' 'Exit'
-                          #'value:' #closeRequest
-                          #'activeHelpKey:' #fileExit
+                          #label: 'Exit'
+                          #value: #closeRequest
+                          #activeHelpKey: #fileExit
                       )
                     ) nil
                     nil
                 )
             )
              #(#MenuItem
-                #'label:' 'Edit'
-                #'submenuChannel:' #menuEdit
+                #label: 'Edit'
+                #submenuChannel: #menuEdit
             )
              #(#MenuItem
-                #'label:' 'Add'
-                #'submenuChannel:' #menuAdd
+                #label: 'Align'
+                #submenuChannel: #menuAlign
             )
              #(#MenuItem
-                #'label:' 'Align'
-                #'submenuChannel:' #menuAlign
-            )
-             #(#MenuItem
-                #'label:' 'Test'
-                #'submenu:' 
+                #label: 'Test'
+                #submenu: 
                  #(#Menu
                     
                      #(
                        #(#MenuItem
-                          #'label:' 'Start Application'
-                          #'value:' #doStartApplication
-                          #'activeHelpKey:' #testStartApplication
+                          #label: 'Start Application'
+                          #value: #doStartApplication
+                          #activeHelpKey: #testStartApplication
                       )
                        #(#MenuItem
-                          #'label:' '-'
+                          #label: '-'
                       )
                        #(#MenuItem
-                          #'label:' 'Geometry Test Mode'
-                          #'indication:' #'testMode:'
+                          #label: 'Geometry Test Mode'
+                          #indication: #testMode:
                       )
                     ) nil
                     nil
                 )
             )
              #(#MenuItem
-                #'label:' 'Settings'
-                #'submenu:' 
+                #label: 'Settings'
+                #submenu: 
                  #(#Menu
                     
                      #(
                        #(#MenuItem
-                          #'label:' 'Undo Manager...'
-                          #'value:' #openUndoMenu
+                          #label: 'Undo Manager...'
+                          #value: #openUndoMenu
                       )
                        #(#MenuItem
-                          #'label:' '-'
+                          #label: '-'
                       )
                        #(#MenuItem
-                          #'label:' 'Grid Manager...'
-                          #'value:' #gridMenu
+                          #label: 'Grid Manager...'
+                          #value: #gridMenu
                       )
                     ) nil
                     nil
                 )
             )
              #(#MenuItem
-                #'label:' 'History'
-                #'submenuChannel:' #menuHistory
+                #label: 'History'
+                #submenuChannel: #menuHistory
             )
              #(#MenuItem
-                #'label:' 'Help'
-                #'startGroup:' #right
-                #'submenuChannel:' #menuHelp
+                #label: 'Help'
+                #startGroup: #right
+                #submenuChannel: #menuHelp
             )
           ) nil
           nil
       )
+
+    "Modified: / 27.2.1998 / 16:15:24 / cg"
 !
 
 menuAdd
@@ -3308,10 +3306,11 @@
 
     props := UIPainterView::ViewProperty new.
     props view:aCanvas.
-    model root:(TreeItem name: self class defaultNameOfCanvas asBoldText contents:props).
+    model root:(TreeItem name:(self class defaultNameOfCanvas asBoldText) contents:props).
     model root expand.
     self enableChannel:(aCanvas enableChannel).
 
+    "Modified: / 27.2.1998 / 16:10:03 / cg"
 !
 
 canvasSpec
@@ -3580,9 +3579,11 @@
      and:[(self propertyDetect:[:p| p name = name]) isNil
      and:[node name ~= name]]]
     ) ifTrue:[
-        node name: self class defaultNameOfCanvas asBoldText , ': [', name, ']'.
+        node name: (name asBoldText , ': [', self class defaultNameOfCanvas  , ']').
         self redrawLine:1.
     ].
+
+    "Modified: / 27.2.1998 / 16:13:31 / cg"
 !
 
 layoutChanged
@@ -3718,12 +3719,15 @@
             ifFalse: [specClass class icon]
     ].
 
-    self model labelAction: 
-    [:aNode|
-        |spec|
-        (spec := aNode contents spec) viewClass name asBoldText, 
-        ': [', spec name, ']'
-    ]
+    self model 
+        labelAction: 
+            [:aNode|
+                |spec|
+                spec := aNode contents spec.
+                spec name asBoldText , ': [', spec viewClass name , ']'
+            ]
+
+    "Modified: / 27.2.1998 / 16:12:37 / cg"
 ! !
 
 !UIPainter::TreeView methodsFor:'private'!