--- a/TabListEditor.st	Tue May 31 12:28:39 2005 +0200
+++ b/TabListEditor.st	Tue May 31 12:41:51 2005 +0200
@@ -1037,94 +1037,107 @@
     <resource: #menu>
 
     ^ 
-     #(#Menu
-        #(
-         #(#MenuItem
-            #label: 'New'
-            #isButton: true
-            #value: #doNew
-            #activeHelpKey: #fileNew
-            #labelImage: #(#ResourceRetriever #Icon #newIcon)
+     #(Menu
+        (
+         (MenuItem
+            activeHelpKey: fileNew
+            label: 'New'
+            itemValue: doNew
+            translateLabel: true
+            isButton: true
+            labelImage: (ResourceRetriever ToolbarIconLibrary new22x22Icon)
           )
-         #(#MenuItem
-            #label: 'Load'
-            #isButton: true
-            #value: #doLoad
-            #activeHelpKey: #fileLoad
-            #labelImage: #(#ResourceRetriever #Icon #loadIcon)
+         (MenuItem
+            activeHelpKey: fileLoad
+            label: 'Load'
+            itemValue: doLoad
+            translateLabel: true
+            isButton: true
+            labelImage: (ResourceRetriever ToolbarIconLibrary loadFromMethodIcon)
           )
-         #(#MenuItem
-            #label: 'Save'
-            #isButton: true
-            #value: #doSave
-            #activeHelpKey: #fileSave
-            #labelImage: #(#ResourceRetriever #Icon #saveIcon)
+         (MenuItem
+            activeHelpKey: fileSave
+            label: 'Save'
+            itemValue: doSave
+            translateLabel: true
+            isButton: true
+            labelImage: (ResourceRetriever ToolbarIconLibrary saveAsMethodIcon)
           )
-         #(#MenuItem
-            #label: ''
+         (MenuItem
+            label: '-'
           )
-         #(#MenuItem
-            #label: 'Cut'
-            #isButton: true
-            #value: #doCut
-            #activeHelpKey: #editCut
-            #enabled: #hasSelectionHolder
-            #labelImage: #(#ResourceRetriever #Icon #cutIcon)
+         (MenuItem
+            activeHelpKey: editCut
+            enabled: hasSelectionHolder
+            label: 'Cut'
+            itemValue: doCut
+            translateLabel: true
+            isButton: true
+            labelImage: (ResourceRetriever ToolbarIconLibrary cutWidgetIcon)
           )
-         #(#MenuItem
-            #label: 'Copy'
-            #isButton: true
-            #value: #doCopy
-            #activeHelpKey: #editCopy
-            #enabled: #hasSelectionHolder
-            #labelImage: #(#ResourceRetriever #Icon #copyIcon)
+         (MenuItem
+            activeHelpKey: editCopy
+            enabled: hasSelectionHolder
+            label: 'Copy'
+            itemValue: doCopy
+            translateLabel: true
+            isButton: true
+            labelImage: (ResourceRetriever ToolbarIconLibrary copyWidgetIcon)
           )
-         #(#MenuItem
-            #label: 'Paste'
-            #isButton: true
-            #value: #doPaste
-            #activeHelpKey: #editPaste
-            #enabled: #valueOfCanPaste
-            #labelImage: #(#ResourceRetriever #Icon #pasteIcon)
+         (MenuItem
+            activeHelpKey: editPaste
+            enabled: valueOfCanPaste
+            label: 'Paste'
+            itemValue: doPaste
+            translateLabel: true
+            isButton: true
+            labelImage: (ResourceRetriever ToolbarIconLibrary pasteWidgetIcon)
           )
-         #(#MenuItem
-            #label: 'Delete'
-            #isButton: true
-            #value: #doDelete
-            #activeHelpKey: #editDelete
-            #enabled: #hasSelectionHolder
-            #labelImage: #(#ResourceRetriever #Icon #deleteIcon)
+         (MenuItem
+            activeHelpKey: editDelete
+            enabled: hasSelectionHolder
+            label: 'Delete'
+            itemValue: doDelete
+            translateLabel: true
+            isButton: true
+            isVisible: false
+            labelImage: (ResourceRetriever ToolbarIconLibrary delete22x22Icon)
           )
-         #(#MenuItem
-            #label: ''
+         (MenuItem
+            label: '-'
           )
-         #(#MenuItem
-            #label: 'Add Tab Item'
-            #isButton: true
-            #value: #doCreate
-            #activeHelpKey: #addTabItem
-            #labelImage: #(#ResourceRetriever nil #newTabItemIcon)
+         (MenuItem
+            activeHelpKey: addTabItem
+            label: 'Add Tab Item'
+            itemValue: doCreate
+            translateLabel: true
+            isButton: true
+            labelImage: (ResourceRetriever nil newTabItemIcon)
           )
-         #(#MenuItem
-            #label: ''
+         (MenuItem
+            label: ''
           )
-         #(#MenuItem
-            #label: 'Move Tab Up'
-            #isButton: true
-            #value: #doMoveTabUpOrDown:
-            #activeHelpKey: #editMoveUp
-            #enabled: #canMoveTabItemUpOrDown
-            #argument: #up
-            #labelImage: #(#ResourceRetriever #Icon #upIcon)
+         (MenuItem
+            activeHelpKey: editMoveUp
+            enabled: canMoveTabItemUpOrDown
+            label: 'Move Tab Up'
+            itemValue: doMoveTabUpOrDown:
+            translateLabel: true
+            isButton: true
+            startGroup: right
+            labelImage: (ResourceRetriever XPToolbarIconLibrary up22x22Icon)
+            argument: up
           )
-         #(#MenuItem
-            #label: 'Move Tab Down'
-            #isButton: true
-            #value: #doMoveTabUpOrDown:
-            #activeHelpKey: #editMoveDown
-            #enabled: #canMoveTabItemUpOrDown
-            #argument: #down
-            #labelImage: #(#ResourceRetriever #Icon #downIcon)
+         (MenuItem
+            activeHelpKey: editMoveDown
+            enabled: canMoveTabItemUpOrDown
+            label: 'Move Tab Down'
+            itemValue: doMoveTabUpOrDown:
+            translateLabel: true
+            isButton: true
+            startGroup: right
+            labelImage: (ResourceRetriever XPToolbarIconLibrary down22x22Icon)
+            argument: down
           )
          )
         nil