diff -r a344e9ef09dc -r 9054767c0080 DataSetBuilder.st
--- a/DataSetBuilder.st	Mon Jun 29 16:46:21 1998 +0200
+++ b/DataSetBuilder.st	Mon Jun 29 16:53:30 1998 +0200
@@ -254,6 +254,26 @@
     "Modified: / 19.5.1998 / 23:20:51 / cg"
 ! !
 
+!DataSetBuilder class methodsFor:'image specs'!
+
+newColumnIcon
+    "This resource specification was automatically generated
+     by the ImageEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the ImageEditor may not be able to read the specification."
+
+    "
+     self newColumnIcon inspect
+     ImageEditor openOnClass:self andSelector:#newColumnIcon
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:#'DataSetBuilder newColumnIcon'
+        ifAbsentPut:[(Depth2Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(2 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'UT@@@@UPUTUUUXUPUTZ**,UPUTZB",UPUTX*H,UYUTX*H,UPUTZB",UPQTZ**,UPUTX*H,UPUTX*H,UPUTX*H,UPUTXB@,UPUTZ**,UPUTZ**,UPUTX"H,UYUTXB@,UPUTX"@,UPUTX"H,UPUTZ**,UPUTZ**,UPUT/??<UPUT@@@@UP') ; colorMapFromArray:#[0 0 0 255 255 255 170 170 170 127 127 127]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'A??@A??@A??@A??@A??@A??@A??@A??@A??CA??@A??@A??@A??@A??CA??AA??@A??CA??@A??CA??@A??@A??A') ; yourself); yourself]! !
+
 !DataSetBuilder class methodsFor:'interface specs'!
 
 basicsEditSpec
@@ -1545,29 +1565,29 @@
            #(
              #(#MenuItem
                 #label: 'Cut'
+                #translateLabel: true
                 #value: #doCut
-                #translateLabel: true
                 #activeHelpKey: #editCut
                 #enabled: #isColumnSelected
             )
              #(#MenuItem
                 #label: 'Copy'
+                #translateLabel: true
                 #value: #doCopy
-                #translateLabel: true
                 #activeHelpKey: #editCopy
                 #enabled: #isColumnSelected
             )
              #(#MenuItem
                 #label: 'Paste'
+                #translateLabel: true
                 #value: #doPaste
-                #translateLabel: true
                 #activeHelpKey: #editPaste
                 #enabled: #valueOfHavingClipboard
             )
              #(#MenuItem
                 #label: 'Delete'
+                #translateLabel: true
                 #value: #doDelete
-                #translateLabel: true
                 #activeHelpKey: #editDelete
                 #enabled: #valueOfHavingClipboard
             )
@@ -1576,27 +1596,25 @@
             )
              #(#MenuItem
                 #label: 'Move Up'
+                #translateLabel: true
                 #value: #doMoveColumn:
                 #activeHelpKey: #editMoveUp
-                #translateLabel: true
                 #enabled: #isColumnSelected
                 #argument: #up
-                #labelImage: #(#ResourceRetriever #DataSetBuilder #upIcon 'Move Up')
+                #labelImage: #(#ResourceRetriever #Icon #upIcon 'Move Up')
             )
              #(#MenuItem
                 #label: 'Move Down'
+                #translateLabel: true
                 #value: #doMoveColumn:
-                #translateLabel: true
                 #activeHelpKey: #editMoveDown
                 #enabled: #isColumnSelected
                 #argument: #down
-                #labelImage: #(#ResourceRetriever #DataSetBuilder #downIcon 'Move Down')
+                #labelImage: #(#ResourceRetriever #Icon #downIcon 'Move Down')
             )
           ) nil
           nil
       )
-
-    "Modified: / 19.5.1998 / 23:10:19 / cg"
 !
 
 menuToolbar
@@ -1623,21 +1641,21 @@
                 #isButton: true
                 #value: #doNew
                 #activeHelpKey: #fileNew
-                #labelImage: #(#ResourceRetriever nil #newIcon)
+                #labelImage: #(#ResourceRetriever #Icon #newIcon)
             )
              #(#MenuItem
                 #label: 'Load'
                 #isButton: true
                 #value: #doLoad
                 #activeHelpKey: #fileLoad
-                #labelImage: #(#ResourceRetriever nil #loadIcon)
+                #labelImage: #(#ResourceRetriever #Icon #loadIcon)
             )
              #(#MenuItem
                 #label: 'Save'
                 #isButton: true
                 #value: #doSave
                 #activeHelpKey: #fileSave
-                #labelImage: #(#ResourceRetriever nil #saveIcon)
+                #labelImage: #(#ResourceRetriever #Icon #saveIcon)
             )
              #(#MenuItem
                 #label: ''
@@ -1648,7 +1666,7 @@
                 #value: #doCut
                 #activeHelpKey: #editCut
                 #enabled: #isColumnSelected
-                #labelImage: #(#ResourceRetriever nil #cutIcon)
+                #labelImage: #(#ResourceRetriever #Icon #cutIcon)
             )
              #(#MenuItem
                 #label: 'Copy'
@@ -1656,7 +1674,7 @@
                 #value: #doCopy
                 #activeHelpKey: #editCopy
                 #enabled: #isColumnSelected
-                #labelImage: #(#ResourceRetriever nil #copyIcon)
+                #labelImage: #(#ResourceRetriever #Icon #copyIcon)
             )
              #(#MenuItem
                 #label: 'Paste'
@@ -1664,7 +1682,7 @@
                 #value: #doPaste
                 #activeHelpKey: #editPaste
                 #enabled: #valueOfCanPaste
-                #labelImage: #(#ResourceRetriever nil #pasteIcon)
+                #labelImage: #(#ResourceRetriever #Icon #pasteIcon)
             )
              #(#MenuItem
                 #label: 'Delete'
@@ -1672,7 +1690,7 @@
                 #value: #doDelete
                 #activeHelpKey: #editDelete
                 #enabled: #isColumnSelected
-                #labelImage: #(#ResourceRetriever nil #deleteIcon)
+                #labelImage: #(#ResourceRetriever #Icon #deleteIcon)
             )
              #(#MenuItem
                 #label: ''
@@ -1695,7 +1713,7 @@
                 #activeHelpKey: #editMoveUp
                 #enabled: #isColumnSelected
                 #argument: #up
-                #labelImage: #(#ResourceRetriever nil #upIcon)
+                #labelImage: #(#ResourceRetriever #Icon #upIcon)
             )
              #(#MenuItem
                 #label: 'Move Down'
@@ -1704,33 +1722,13 @@
                 #activeHelpKey: #editMoveDown
                 #enabled: #isColumnSelected
                 #argument: #down
-                #labelImage: #(#ResourceRetriever nil #downIcon)
+                #labelImage: #(#ResourceRetriever #Icon #downIcon)
             )
           ) nil
           nil
       )
 ! !
 
-!DataSetBuilder class methodsFor:'resources'!
-
-newColumnIcon
-    "This resource specification was automatically generated
-     by the ImageEditor of ST/X."
-
-    "Do not manually edit this!! If it is corrupted,
-     the ImageEditor may not be able to read the specification."
-
-    "
-     self newColumnIcon inspect
-     ImageEditor openOnClass:self andSelector:#newColumnIcon
-    "
-
-    <resource: #image>
-
-    ^Icon
-        constantNamed:#'DataSetBuilder newColumnIcon'
-        ifAbsentPut:[(Depth2Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(2 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'UT@@@@UPUTUUUXUPUTZ**,UPUTZB",UPUTX*H,UYUTX*H,UPUTZB",UPQTZ**,UPUTX*H,UPUTX*H,UPUTX*H,UPUTXB@,UPUTZ**,UPUTZ**,UPUTX"H,UYUTXB@,UPUTX"@,UPUTX"H,UPUTZ**,UPUTZ**,UPUT/??<UPUT@@@@UP') ; colorMapFromArray:#[0 0 0 255 255 255 170 170 170 127 127 127]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'A??@A??@A??@A??@A??@A??@A??@A??@A??CA??@A??@A??@A??@A??CA??AA??@A??CA??@A??CA??@A??@A??A') ; yourself); yourself]! !
-
 !DataSetBuilder methodsFor:'accessing'!
 
 columns