OldLauncher.st
changeset 57 36e13831b62d
parent 56 d0cb937cbcaa
child 73 e332d9c71624
--- a/OldLauncher.st	Mon Nov 28 22:11:47 1994 +0100
+++ b/OldLauncher.st	Mon Feb 06 02:01:18 1995 +0100
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1991 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libtool/OldLauncher.st,v 1.19 1994-11-28 21:11:40 claus Exp $
+$Header: /cvs/stx/stx/libtool/OldLauncher.st,v 1.20 1995-02-06 01:00:03 claus Exp $
 '!
 
 !Launcher class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libtool/OldLauncher.st,v 1.19 1994-11-28 21:11:40 claus Exp $
+$Header: /cvs/stx/stx/libtool/OldLauncher.st,v 1.20 1995-02-06 01:00:03 claus Exp $
 "
 !
 
@@ -265,6 +265,7 @@
 				'cube (wireframe)'
 				'cube (solid)'
 				'cube (light)'
+				'cube (light & texture)'
 				'sphere (wireframe)'
 				'sphere (light)'
 				'planet'
@@ -277,6 +278,7 @@
 				startGLWireCubeDemo
 				startGLCubeDemo
 				startGLCubeDemo2
+				startGLBrickCubeDemo
 				startGLWireSphereDemo
 				startGLSphereDemo
 				startGLPlanetDemo
@@ -484,20 +486,41 @@
 
     "
      catch errors - dont want a debugger here ...
+     (this must be done here, since #initialize runs under another process)
     "
     Processor activeProcess emergencySignalHandler:[:ex |
 	|box|
 
-	box := YesNoBox title:('Error while launching ...\' , ex errorString , '\\debug ?') withCRs.
+"/ old:
+"/        box := YesNoBox title:('Error while launching ...\' , ex errorString , '\\debug ?') withCRs.
+"/        "
+"/         icon should be whatever WarnBoxes use as icon
+"/        "
+"/        box formLabel form:(WarningBox new formLabel label).
+"/        box yesAction:[Debugger 
+"/                           enter:ex suspendedContext
+"/                           withMessage:ex errorString].
+
+"/ new:
+	box := OptionBox 
+		title:('Error while launching ...\' , ex errorString , '\\') withCRs
+		numberOfOptions:3.
+	box label:'Warning'.
 	"
 	 icon should be whatever WarnBoxes use as icon
 	"
-	box formLabel form:(WarningBox new formLabel label).
-	box yesAction:[Debugger 
-			   enter:ex suspendedContext
-			   withMessage:ex errorString].
+	box form:(WarningBox new formLabel label).
+	box buttonTitles:(resources array:#('abort' 'continue' 'debug')).
+	box actions:(Array with:[AbortSignal raise]
+			   with:[ex resume]
+			   with:[Debugger 
+					enter:ex suspendedContext
+					withMessage:ex errorString.
+				 ex resume.]
+		    ).
+
 	box showAtPointer.
-	Object abortSignal raise.
+	AbortSignal raise.
     ].
 !
 
@@ -506,8 +529,8 @@
      then adjust my size"
 
     super reinitialize.
-    myMenu reinitialize.
-    self extent:(myMenu extent).
+"/    myMenu reinitialize.
+"/    self extent:(myMenu extent).
 !
 
 destroy
@@ -599,8 +622,7 @@
 startHierarchyBrowser
     |enterBox|
 
-    enterBox := EnterBox new.
-    enterBox title:(resources at:'name of class:') withCRs.
+    enterBox := EnterBox title:(resources at:'name of class:') withCRs.
     " enterBox abortText:(resources at:'abort')." "this is the default anyway"
     enterBox okText:(resources at:'browse').
 
@@ -620,8 +642,7 @@
 startImplementorsBrowser
     |enterBox|
 
-    enterBox := EnterBox new.
-    enterBox title:(resources at:'selector:') withCRs.
+    enterBox := EnterBox title:(resources at:'selector:') withCRs.
     " enterBox abortText:(resources at:'abort')." "this is the default anyway"
     enterBox okText:(resources at:'browse').
 
@@ -634,8 +655,7 @@
 startSendersBrowser
     |enterBox|
 
-    enterBox := EnterBox new.
-    enterBox title:(resources at:'selector:') withCRs.
+    enterBox := EnterBox title:(resources at:'selector:') withCRs.
     " enterBox abortText:(resources at:'abort')." "this is the default anyway"
     enterBox okText:(resources at:'browse').
 
@@ -668,8 +688,7 @@
 saveImage
     |saveBox|
 
-    saveBox := EnterBox new.
-    saveBox title:(resources at:'filename for image:') withCRs.
+    saveBox := EnterBox title:(resources at:'filename for image:') withCRs.
     saveBox okText:(resources at:'save').
     saveBox action:[:fileName | 
 	(ObjectMemory snapShotOn:fileName) ifFalse:[
@@ -677,21 +696,22 @@
 	     snapshot failed for some reason (disk full, no permission etc.)
 	     Do NOT exit in this case.
 	    "
-	    self warn:(resources string:'failed to save snapshot image').
+	    self warn:(resources string:'failed to save snapshot image (disk full or not writable)').
 	]
     ].
 
     saveBox initialText:(ObjectMemory nameForSnapshot).
+    saveBox label:'save image'.
     saveBox showAtPointer
 !
 
 exitSmalltalk
     |exitBox|
 
-    exitBox := EnterBox2 new.
-    exitBox title:(resources at:'save state before exiting ?\\filename for image:') withCRs.
+    exitBox := EnterBox2 title:(resources at:'save state before exiting ?\\filename for image:') withCRs.
     exitBox okText:(resources at:'exit').
     exitBox okText2:(resources at:'save & exit').
+    exitBox label:'exit Smalltalk'.
 
     exitBox action:[:dummyName | 
 	self closeDownViews.
@@ -704,7 +724,7 @@
 	     snapshot failed for some reason (disk full, no permission etc.)
 	     Do NOT exit in this case.
 	    "
-	    self warn:(resources string:'failed to save snapshot image').
+	    self warn:(resources string:'failed to save snapshot image (disk full or not writable)').
 	] ifTrue:[
 	    "
 	     closeDownViews tells all views to shutdown neatly 
@@ -853,7 +873,7 @@
 projectMenu
     "this is sent, if ST/X has been built without Projects/ChangeSets."
 
-    self warn:'The system has been built without support for Project'.
+    self warn:'The system has been built without support for projects'.
 !
 
 newProject
@@ -965,6 +985,10 @@
     GLCubeDemoView2 open
 !
 
+startGLBrickCubeDemo
+    GLBrickCubeDemoView open
+!
+
 startGLTetraDemo
     GLTetraDemoView open
 !
@@ -1003,7 +1027,7 @@
 !
 
 showAbout
-    |box dark green|
+    |box dark green lbl|
 
     device hasColors ifTrue:[
 	green := (Color red:0 green:80 blue:20) darkened.
@@ -1018,13 +1042,11 @@
 
     box := InfoBox new.
     box viewBackground:dark; allSubViewsDo:[:s | s viewBackground:dark].
-    box form:(Form 
-		   fromFile:'SmalltalkX.xbm' 
-		   resolution:100).
-    box formLabel viewBackground:dark.
-    box formLabel foregroundColor:green backgroundColor:dark.
-    box textLabel viewBackground:dark.
-    box textLabel foregroundColor:White backgroundColor:dark.
+    box form:(Form fromFile:'SmalltalkX.xbm' resolution:100).
+    (lbl := box formLabel) viewBackground:dark.
+    lbl foregroundColor:green backgroundColor:dark.
+    (lbl := box textLabel) viewBackground:dark.
+    lbl foregroundColor:White backgroundColor:dark.
     box title:
 'Smalltalk/X