use new menu-creation message
authorClaus Gittinger <cg@exept.de>
Thu, 21 May 1998 15:53:27 +0200
changeset 1546 f17fa0744663
parent 1545 1812c587358f
child 1547 57b45c785615
use new menu-creation message
ETxtView.st
EditTextView.st
--- a/ETxtView.st	Thu May 21 15:46:07 1998 +0200
+++ b/ETxtView.st	Thu May 21 15:53:27 1998 +0200
@@ -3325,108 +3325,44 @@
     <resource: #programMenu>
 
 
-    |labels selectors m sub shortKeys sensor|
+    |items m sub shortKeys sensor|
 
     ((sensor := self sensor) notNil and:[sensor ctrlDown]) ifTrue:[
-        labels := #(
-                        'again (for all)'
-                   ).
-
-        selectors := #(
-                        multipleAgain
-                       ).
+        items := #(
+                        ('again (for all)'      multipleAgain)  
+                  ).
     ] ifFalse:[
-        labels := #(
-"/                      'undo'
-                        'again'
-                        '-'
-                        'copy'
-                        'cut'
-                        'paste'
-                        '-'
-                        'accept'
-                        '='
-                        'others'
-                   ).
-
-        selectors := #(
-"/                      undo
-                        again
-                        nil
-                        copySelection
-                        cut
-                        pasteOrReplace
-                        nil
-                        accept
-                        nil
-                        others
-                       ).
-
-        shortKeys := #(
-"/                        nil
-                        #Again 
-                        nil
-                        #Copy
-                        #Cut
-                        #Paste
-                        nil
-                        #Accept 
-                        nil
-                        nil
-                      ).
+        items := #(
+"/                       ('undo'     undo                   )
+                        ('again'   again            Again  )
+                        ('-'                               )
+                        ('copy'    copySelection    Copy   )
+                        ('cut'     cut              Cut    )
+                        ('paste'   pasteOrReplace   Paste  )
+                        ('-'                               )
+                        ('accept'  accept           Accept )
+                        ('='                               )
+                        ('others'  others                  )
+                  ).
     ].
 
-    m := PopUpMenu
-            labels:(resources array:labels)
-            selectors:selectors
-            accelerators:shortKeys.
-
-    labels := #(
-                    'search ...'
-                    'goto ...'
-                    '-'
-                    'font ...'
-                    '-'
-                    'indent'
-                    'autoIndent \c'
-                    'insertMode \c'
-                    '-'
-                    'save as ...'
-                    'print'
-                ).
-
-   selectors := #(
-                     search
-                     gotoLine
-                     nil
-                     changeFont
-                     nil
-                     indent
-                     autoIndent:
-                     insertMode:
-                     nil
-                     save
-                     doPrint
-                    ).
-
-    shortKeys := #(
-                      #Find
-                      #GotoLine
-                      nil
-                      nil         "/ changeFont
-                      nil
-                      nil         "/ indent
-                      nil
-                      nil
-                      nil
-                      #SaveAs
-                      #Print).
-
-    sub := PopUpMenu
-                labels:(resources array:labels)
-                selectors:selectors
-                accelerators:shortKeys
-                receiver:model.
+    m := PopUpMenu itemList:items resources:resources.
+
+    items := #(
+                    ('search ...'    search         Find         )
+                    ('goto ...'      gotoLine       GotoLine     )
+                    ('-'                                         )
+                    ('font ...'      changeFont                  )
+                    ('-'                                         )
+                    ('indent'        indent                      )
+                    ('autoIndent \c' autoIndent:                 )
+                    ('insertMode \c' insertMode:                 )
+                    ('-'                                         )
+                    ('save as ...'   save           SaveAs       )
+                    ('print'         doPrint        Print        )
+              ).
+
+    sub := PopUpMenu itemList:items resources:resources performer:model.
 
     m subMenuAt:#others put:sub.
     sub checkToggleAt:#autoIndent: put:autoIndent.
@@ -3447,7 +3383,7 @@
     ].
     ^ m.
 
-    "Modified: / 19.5.1998 / 22:22:55 / cg"
+    "Modified: / 21.5.1998 / 15:52:38 / cg"
 !
 
 paste
@@ -4237,5 +4173,5 @@
 !EditTextView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Attic/ETxtView.st,v 1.155 1998-05-20 02:30:31 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Attic/ETxtView.st,v 1.156 1998-05-21 13:53:27 cg Exp $'
 ! !
--- a/EditTextView.st	Thu May 21 15:46:07 1998 +0200
+++ b/EditTextView.st	Thu May 21 15:53:27 1998 +0200
@@ -3325,108 +3325,44 @@
     <resource: #programMenu>
 
 
-    |labels selectors m sub shortKeys sensor|
+    |items m sub shortKeys sensor|
 
     ((sensor := self sensor) notNil and:[sensor ctrlDown]) ifTrue:[
-        labels := #(
-                        'again (for all)'
-                   ).
-
-        selectors := #(
-                        multipleAgain
-                       ).
+        items := #(
+                        ('again (for all)'      multipleAgain)  
+                  ).
     ] ifFalse:[
-        labels := #(
-"/                      'undo'
-                        'again'
-                        '-'
-                        'copy'
-                        'cut'
-                        'paste'
-                        '-'
-                        'accept'
-                        '='
-                        'others'
-                   ).
-
-        selectors := #(
-"/                      undo
-                        again
-                        nil
-                        copySelection
-                        cut
-                        pasteOrReplace
-                        nil
-                        accept
-                        nil
-                        others
-                       ).
-
-        shortKeys := #(
-"/                        nil
-                        #Again 
-                        nil
-                        #Copy
-                        #Cut
-                        #Paste
-                        nil
-                        #Accept 
-                        nil
-                        nil
-                      ).
+        items := #(
+"/                       ('undo'     undo                   )
+                        ('again'   again            Again  )
+                        ('-'                               )
+                        ('copy'    copySelection    Copy   )
+                        ('cut'     cut              Cut    )
+                        ('paste'   pasteOrReplace   Paste  )
+                        ('-'                               )
+                        ('accept'  accept           Accept )
+                        ('='                               )
+                        ('others'  others                  )
+                  ).
     ].
 
-    m := PopUpMenu
-            labels:(resources array:labels)
-            selectors:selectors
-            accelerators:shortKeys.
-
-    labels := #(
-                    'search ...'
-                    'goto ...'
-                    '-'
-                    'font ...'
-                    '-'
-                    'indent'
-                    'autoIndent \c'
-                    'insertMode \c'
-                    '-'
-                    'save as ...'
-                    'print'
-                ).
-
-   selectors := #(
-                     search
-                     gotoLine
-                     nil
-                     changeFont
-                     nil
-                     indent
-                     autoIndent:
-                     insertMode:
-                     nil
-                     save
-                     doPrint
-                    ).
-
-    shortKeys := #(
-                      #Find
-                      #GotoLine
-                      nil
-                      nil         "/ changeFont
-                      nil
-                      nil         "/ indent
-                      nil
-                      nil
-                      nil
-                      #SaveAs
-                      #Print).
-
-    sub := PopUpMenu
-                labels:(resources array:labels)
-                selectors:selectors
-                accelerators:shortKeys
-                receiver:model.
+    m := PopUpMenu itemList:items resources:resources.
+
+    items := #(
+                    ('search ...'    search         Find         )
+                    ('goto ...'      gotoLine       GotoLine     )
+                    ('-'                                         )
+                    ('font ...'      changeFont                  )
+                    ('-'                                         )
+                    ('indent'        indent                      )
+                    ('autoIndent \c' autoIndent:                 )
+                    ('insertMode \c' insertMode:                 )
+                    ('-'                                         )
+                    ('save as ...'   save           SaveAs       )
+                    ('print'         doPrint        Print        )
+              ).
+
+    sub := PopUpMenu itemList:items resources:resources performer:model.
 
     m subMenuAt:#others put:sub.
     sub checkToggleAt:#autoIndent: put:autoIndent.
@@ -3447,7 +3383,7 @@
     ].
     ^ m.
 
-    "Modified: / 19.5.1998 / 22:22:55 / cg"
+    "Modified: / 21.5.1998 / 15:52:38 / cg"
 !
 
 paste
@@ -4237,5 +4173,5 @@
 !EditTextView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/EditTextView.st,v 1.155 1998-05-20 02:30:31 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/EditTextView.st,v 1.156 1998-05-21 13:53:27 cg Exp $'
 ! !