diff -r 2b23888bda58 -r 9d69f7d241cf FileBrowser.st
--- a/FileBrowser.st	Thu Sep 25 17:15:56 2014 +0200
+++ b/FileBrowser.st	Thu Sep 25 17:16:17 2014 +0200
@@ -506,6 +506,67 @@
     "Modified: / 17.8.1998 / 10:13:05 / cg"
 !
 
+cvsMenuSpec
+    "This resource specification was automatically generated
+     by the MenuEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the MenuEditor may not be able to read the specification."
+
+    "
+     MenuEditor new openOnClass:FileBrowser andSelector:#menuSpec
+     (Menu new fromLiteralArrayEncoding:(FileBrowser menuSpec)) startUp
+    "
+
+    <resource: #menu>
+
+    ^ 
+     #(Menu
+              (
+               (MenuItem
+                  enabled: hasSelection
+                  label: 'Update Selected Files/Directories'
+                  itemValue: cvsUpdateSelection
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: 'Update Directory Local'
+                  itemValue: cvsUpdateDirectoryLocal
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: 'Update Directory Recursive'
+                  itemValue: cvsUpdateDirectoryRecursive
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  label: 'Commit...'
+                  itemValue: cvsCommitSelection
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: 'Add && Commit...'
+                  itemValue: cvsAddAndCommitSelection
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  enabled: canRemoveCVSContainer
+                  label: 'Remove File && CVS Container...'
+                  itemValue: cvsRemoveFileAndContainer
+                  translateLabel: true
+                )
+               )
+              nil
+              nil
+            )
+!
+
 directoryMenuSpec
     "This resource specification was automatically generated
      by the MenuEditor of ST/X."
@@ -603,6 +664,265 @@
       )
 !
 
+editMenuSpec
+    "This resource specification was automatically generated
+     by the MenuEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the MenuEditor may not be able to read the specification."
+
+    "
+     MenuEditor new openOnClass:FileBrowser andSelector:#menuSpec
+     (Menu new fromLiteralArrayEncoding:(FileBrowser menuSpec)) startUp
+    "
+
+    <resource: #menu>
+
+    ^ 
+     #(Menu
+              (
+               (MenuItem
+                  enabled: hasSelection
+                  label: 'Edit File'
+                  itemValue: fileGet
+                  translateLabel: true
+                )
+               (MenuItem
+                  enabled: hasSelection
+                  label: 'Insert File'
+                  itemValue: fileInsert
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  label: 'Copy File List'
+                  itemValue: copyFileList
+                  translateLabel: true
+                )
+               (MenuItem
+                  enabled: hasSelection
+                  label: 'Copy Selected Filename'
+                  itemValue: copySelectedFileName
+                  translateLabel: true
+                )
+               (MenuItem
+                  enabled: hasSelection
+                  label: 'Copy Selected Pathname'
+                  itemValue: copySelectedPathName
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: 'Copy Command History'
+                  itemValue: copyCommandHistory
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  label: 'Visited Files'
+                  translateLabel: true
+                  submenuChannel: visitedFileMenuSpec
+                )
+               )
+              nil
+              nil
+            )
+!
+
+fileMenuSpec
+    "This resource specification was automatically generated
+     by the MenuEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the MenuEditor may not be able to read the specification."
+
+    "
+     MenuEditor new openOnClass:FileBrowser andSelector:#menuSpec
+     (Menu new fromLiteralArrayEncoding:(FileBrowser menuSpec)) startUp
+    "
+
+    <resource: #menu>
+
+    ^ 
+     #(Menu
+              (
+               (MenuItem
+                  label: 'Spawn'
+                  itemValue: fileSpawn
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  enabled: hasSelection
+                  label: 'Open'
+                  itemValue: menuOpen
+                  translateLabel: true
+                  isVisible: false
+                )
+               (MenuItem
+                  enabled: hasFilenameSelectionInCodeView
+                  label: 'Open selected Filename'
+                  itemValue: openSelectedFilename
+                  translateLabel: true
+                  isVisible: hasFilenameSelectionInCodeView
+                )
+               (MenuItem
+                  enabled: hasSelection
+                  label: 'FileIn'
+                  itemValue: fileFileIn
+                  translateLabel: true
+                )
+               (MenuItem
+                  enabled: hasSelection
+                  label: 'FileInTo NameSpace...'
+                  itemValue: fileFileInToNameSpace
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  label: 'New'
+                  translateLabel: true
+                  submenu: 
+                 (Menu
+                    (
+                     (MenuItem
+                        label: 'Directory...'
+                        itemValue: newDirectory
+                        translateLabel: true
+                      )
+                     (MenuItem
+                        label: 'File...'
+                        itemValue: newFile
+                        translateLabel: true
+                      )
+                     (MenuItem
+                        label: 'Hard Link...'
+                        itemValue: newHardLink
+                        translateLabel: true
+                        isVisible: systemIsUnix
+                      )
+                     (MenuItem
+                        label: 'Symbolic Link...'
+                        itemValue: newSoftLink
+                        translateLabel: true
+                        isVisible: systemIsUnix
+                      )
+                     )
+                    nil
+                    nil
+                  )
+                )
+               (MenuItem
+                  enabled: hasSelection
+                  label: 'Remove'
+                  itemValue: fileRemove
+                  translateLabel: true
+                )
+               (MenuItem
+                  enabled: hasSelection
+                  label: 'Rename'
+                  itemValue: fileRename
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  enabled: hasSelection
+                  label: 'Properties...'
+                  itemValue: fileGetLongInfo
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: '-'
+                  isVisible: javaSupportLoaded
+                )
+               (MenuItem
+                  enabled: canAddToClassPath
+                  label: 'Add to Java ClassPath'
+                  itemValue: fileAddToJavaClassPath
+                  translateLabel: true
+                  isVisible: javaSupportLoaded
+                )
+               (MenuItem
+                  enabled: canRemoveFromClassPath
+                  label: 'Remove from Java ClassPath'
+                  itemValue: fileRemoveFromJavaClassPath
+                  translateLabel: true
+                  isVisible: javaSupportLoaded
+                )
+               (MenuItem
+                  enabled: canAddToSourcePath
+                  label: 'Add to Java SourcePath'
+                  itemValue: fileAddToJavaSourcePath
+                  translateLabel: true
+                  isVisible: javaSupportLoaded
+                )
+               (MenuItem
+                  enabled: canRemoveFromSourcePath
+                  label: 'Remove from Java SourcePath'
+                  itemValue: fileRemoveFromJavaSourcePath
+                  translateLabel: true
+                  isVisible: javaSupportLoaded
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  label: 'Exit'
+                  itemValue: menuExit
+                  translateLabel: true
+                )
+               )
+              nil
+              nil
+            )
+!
+
+helpMenuSpec
+    "This resource specification was automatically generated
+     by the MenuEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the MenuEditor may not be able to read the specification."
+
+    "
+     MenuEditor new openOnClass:FileBrowser andSelector:#menuSpec
+     (Menu new fromLiteralArrayEncoding:(FileBrowser menuSpec)) startUp
+    "
+
+    <resource: #menu>
+
+    ^ 
+     #(Menu
+              (
+               (MenuItem
+                  label: 'FileBrowser Documentation'
+                  itemValue: openHTMLDocument:
+                  translateLabel: true
+                  argument: 'tools/fbrowser/TOP.html'
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  label: 'About FileBrowser...'
+                  itemValue: openAboutThisApplication
+                  translateLabel: true
+                )
+               )
+              nil
+              nil
+            )
+!
+
 historyMenuSpec
     "This resource specification was automatically generated
      by the MenuEditor of ST/X."
@@ -787,144 +1107,9 @@
          (MenuItem
             label: 'File'
             translateLabel: true
-            submenu: 
-           (Menu
-              (
-               (MenuItem
-                  label: 'Spawn'
-                  itemValue: fileSpawn
-                  translateLabel: true
-                )
-               (MenuItem
-                  label: '-'
-                )
-               (MenuItem
-                  enabled: hasSelection
-                  label: 'Open'
-                  itemValue: menuOpen
-                  translateLabel: true
-                  isVisible: false
-                )
-               (MenuItem
-                  enabled: hasFilenameSelectionInCodeView
-                  label: 'Open selected Filename'
-                  itemValue: openSelectedFilename
-                  translateLabel: true
-                  isVisible: hasFilenameSelectionInCodeView
-                )
-               (MenuItem
-                  enabled: hasSelection
-                  label: 'FileIn'
-                  itemValue: fileFileIn
-                  translateLabel: true
-                )
-               (MenuItem
-                  enabled: hasSelection
-                  label: 'FileInTo NameSpace...'
-                  itemValue: fileFileInToNameSpace
-                  translateLabel: true
-                )
-               (MenuItem
-                  label: '-'
-                )
-               (MenuItem
-                  label: 'New'
-                  translateLabel: true
-                  submenu: 
-                 (Menu
-                    (
-                     (MenuItem
-                        label: 'Directory...'
-                        itemValue: newDirectory
-                        translateLabel: true
-                      )
-                     (MenuItem
-                        label: 'File...'
-                        itemValue: newFile
-                        translateLabel: true
-                      )
-                     (MenuItem
-                        label: 'Hard Link...'
-                        itemValue: newHardLink
-                        translateLabel: true
-                        isVisible: systemIsUnix
-                      )
-                     (MenuItem
-                        label: 'Symbolic Link...'
-                        itemValue: newSoftLink
-                        translateLabel: true
-                        isVisible: systemIsUnix
-                      )
-                     )
-                    nil
-                    nil
-                  )
-                )
-               (MenuItem
-                  enabled: hasSelection
-                  label: 'Remove'
-                  itemValue: fileRemove
-                  translateLabel: true
-                )
-               (MenuItem
-                  enabled: hasSelection
-                  label: 'Rename'
-                  itemValue: fileRename
-                  translateLabel: true
-                )
-               (MenuItem
-                  label: '-'
-                )
-               (MenuItem
-                  enabled: hasSelection
-                  label: 'Properties...'
-                  itemValue: fileGetLongInfo
-                  translateLabel: true
-                )
-               (MenuItem
-                  label: '-'
-                  isVisible: javaSupportLoaded
-                )
-               (MenuItem
-                  enabled: canAddToClassPath
-                  label: 'Add to Java ClassPath'
-                  itemValue: fileAddToJavaClassPath
-                  translateLabel: true
-                  isVisible: javaSupportLoaded
-                )
-               (MenuItem
-                  enabled: canRemoveFromClassPath
-                  label: 'Remove from Java ClassPath'
-                  itemValue: fileRemoveFromJavaClassPath
-                  translateLabel: true
-                  isVisible: javaSupportLoaded
-                )
-               (MenuItem
-                  enabled: canAddToSourcePath
-                  label: 'Add to Java SourcePath'
-                  itemValue: fileAddToJavaSourcePath
-                  translateLabel: true
-                  isVisible: javaSupportLoaded
-                )
-               (MenuItem
-                  enabled: canRemoveFromSourcePath
-                  label: 'Remove from Java SourcePath'
-                  itemValue: fileRemoveFromJavaSourcePath
-                  translateLabel: true
-                  isVisible: javaSupportLoaded
-                )
-               (MenuItem
-                  label: '-'
-                )
-               (MenuItem
-                  label: 'Exit'
-                  itemValue: menuExit
-                  translateLabel: true
-                )
-               )
-              nil
-              nil
-            )
+            submenuChannel: fileMenuSpec
+            keepLinkedMenu: true
+
           )
          (MenuItem
             label: 'Directory'
@@ -935,142 +1120,14 @@
          (MenuItem
             label: 'Edit'
             translateLabel: true
-            submenu: 
-           (Menu
-              (
-               (MenuItem
-                  enabled: hasSelection
-                  label: 'Edit File'
-                  itemValue: fileGet
-                  translateLabel: true
-                )
-               (MenuItem
-                  enabled: hasSelection
-                  label: 'Insert File'
-                  itemValue: fileInsert
-                  translateLabel: true
-                )
-               (MenuItem
-                  label: '-'
-                )
-               (MenuItem
-                  label: 'Copy File List'
-                  itemValue: copyFileList
-                  translateLabel: true
-                )
-               (MenuItem
-                  enabled: hasSelection
-                  label: 'Copy Selected Filename'
-                  itemValue: copySelectedFileName
-                  translateLabel: true
-                )
-               (MenuItem
-                  enabled: hasSelection
-                  label: 'Copy Selected Pathname'
-                  itemValue: copySelectedPathName
-                  translateLabel: true
-                )
-               (MenuItem
-                  label: 'Copy Command History'
-                  itemValue: copyCommandHistory
-                  translateLabel: true
-                )
-               (MenuItem
-                  label: '-'
-                )
-               (MenuItem
-                  label: 'Visited Files'
-                  translateLabel: true
-                  submenuChannel: visitedFileMenuSpec
-                )
-               )
-              nil
-              nil
-            )
+            submenuChannel: editMenuSpec
+            keepLinkedMenu: true
           )
          (MenuItem
             label: 'View'
             translateLabel: true
-            submenu: 
-           (Menu
-              (
-               (MenuItem
-                  label: 'Show Details'
-                  translateLabel: true
-                  indication: showingDetails
-                )
-               (MenuItem
-                  enabled: showingDetails
-                  label: 'Show Time && Date'
-                  translateLabel: true
-                  indication: showingTimeAndDate
-                )
-               (MenuItem
-                  label: 'Show Hidden Files'
-                  translateLabel: true
-                  indication: showingHiddenFiles
-                )
-               (MenuItem
-                  label: 'Show Big Image Preview'
-                  translateLabel: true
-                  indication: showingBigImagePreview
-                )
-               (MenuItem
-                  label: '-'
-                )
-               (MenuItem
-                  label: 'Sort by Name'
-                  translateLabel: true
-                  choice: sortByWhat
-                  choiceValue: name
-                )
-               (MenuItem
-                  label: 'Sort by Type'
-                  translateLabel: true
-                  choice: sortByWhat
-                  choiceValue: type
-                )
-               (MenuItem
-                  label: 'Sort by Time'
-                  translateLabel: true
-                  choice: sortByWhat
-                  choiceValue: time
-                )
-               (MenuItem
-                  label: 'Ignore Case in Sort'
-                  translateLabel: true
-                  indication: sortCaseless
-                )
-               (MenuItem
-                  label: '-'
-                )
-               (MenuItem
-                  label: 'Encoding...'
-                  itemValue: fileEncoding
-                  translateLabel: true
-                )
-               (MenuItem
-                  label: 'DOS EndOfLine Mode'
-                  translateLabel: true
-                  indication: dosEOLMode
-                )
-               (MenuItem
-                  label: '-'
-                )
-               (MenuItem
-                  label: 'Update'
-                  itemValue: updateCurrentDirectory
-                  translateLabel: true
-                )
-               (MenuItem
-                  label: 'AutoUpdate'
-                  translateLabel: true
-                  indication: autoUpdate
-                )
-               )
-              nil
-              nil
-            )
+            submenuChannel: viewMenuSpec
+            keepLinkedMenu: true
           )
          (MenuItem
             label: 'Tools'
@@ -1081,77 +1138,15 @@
          (MenuItem
             label: 'CVS'
             translateLabel: true
-            submenu: 
-           (Menu
-              (
-               (MenuItem
-                  enabled: hasSelection
-                  label: 'Update Selected Files/Directories'
-                  itemValue: cvsUpdateSelection
-                  translateLabel: true
-                )
-               (MenuItem
-                  label: 'Update Directory Local'
-                  itemValue: cvsUpdateDirectoryLocal
-                  translateLabel: true
-                )
-               (MenuItem
-                  label: 'Update Directory Recursive'
-                  itemValue: cvsUpdateDirectoryRecursive
-                  translateLabel: true
-                )
-               (MenuItem
-                  label: '-'
-                )
-               (MenuItem
-                  label: 'Commit...'
-                  itemValue: cvsCommitSelection
-                  translateLabel: true
-                )
-               (MenuItem
-                  label: 'Add && Commit...'
-                  itemValue: cvsAddAndCommitSelection
-                  translateLabel: true
-                )
-               (MenuItem
-                  label: '-'
-                )
-               (MenuItem
-                  enabled: canRemoveCVSContainer
-                  label: 'Remove File && CVS Container...'
-                  itemValue: cvsRemoveFileAndContainer
-                  translateLabel: true
-                )
-               )
-              nil
-              nil
-            )
+            submenuChannel: cvsMenuSpec
+            keepLinkedMenu: true
           )
          (MenuItem
             label: 'Help'
             translateLabel: true
             startGroup: conditionalRight
-            submenu: 
-           (Menu
-              (
-               (MenuItem
-                  label: 'FileBrowser Documentation'
-                  itemValue: openHTMLDocument:
-                  translateLabel: true
-                  argument: 'tools/fbrowser/TOP.html'
-                )
-               (MenuItem
-                  label: '-'
-                )
-               (MenuItem
-                  label: 'About FileBrowser...'
-                  itemValue: openAboutThisApplication
-                  translateLabel: true
-                )
-               )
-              nil
-              nil
-            )
+            submenuChannel: helpMenuSpec
+            keepLinkedMenu: true
           )
          )
         nil
@@ -1381,6 +1376,102 @@
     "Modified: / 14-02-2011 / 17:17:33 / cg"
 !
 
+viewMenuSpec
+    "This resource specification was automatically generated
+     by the MenuEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the MenuEditor may not be able to read the specification."
+
+    "
+     MenuEditor new openOnClass:FileBrowser andSelector:#menuSpec
+     (Menu new fromLiteralArrayEncoding:(FileBrowser menuSpec)) startUp
+    "
+
+    <resource: #menu>
+
+    ^ 
+     #(Menu
+              (
+               (MenuItem
+                  label: 'Show Details'
+                  translateLabel: true
+                  indication: showingDetails
+                )
+               (MenuItem
+                  enabled: showingDetails
+                  label: 'Show Time && Date'
+                  translateLabel: true
+                  indication: showingTimeAndDate
+                )
+               (MenuItem
+                  label: 'Show Hidden Files'
+                  translateLabel: true
+                  indication: showingHiddenFiles
+                )
+               (MenuItem
+                  label: 'Show Big Image Preview'
+                  translateLabel: true
+                  indication: showingBigImagePreview
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  label: 'Sort by Name'
+                  translateLabel: true
+                  choice: sortByWhat
+                  choiceValue: name
+                )
+               (MenuItem
+                  label: 'Sort by Type'
+                  translateLabel: true
+                  choice: sortByWhat
+                  choiceValue: type
+                )
+               (MenuItem
+                  label: 'Sort by Time'
+                  translateLabel: true
+                  choice: sortByWhat
+                  choiceValue: time
+                )
+               (MenuItem
+                  label: 'Ignore Case in Sort'
+                  translateLabel: true
+                  indication: sortCaseless
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  label: 'Encoding...'
+                  itemValue: fileEncoding
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: 'DOS EndOfLine Mode'
+                  translateLabel: true
+                  indication: dosEOLMode
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  label: 'Update'
+                  itemValue: updateCurrentDirectory
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: 'AutoUpdate'
+                  translateLabel: true
+                  indication: autoUpdate
+                )
+               )
+              nil
+              nil
+            )
+!
+
 visitedFileMenuSpec
 
     <resource: #programMenu>
@@ -7439,10 +7530,10 @@
 !FileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.663 2014-07-08 14:40:53 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.664 2014-09-25 15:16:17 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.663 2014-07-08 14:40:53 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.664 2014-09-25 15:16:17 cg Exp $'
 ! !