Mercurial Mercurial > hg > stx-libtool / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
.
authorclaus
Sun, 02 Apr 1995 13:45:20 +0200
changeset 91 8f93ebef8762
parent 90 60d0bb749a1c
child 92 e9cc2640660f
.
Launcher.st file | annotate | diff | comparison | revisions
MemMonitor.st file | annotate | diff | comparison | revisions
MemoryMonitor.st file | annotate | diff | comparison | revisions 
--- a/Launcher.st	Fri Mar 31 05:07:47 1995 +0200
+++ b/Launcher.st	Sun Apr 02 13:45:20 1995 +0200
@@ -37,7 +37,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.4 1995-03-31 03:07:27 claus Exp $
+$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.5 1995-04-02 11:45:20 claus Exp $
 "
 ! !
 
@@ -133,7 +133,6 @@
 				     'tools'
 				     'projects'
 				     'settings'
-				     'goodies'
 				     'demos'
 				     'help')).
     myMenu labels at:1 put:(self class aboutIcon).
@@ -145,7 +144,6 @@
 				     #tools 
 				     #projects 
 				     #settings
-				     #goodies
 				     #demos
 				     #help).
 
@@ -255,23 +253,6 @@
 		      )
 	   receiver:self.
 
-    myMenu at:#goodies 
-	   putLabels:(resources array:#(
-					'clock'
-					'calendar'
-					'-'
-					'mail tool'
-					'news tool'
-					))
-	   selectors:#(
-					#startClock 
-					#startCalendar 
-					nil
-					#startMailTool 
-					#startNewsTool
-		      )
-	   receiver:self.
-
     self setupDemoMenu.
 
     ActiveHelp notNil ifTrue:[
@@ -394,6 +375,7 @@
 
     myMenu at:#demos 
 	   putLabels:(resources array:#(
+					'goodies'
 					'games'
 					'geometric designs'
 					'simple animations'
@@ -401,6 +383,7 @@
 					'graphic editors'
 				       ))
 	   selectors:#(
+					goodies
 					games
 					geometricDesigns
 					simpleAnimations
@@ -439,7 +422,7 @@
 		args:#(
 					   PenDemo
 					   CommanderDemo
-			   )
+		      )
 		receiver:self).
 
     m subMenuAt:#simpleAnimations 
@@ -452,7 +435,7 @@
 		args:#(
 					   Animation
 					   GlobeDemo
-			   )
+		      )
 		receiver:self).
 
     m subMenuAt:#'3Dgraphics' 
@@ -484,7 +467,7 @@
 				GLPlanetDemoView
 				GLTeapotDemo
 				Logo3DView1
-			      )
+		      )
 		receiver:self).
 
     m subMenuAt:#graphicEditors 
@@ -497,10 +480,27 @@
 		args:#(
 					   DrawTool
 					   LogicTool
-			   )
+		      )
 		receiver:self).
 
-
+    m subMenuAt:#goodies 
+      put:(PopUpMenu
+		labels:(resources array:#(
+					'clock'
+					'calendar'
+					'-'
+					'mail tool'
+					'news tool'
+					))
+		selector:#openDemo:
+		args:#(
+					Clock 
+					Calendar 
+					nil
+					MailView 
+					NewsView
+		      )
+		receiver:self).
 !
 
 buttonPanelSpec
@@ -951,4 +951,3 @@
     ].
     ^ nil
 ! !
-
--- a/MemMonitor.st	Fri Mar 31 05:07:47 1995 +0200
+++ b/MemMonitor.st	Sun Apr 02 13:45:20 1995 +0200
@@ -25,7 +25,7 @@
  COPYRIGHT (c) 1991 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libtool/Attic/MemMonitor.st,v 1.12 1995-03-25 22:24:28 claus Exp $
+$Header: /cvs/stx/stx/libtool/Attic/MemMonitor.st,v 1.13 1995-04-02 11:45:14 claus Exp $
 '!
 
 !MemoryMonitor class methodsFor:'documentation'!
@@ -46,7 +46,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libtool/Attic/MemMonitor.st,v 1.12 1995-03-25 22:24:28 claus Exp $
+$Header: /cvs/stx/stx/libtool/Attic/MemMonitor.st,v 1.13 1995-04-02 11:45:14 claus Exp $
 "
 !
 
@@ -117,7 +117,7 @@
      gWidth shift scaleChange margin mustWait|
 
     shown ifTrue:[
-	oldSpaceUsed := ObjectMemory oldSpaceUsed + ObjectMemory fixSpaceUsed.
+	oldSpaceUsed := ObjectMemory oldSpaceUsed + ObjectMemory symSpaceUsed.
 	newSpaceUsed := ObjectMemory newSpaceUsed.
 	freeMem := ObjectMemory freeListSpace.
 	total := oldSpaceUsed + newSpaceUsed.
@@ -205,7 +205,7 @@
 	    lx := org
 	].
 
-	total := ObjectMemory fixSpaceSize 
+	total := ObjectMemory symSpaceSize 
 		 + ObjectMemory oldSpaceSize 
 		 + ObjectMemory newSpaceSize.
 
@@ -281,10 +281,10 @@
     |oldSpaceSize newSpaceSize memUsed oldMemUsed newMemUsed freeMem free2 
      x y half s thisStringLen fontHeight total n|
 
-    oldMemUsed := ObjectMemory oldSpaceUsed + ObjectMemory fixSpaceUsed.
+    oldMemUsed := ObjectMemory oldSpaceUsed + ObjectMemory symSpaceUsed.
     newMemUsed := ObjectMemory newSpaceUsed.
     freeMem := ObjectMemory freeListSpace.
-    oldSpaceSize := ObjectMemory oldSpaceSize + ObjectMemory fixSpaceSize.
+    oldSpaceSize := ObjectMemory oldSpaceSize + ObjectMemory symSpaceSize.
     newSpaceSize := ObjectMemory newSpaceSize.
 
     memUsed := oldMemUsed + newMemUsed "- freeMem".
@@ -518,7 +518,7 @@
     level := 0.
 
     maxTotal := minTotal := ObjectMemory oldSpaceSize 
-			    + ObjectMemory fixSpaceSize
+			    + ObjectMemory symSpaceSize
 			    + ObjectMemory newSpaceSize.
 
     viewBackground := Black.
--- a/MemoryMonitor.st	Fri Mar 31 05:07:47 1995 +0200
+++ b/MemoryMonitor.st	Sun Apr 02 13:45:20 1995 +0200
@@ -25,7 +25,7 @@
  COPYRIGHT (c) 1991 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libtool/MemoryMonitor.st,v 1.12 1995-03-25 22:24:28 claus Exp $
+$Header: /cvs/stx/stx/libtool/MemoryMonitor.st,v 1.13 1995-04-02 11:45:14 claus Exp $
 '!
 
 !MemoryMonitor class methodsFor:'documentation'!
@@ -46,7 +46,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libtool/MemoryMonitor.st,v 1.12 1995-03-25 22:24:28 claus Exp $
+$Header: /cvs/stx/stx/libtool/MemoryMonitor.st,v 1.13 1995-04-02 11:45:14 claus Exp $
 "
 !
 
@@ -117,7 +117,7 @@
      gWidth shift scaleChange margin mustWait|
 
     shown ifTrue:[
-	oldSpaceUsed := ObjectMemory oldSpaceUsed + ObjectMemory fixSpaceUsed.
+	oldSpaceUsed := ObjectMemory oldSpaceUsed + ObjectMemory symSpaceUsed.
 	newSpaceUsed := ObjectMemory newSpaceUsed.
 	freeMem := ObjectMemory freeListSpace.
 	total := oldSpaceUsed + newSpaceUsed.
@@ -205,7 +205,7 @@
 	    lx := org
 	].
 
-	total := ObjectMemory fixSpaceSize 
+	total := ObjectMemory symSpaceSize 
 		 + ObjectMemory oldSpaceSize 
 		 + ObjectMemory newSpaceSize.
 
@@ -281,10 +281,10 @@
     |oldSpaceSize newSpaceSize memUsed oldMemUsed newMemUsed freeMem free2 
      x y half s thisStringLen fontHeight total n|
 
-    oldMemUsed := ObjectMemory oldSpaceUsed + ObjectMemory fixSpaceUsed.
+    oldMemUsed := ObjectMemory oldSpaceUsed + ObjectMemory symSpaceUsed.
     newMemUsed := ObjectMemory newSpaceUsed.
     freeMem := ObjectMemory freeListSpace.
-    oldSpaceSize := ObjectMemory oldSpaceSize + ObjectMemory fixSpaceSize.
+    oldSpaceSize := ObjectMemory oldSpaceSize + ObjectMemory symSpaceSize.
     newSpaceSize := ObjectMemory newSpaceSize.
 
     memUsed := oldMemUsed + newMemUsed "- freeMem".
@@ -518,7 +518,7 @@
     level := 0.
 
     maxTotal := minTotal := ObjectMemory oldSpaceSize 
-			    + ObjectMemory fixSpaceSize
+			    + ObjectMemory symSpaceSize
 			    + ObjectMemory newSpaceSize.
 
     viewBackground := Black.
hg/stx-libtool