--- a/NewLauncher.st	Thu Sep 26 20:47:50 2002 +0200
+++ b/NewLauncher.st	Thu Sep 26 22:09:20 2002 +0200
@@ -1003,7 +1003,7 @@
             #activeHelpKey: #classesSystemBrowser
             #showBusyCursorWhilePerforming: true
             #argument: 'SystemBrowser'
-            #labelImage: #(#ResourceRetriever nil #startSystemBrowserIcon 'System Browser')
+            #labelImage: #(#ResourceRetriever nil #startSystemBrowserIcon '')
             #submenuChannel: #menuClassHistory
           )
          #(#MenuItem
@@ -1667,12 +1667,13 @@
         #(
          #(#MenuItem
             #label: 'File Browser'
+            #translateLabel: true
             #nameKey: #fileBrowser
-            #translateLabel: true
+            #isVisible: #fileBrowserItemVisible
             #value: #openApplication:
             #activeHelpKey: #fileFileBrowser
             #argument: 'FileBrowser'
-            #labelImage: #(#ResourceRetriever nil #startFileBrowserIcon 'File Browser')
+            #labelImage: #(#ResourceRetriever nil #startFileBrowserIcon '')
           )
          #(#MenuItem
             #label: '-'
@@ -1717,16 +1718,16 @@
           )
          #(#MenuItem
             #label: 'Save Image'
+            #translateLabel: true
             #nameKey: #saveImage
-            #translateLabel: true
             #value: #saveImage
             #activeHelpKey: #fileSaveImage
             #enabled: #enableDangerousMenuItemsInRemoteLauncher
           )
          #(#MenuItem
             #label: 'Save Image As...'
+            #translateLabel: true
             #nameKey: #saveImageAs
-            #translateLabel: true
             #value: #saveImageAs
             #activeHelpKey: #fileSaveImageAs
             #enabled: #enableDangerousMenuItemsInRemoteLauncher
@@ -1736,8 +1737,8 @@
           )
          #(#MenuItem
             #label: 'Exit Smalltalk...'
+            #translateLabel: true
             #nameKey: #exitSmalltalk
-            #translateLabel: true
             #isVisible: #isMainLauncherHolder
             #value: #exit
             #activeHelpKey: #fileExit
@@ -2543,7 +2544,7 @@
             #nameKey: #bugMessages
             #isVisible: #bugReporterAvailable
             #value: #startBugMessages
-            #labelImage: #(#ResourceRetriever #ToolbarIconLibrary #bugReporterIcon 'Bug Reporter')
+            #labelImage: #(#ResourceRetriever #NewLauncher #bugReporterIcon 'Bug Reporter')
           )
          #(#MenuItem
             #label: 'SUnit Test'
@@ -2809,6 +2810,13 @@
 
 !NewLauncher class methodsFor:'resources'!
 
+bugReporterIcon
+    <resource: #programImage>
+
+    ^ ToolbarIconLibrary bugReporter24x24Icon    
+    "/ ^ ToolbarIconLibrary bugReporter28x28Icon    
+!
+
 garbageCollectIcon
     <resource: #programImage>
 
@@ -2818,43 +2826,62 @@
 saveImageIcon
     <resource: #programImage>
 
-    ^ ToolbarIconLibrary saveImage28x28Icon
+    ^ ToolbarIconLibrary saveImage24x24Icon
+    "/ ^ ToolbarIconLibrary saveImage28x28Icon
 !
 
 startChangesBrowserIcon
     <resource: #programImage>
 
-    ^ ToolbarIconLibrary changesBrowser28x28Icon
+    ^ ToolbarIconLibrary changesBrowser24x24Icon
+    "/ ^ ToolbarIconLibrary changesBrowser28x28Icon
 !
 
 startFileBrowserIcon
     <resource: #programImage>
 
-    ^ ToolbarIconLibrary fileBrowser28x28Icon
+    ^ ToolbarIconLibrary fileBrowser24x24Icon
+    "/ ^ ToolbarIconLibrary fileBrowser28x28Icon
 !
 
 startImageEditorIcon
     <resource: #programImage>
 
-    ^ ToolbarIconLibrary imageEditor28x28Icon
+    ^ ToolbarIconLibrary imageEditor24x24Icon
+    "/ ^ ToolbarIconLibrary imageEditor28x28Icon
 !
 
 startMenuEditorIcon
     <resource: #programImage>
 
-    ^ ToolbarIconLibrary menuEditor28x28Icon
+    ^ ToolbarIconLibrary menuEditor24x24Icon
+    "/ ^ ToolbarIconLibrary menuEditor28x28Icon
+!
+
+startNewFileBrowserIcon
+    <resource: #programImage>
+
+    ^ ToolbarIconLibrary newFileBrowser24x24Icon
+!
+
+startNewSystemBrowserIcon
+    <resource: #programImage>
+
+    ^ ToolbarIconLibrary newSystemBrowser24x24Icon
 !
 
 startSUnitIcon
     <resource: #programImage>
 
-    ^ ToolbarIconLibrary sUnit28x28Icon    
+    ^ ToolbarIconLibrary sUnit24x24Icon    
+    "/ ^ ToolbarIconLibrary sUnit28x28Icon    
 !
 
 startSystemBrowserIcon
     <resource: #programImage>
 
-    ^ SystemBrowser defaultIcon
+    ^ ToolbarIconLibrary systemBrowser24x24Icon
+"/    ^ SystemBrowser defaultIcon
 !
 
 startSystemBrowserOnHistoryClassIcon
@@ -2866,13 +2893,15 @@
 startUIPainterIcon
     <resource: #programImage>
 
-    ^ ToolbarIconLibrary uiPainter28x28Icon
+    ^ ToolbarIconLibrary uiPainter24x24Icon
+    "/ ^ ToolbarIconLibrary uiPainter28x28Icon
 !
 
 startWorkspaceIcon
     <resource: #programImage>
 
-    ^ ToolbarIconLibrary workspace28x28Icon
+    ^ ToolbarIconLibrary workspace24x24Icon
+    "/ ^ ToolbarIconLibrary workspace28x28Icon
 ! !
 
 !NewLauncher methodsFor:'accessing'!
@@ -2936,6 +2965,10 @@
     ^ holder
 !
 
+fileBrowserItemVisible
+    ^ self visibleHolderFor:#fileBrowser
+!
+
 isMainLauncherHolder
     ^ [ isMainLauncher ]
 !
@@ -2966,6 +2999,10 @@
 
 showActiveHelpMenuItem
     ^ false
+!
+
+systemBrowserItemVisible
+    ^ self visibleHolderFor:#systemBrowser
 ! !
 
 !NewLauncher methodsFor:'change & update'!
@@ -3491,7 +3528,7 @@
                 ifFalse:[
                     changeHistory add:change.
                     changeHistory size > 15 ifTrue:[
-                        exit value
+                        exit value:nil
                     ]
                 ].
             ].
@@ -4064,5 +4101,5 @@
 !NewLauncher class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.263 2002-09-26 08:59:31 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.264 2002-09-26 20:09:20 cg Exp $'
 ! !