checkin from browser
authorClaus Gittinger <cg@exept.de>
Sat, 06 Mar 1999 13:25:40 +0100
changeset 2055 ceccc8b799bd
parent 2054 7daf475fe6fe
child 2056 4f78683e96ac
checkin from browser
OldLauncher.st
--- a/OldLauncher.st	Sat Mar 06 04:14:58 1999 +0100
+++ b/OldLauncher.st	Sat Mar 06 13:25:40 1999 +0100
@@ -134,16 +134,11 @@
 !
 
 showOnlineHelp:baseName
-    self warn:'HTML online help support is is not included in this package.
-Use any HTML viewer on the files found in doc/online.
-
-Starting view on ascii version of the text ....
-'.
-    self showDocumentFile:'doc/online/english/' , baseName
+    self showDocumentFile:baseName
 !
 
 showOverview
-    self showDocumentFile:'misc/overview'
+    self showDocumentFile:'overview/TOP'
 !
 
 warnIfAbsent:aPath
@@ -245,369 +240,369 @@
 
 initializeMenu
     myMenu := ClickMenuView 
-		labels:(resources array:#(
-				'Browsers'
-				'Workspace'
-				'File Browser'
-				'Projects'
-				'-'
-				'Utilities'
-				'Goodies'
-				'Games & Demos'
-				'-'
-				'info & help'
-				'-'
-				'snapshot'
-				'-'
-				'exit'
-			))
-		selectors:#(browserMenu
-			    startWorkspace
-			    startFileBrowser
-			    projectMenu
-			    nil
-			    utilityMenu
-			    goodyMenu
-			    gamesMenu
-			    nil
-			    helpMenu
-			    nil
-			    saveImage
-			    nil
-			    exitSmalltalk
-			   )
-		receiver:self
-		      in:self.
+                labels:(resources array:#(
+                                'Browsers'
+                                'Workspace'
+                                'File Browser'
+                                'Projects'
+                                '-'
+                                'Utilities'
+                                'Goodies'
+                                'Games & Demos'
+                                '-'
+                                'info & help'
+                                '-'
+                                'snapshot'
+                                '-'
+                                'exit'
+                        ))
+                selectors:#(browserMenu
+                            startWorkspace
+                            startFileBrowser
+                            projectMenu
+                            nil
+                            utilityMenu
+                            goodyMenu
+                            gamesMenu
+                            nil
+                            helpMenu
+                            nil
+                            saveImage
+                            nil
+                            exitSmalltalk
+                           )
+                receiver:self
+                      in:self.
 
     myMenu subMenuAt:#browserMenu put:(
-	PopUpMenu labels:(resources array:#(
-			    'System Browser'
-			    'Class Hierarchy Browser'
-			    'Implementors'
-			    'Senders'
-			    '-'
-			    'Changes Browser'
-			    '-'
-			    'Directory Browser'
-			   ))
-	       selectors:#(
-			    startSystemBrowser
-			    startHierarchyBrowser
-			    startImplementorsBrowser
-			    startSendersBrowser
-			    nil
-			    startChangesBrowser
-			    nil
-			    startDirectoryBrowser
-			   )
-		receiver:self
-		     for:self
+        PopUpMenu labels:(resources array:#(
+                            'System Browser'
+                            'Class Hierarchy Browser'
+                            'Implementors'
+                            'Senders'
+                            '-'
+                            'Changes Browser'
+                            '-'
+                            'Directory Browser'
+                           ))
+               selectors:#(
+                            startSystemBrowser
+                            startHierarchyBrowser
+                            startImplementorsBrowser
+                            startSendersBrowser
+                            nil
+                            startChangesBrowser
+                            nil
+                            startDirectoryBrowser
+                           )
+                receiver:self
+                     for:self
 
     ).
 
     myMenu subMenuAt:#utilityMenu put:(
-	PopUpMenu labels:(resources array:#(
-			    'Transcript'
-			    '-'
-			    'Window tree'
-			    'View inspect'
-			    'View destroy'
-			    'Class tree'
-			    '-'
-			    'Event monitor'
-			    'Process monitor'
-			    'Memory monitor'
-			    'Memory usage'
-			    '-'
-			    'collect Garbage'
-			    'collect Garbage & compress'
-			    '-'
-			    'full screen hardcopy'
-			    'screen area hardcopy'
-			    'view hardcopy'
-			    '-'
-			    'ScreenSaver'
-			   ))
-	       selectors:#(
-			    startTranscript
-			    nil
-			    startWindowTreeView
-			    viewInspector
-			    viewKiller
-			    startClassTreeView
-			    nil
-			    startEventMonitor
-			    startProcessMonitor
-			    startMemoryMonitor
-			    startMemoryUsage
-			    nil
-			    garbageCollect
-			    compressingGarbageCollect
-			    nil
-			    fullScreenHardcopy
-			    screenHardcopy
-			    viewHardcopy
-			    nil
-			    screenSaverMenu
-			   )
-		receiver:self
-		     for:self
+        PopUpMenu labels:(resources array:#(
+                            'Transcript'
+                            '-'
+                            'Window tree'
+                            'View inspect'
+                            'View destroy'
+                            'Class tree'
+                            '-'
+                            'Event monitor'
+                            'Process monitor'
+                            'Memory monitor'
+                            'Memory usage'
+                            '-'
+                            'collect Garbage'
+                            'collect Garbage & compress'
+                            '-'
+                            'full screen hardcopy'
+                            'screen area hardcopy'
+                            'view hardcopy'
+                            '-'
+                            'ScreenSaver'
+                           ))
+               selectors:#(
+                            startTranscript
+                            nil
+                            startWindowTreeView
+                            viewInspector
+                            viewKiller
+                            startClassTreeView
+                            nil
+                            startEventMonitor
+                            startProcessMonitor
+                            startMemoryMonitor
+                            startMemoryUsage
+                            nil
+                            garbageCollect
+                            compressingGarbageCollect
+                            nil
+                            fullScreenHardcopy
+                            screenHardcopy
+                            viewHardcopy
+                            nil
+                            screenSaverMenu
+                           )
+                receiver:self
+                     for:self
     ).
 
     (myMenu subMenuAt:#utilityMenu) subMenuAt:#screenSaverMenu put:(
-	PopUpMenu labels:(resources array:#(
-			    'simple'
-			    'spotlight'
-			    'moving spotlight'
-			   ))
-	       selectors:#(
-			    startScreenSaver1
-			    startScreenSaver2
-			    startScreenSaver3
-			   )
-		receiver:self
-		     for:self
+        PopUpMenu labels:(resources array:#(
+                            'simple'
+                            'spotlight'
+                            'moving spotlight'
+                           ))
+               selectors:#(
+                            startScreenSaver1
+                            startScreenSaver2
+                            startScreenSaver3
+                           )
+                receiver:self
+                     for:self
     ).
 
     (Screen current isKindOf:GLXWorkstation) ifTrue:[
-	myMenu subMenuAt:#gamesMenu put:(
-	    PopUpMenu labels:(resources array:#(
-				'Tetris'
-				'TicTacToe'
-				'-'
-				'PenDemo'
-				'CommanderDemo' 
-				'-'
-				'Animation'
-				'Globe'
-				'-'
-				'GL 3D demos'
-				'-'
-				'LogicTool'
-			       ))
-		   selectors:#(
-				startTetris
-				startTicTacToe
-				nil
-				startPenDemo
-				startCommanderDemo
-				nil
-				startAnimation
-				startGlobeDemo
-				nil
-				glDemos
-				nil
-				startLogicTool
-			      )
-		    receiver:self
-			 for:self
-	).
-	(myMenu subMenuAt:#gamesMenu) subMenuAt:#glDemos put:(
-	    PopUpMenu labels:(resources array:#(
-				'plane'
-				'tetra'
-				'cube (wireframe)'
-				'cube (solid)'
-				'cube (light)'
-				'cube (light & texture)'
-				'sphere (wireframe)'
-				'sphere (light)'
-				'planet'
-				'teapot'
-				'logo'
-			       ))
-		    selector:#openDemo:
-			args:#(
-				GLPlaneDemoView2
-				GLTetraDemoView
-				GLWireCubeDemoView
-				GLCubeDemoView
-				GLCubeDemoView2
-				GLBrickCubeDemoView
-				GLWireSphereDemoView
-				GLSphereDemoView2
-				GLPlanetDemoView
-				GLTeapotDemo
-				Logo3DView1
-			      )
-		    receiver:self
-			 for:self
-	).
+        myMenu subMenuAt:#gamesMenu put:(
+            PopUpMenu labels:(resources array:#(
+                                'Tetris'
+                                'TicTacToe'
+                                '-'
+                                'PenDemo'
+                                'CommanderDemo' 
+                                '-'
+                                'Animation'
+                                'Globe'
+                                '-'
+                                'GL 3D demos'
+                                '-'
+                                'LogicTool'
+                               ))
+                   selectors:#(
+                                startTetris
+                                startTicTacToe
+                                nil
+                                startPenDemo
+                                startCommanderDemo
+                                nil
+                                startAnimation
+                                startGlobeDemo
+                                nil
+                                glDemos
+                                nil
+                                startLogicTool
+                              )
+                    receiver:self
+                         for:self
+        ).
+        (myMenu subMenuAt:#gamesMenu) subMenuAt:#glDemos put:(
+            PopUpMenu labels:(resources array:#(
+                                'plane'
+                                'tetra'
+                                'cube (wireframe)'
+                                'cube (solid)'
+                                'cube (light)'
+                                'cube (light & texture)'
+                                'sphere (wireframe)'
+                                'sphere (light)'
+                                'planet'
+                                'teapot'
+                                'logo'
+                               ))
+                    selector:#openDemo:
+                        args:#(
+                                GLPlaneDemoView2
+                                GLTetraDemoView
+                                GLWireCubeDemoView
+                                GLCubeDemoView
+                                GLCubeDemoView2
+                                GLBrickCubeDemoView
+                                GLWireSphereDemoView
+                                GLSphereDemoView2
+                                GLPlanetDemoView
+                                GLTeapotDemo
+                                Logo3DView1
+                              )
+                    receiver:self
+                         for:self
+        ).
     ] ifFalse:[
-	myMenu subMenuAt:#gamesMenu put:(
-	    PopUpMenu labels:(resources array:#(
-				'Tetris'
-				'TicTacToe'
-				'-'
-				'PenDemo'
-				'CommanderDemo' 
-				'-'
-				'Animation'
-				'Globe'
-				'-'
-				'LogicTool'
-			       ))
-		    selector:#openDemo:
-			args:#(
-				Tetris
-				TicTacToe
-				nil
-				PenDemo
-				CommanderDemo
-				nil
-				Animation
-				GlobeDemo
-				nil
-				LogicTool
-			      )
-		    receiver:self
-			 for:self
-	)
+        myMenu subMenuAt:#gamesMenu put:(
+            PopUpMenu labels:(resources array:#(
+                                'Tetris'
+                                'TicTacToe'
+                                '-'
+                                'PenDemo'
+                                'CommanderDemo' 
+                                '-'
+                                'Animation'
+                                'Globe'
+                                '-'
+                                'LogicTool'
+                               ))
+                    selector:#openDemo:
+                        args:#(
+                                Tetris
+                                TicTacToe
+                                nil
+                                PenDemo
+                                CommanderDemo
+                                nil
+                                Animation
+                                GlobeDemo
+                                nil
+                                LogicTool
+                              )
+                    receiver:self
+                         for:self
+        )
     ].
 
     Project notNil ifTrue:[
-	myMenu subMenuAt:#projectMenu put:(
-	    PopUpMenu labels:(resources array:#(
-				'new project'
-				'-'
-				'select project'
-			       ))
-		   selectors:#(
-				newProject
-				nil
-				selectProject
-			      )
-		    receiver:self
-			 for:self
-	).
+        myMenu subMenuAt:#projectMenu put:(
+            PopUpMenu labels:(resources array:#(
+                                'new project'
+                                '-'
+                                'select project'
+                               ))
+                   selectors:#(
+                                newProject
+                                nil
+                                selectProject
+                              )
+                    receiver:self
+                         for:self
+        ).
     ].
 
     myMenu subMenuAt:#goodyMenu put:(
-	PopUpMenu labels:(resources array:#(
-			    'Clock'
-			    'Round Clock'
+        PopUpMenu labels:(resources array:#(
+                            'Clock'
+                            'Round Clock'
 "
-			    'Address Book'
+                            'Address Book'
 "
-			    '-'
-			    'Calendar'
-			    'Directory View'
-			    'MailTool'
-			    'NewsTool'
-			    '-'
-			    'DrawTool'
-			   ))
-	       selectors:#(
-			    startClock
-			    startRoundClock
+                            '-'
+                            'Calendar'
+                            'Directory View'
+                            'MailTool'
+                            'NewsTool'
+                            '-'
+                            'DrawTool'
+                           ))
+               selectors:#(
+                            startClock
+                            startRoundClock
 "
-			    startAddressBook
+                            startAddressBook
 "
-			    nil
-			    startCalendar
-			    startDirectoryView
-			    startMailTool
-			    startNewsTool
-			    nil
-			    startDrawTool
-			  )
-		receiver:self
-		     for:self
+                            nil
+                            startCalendar
+                            startDirectoryView
+                            startMailTool
+                            startNewsTool
+                            nil
+                            startDrawTool
+                          )
+                receiver:self
+                     for:self
 
     ).
 
     myMenu subMenuAt:#helpMenu put:(
-	PopUpMenu labels:(resources array:#(
-			    'About'
-			    '-'
-			    'Overview'
-			    'Getting started'
-			    'Customizing'
-			    'Tools'
-			    'programming'
-			    'other topics'
-			    '-'
-			    'Help Browser'
-			   ))
-	       selectors:#(
-			    showAbout
-			    nil
-			    showOverview
-			    showGettingStarted
-			    showCustomizing
-			    tools
-			    programming
-			    otherTopics
-			    nil
-			    startOnlineHelpView
-			  )
-		receiver:self
-		     for:self
+        PopUpMenu labels:(resources array:#(
+                            'About'
+                            '-'
+                            'Overview'
+                            'Getting started'
+                            'Customizing'
+                            'Tools'
+                            'programming'
+                            'other topics'
+"/                            '-'
+"/                            'Help Browser'
+                           ))
+               selectors:#(
+                            showAbout
+                            nil
+                            showOverview
+                            showGettingStarted
+                            showCustomizing
+                            tools
+                            programming
+                            otherTopics
+"/                            nil
+"/                            startOnlineHelpView
+                          )
+                receiver:self
+                     for:self
 
     ).
 
     (myMenu subMenuAt:#helpMenu) subMenuAt:#tools put:(
-	PopUpMenu labels:(resources array:#(
-			    'System Browser'
-			    'File Browser'
-			    'Changes Browser'
-			    'Debugger'
-			    'Inspector'
-			   ))
-		selector:#showOnlineHelp:
-		    args:#('tools/sbrowser/TOP'
-			   'tools/fbrowser/TOP'
-			   'tools/cbrowser/TOP'
-			   'tools/debugger/TOP'
-			   'tools/inspector/misc/TOP')
-		receiver:self
-		     for:self
+        PopUpMenu labels:(resources array:#(
+                            'System Browser'
+                            'File Browser'
+                            'Changes Browser'
+                            'Debugger'
+                            'Inspector'
+                           ))
+                selector:#showOnlineHelp:
+                    args:#('tools/sbrowser/TOP'
+                           'tools/fbrowser/TOP'
+                           'tools/cbrowser/TOP'
+                           'tools/debugger/TOP'
+                           'tools/misc/TOP')
+                receiver:self
+                     for:self
 
     ).
 
     (myMenu subMenuAt:#helpMenu) subMenuAt:#otherTopics put:(
-	PopUpMenu labels:(resources array:#(
-			    'ST/X history'
-			    'Garbage collection'
-			    'Language & primitives'
-			    'Error messages'
-			    '-'
-			    'stc manual page'
-			    'smalltalk manual page'
-			   ))
-		selector:#showOnlineHelp:
-		    args:#('misc/history'
-			   'programming/GC'
-			   'programming/language'
-			   'programming/errormsg'
-			    nil
-			   'misc/stc'
-			   'misc/smalltalk')
-		receiver:self
-		     for:self
+        PopUpMenu labels:(resources array:#(
+                            'ST/X history'
+                            'Garbage collection'
+                            'Language & primitives'
+                            'Error messages'
+                            '-'
+                            'stc manual page'
+                            'smalltalk manual page'
+                           ))
+                selector:#showOnlineHelp:
+                    args:#('misc/history'
+                           'programming/GC'
+                           'programming/language'
+                           'programming/errormsg'
+                            nil
+                           'misc/stc'
+                           'misc/smalltalk')
+                receiver:self
+                     for:self
 
     ).
 
     (myMenu subMenuAt:#helpMenu) subMenuAt:#programming put:(
-	PopUpMenu labels:(resources array:#(
-			    'useful selectors'
-			    'views - quick intro'
-			    'breakpoints & tracing'
-			    'processes'
-			    'timers & delays'
-			    'exceptions & signals'
-			    'GL 3D graphics'
-			   ))
-		selector:#showOnlineHelp:
-		    args:#('programming/selectors'
-			   'programming/viewintro'
-			   'programming/debugging'
-			   'programming/processes'
-			   'programming/timing'
-			   'programming/exceptions'
-			   'misc/GL')
-		receiver:self
-		     for:self
+        PopUpMenu labels:(resources array:#(
+                            'useful selectors'
+                            'views - quick intro'
+                            'breakpoints & tracing'
+                            'processes'
+                            'timers & delays'
+                            'exceptions & signals'
+                            'GL 3D graphics'
+                           ))
+                selector:#showOnlineHelp:
+                    args:#('programming/selectors'
+                           'programming/viewintro'
+                           'programming/debugging'
+                           'programming/processes'
+                           'programming/timing'
+                           'programming/exceptions'
+                           'programming/GL')
+                receiver:self
+                     for:self
 
     ).
 !
@@ -841,23 +836,32 @@
 !
 
 showDocumentFile:name
-    |s f isRTF|
+    |s f relPath isHtml isRTF|
+
+    s := Smalltalk systemFileStreamFor:('doc/online/english/' , name , '.html').
+    s notNil ifTrue:[
+        s close.
+        HTMLDocumentView openFullOnDocumentationFile:name , '.html'. 
+        ^ self
+    ].
+
+    relPath := 'doc/online/english/' , name.
 
     isRTF := true.
-    s := Smalltalk systemFileStreamFor:name , '.rtf'.
+    s := Smalltalk systemFileStreamFor:relPath , '.rtf'.
     s isNil ifTrue:[
-	isRTF := false.
-	s := Smalltalk systemFileStreamFor:name , '.doc'.
-	s isNil ifTrue:[
-	    self warn:('document ' , name , ' (.rtf/.doc) not available.\\check your installation.' withCRs).
-	    ^ nil
-	].
+        isRTF := false.
+        s := Smalltalk systemFileStreamFor:relPath , '.doc'.
+        s isNil ifTrue:[
+            self warn:('document ' , relPath , ' (.rtf/.doc) not available.\\check your installation.' withCRs).
+            ^ nil
+        ].
     ].
     f := s pathName.
 
     isRTF ifTrue:[
-	DocumentView openOn:f.
-	^ self
+        DocumentView openOn:f.
+        ^ self
     ].
 
     (Workspace openOn:f) readOnly
@@ -1016,5 +1020,5 @@
 !OldLauncher class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/OldLauncher.st,v 1.38 1999-02-11 10:24:25 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/OldLauncher.st,v 1.39 1999-03-06 12:25:40 cg Exp $'
 ! !