--- a/UIPainter.st	Wed Jul 29 13:20:41 1998 +0200
+++ b/UIPainter.st	Wed Jul 29 13:23:19 1998 +0200
@@ -113,34 +113,34 @@
     ^super helpSpec addPairsFrom:#(
 
 #alignSelectionBottom
-'Aligns the selected widgets to the bottom edge of the dominant widget.'
+'Aligns the selected widgets bottom edges with the bottom of the dominant widget.'
 
 #alignSelectionCenterHor
-'Aligns the selected widgets vertically to the center of the dominant widget.'
+'Aligns the selected widgets centers vertically with the center of the dominant widget.'
 
 #alignSelectionCenterVer
-'Aligns the selected widgets horizontally to the center of the dominant widget.'
+'Aligns the selected widgets centers horizontally with the center of the dominant widget.'
 
 #alignSelectionLeft
-'Aligns the selected widgets to the left edge of the dominant widget.'
+'Aligns the selected widgets left edges with the left edge of the dominant widget.'
 
 #alignSelectionLeftAndRight
-'Aligns the selected widgets to the right and left edge of the dominant widget.'
+'Aligns the selected widgets left & right edges with the dominant widget.'
 
 #alignSelectionRight
-'Aligns the selected widgets to the right edge of the dominant widget.'
+'Aligns the selected widgets right edges with the right edge of the dominant widget.'
 
 #alignSelectionTop
-'Aligns the selected widgets to the top edge of the dominant widget.'
+'Aligns the selected widgets top edgegs withh the top edge of the dominant widget.'
 
 #alignSelectionTopAndBottom
-'Aligns the selected widgets to the top and bottom edge of the dominant widget.'
+'Aligns the selected widgets top and bottom edges with the dominant widget.'
 
 #centerSelectionHor
-'Centers the selected widgets horizontally to their contained widget.'
+'Centers the selected widgets horizontally within their containing widget.'
 
 #centerSelectionVer
-'Centers the selected widgets vertically in their contained widget.'
+'Centers the selected widgets vertically within their containing widget.'
 
 #changePositionDown
 'Moves the selected widget(s) towards the bottom.'
@@ -155,31 +155,31 @@
 'Moves the selected widget(s) towards the top.'
 
 #editDimensionCopyExtent
-'Copies the extent of the selected widgets.'
+'Copies the extent of the selected widget.'
 
 #editDimensionCopyLayout
-'Copies the layout of the selected widgets.'
+'Copies the layout of the selected widget.'
 
 #editDimensionDefaultExtent
-'Sets the selected widgets to their default extent.'
+'Sets the selected widget(s) extent to their default.'
 
 #editDimensionDefaultHeight
-'Sets the selected widgets to their default height.'
+'Sets the selected widget(s) height to their default.'
 
 #editDimensionDefaultWidth
-'Sets the selected widgets to their default width.'
+'Sets the selected widget(s) width to their default.'
 
 #editDimensionPasteExtent
-'Sets the extent of the selected widgets to the last copied extent.'
+'Sets the extent of the selected widget(s) to the last copied extent.'
 
 #editDimensionPasteHeight
-'Sets the height of the selected widgets to the height of the last copied layout/extent.'
+'Sets the height of the selected widget(s) to the height of the last copied layout/extent.'
 
 #editDimensionPasteLayout
-'Sets the layout of the selected widgets to the last copied layout.'
+'Sets the layout of the selected widget(s) to the last copied layout.'
 
 #editDimensionPasteWidth
-'Sets the width of the selected widgets to the width of the last copied layout/extent.'
+'Sets the width of the selected widget(s) to the width of the last copied layout/extent.'
 
 #editInspectSpec
 'Opens an inspector on the spec of the selected widget.'
@@ -194,19 +194,19 @@
 'Opens a System Browser to browse the aspect methods.'
 
 #fileLoad
-'Opens a dialog to load a window spec from a class.'
+'Opens a dialog to load a window specification from a classes windowSpec method.'
 
 #fileLoadSubspec
-'Opens a dialog to load an sub spec from a class.'
+'Opens a dialog to load a sub specification from a classes windowSpec method.'
 
 #fileNew
 'Creates a new window spec.'
 
 #filePickAnInterface
-'Changes the cursor for moving it over another interface application to load its window spec.'
+'Select a view on the screen, generate a window spec for it and edit this spec.'
 
 #fileSave
-'Saves the window spec in the current class.'
+'Saves the window spec in the current class (as spec method).'
 
 #fileSaveAs
 'Opens a dialog to select class and selector for saving the window spec.'
@@ -232,6 +232,9 @@
 #helpSelectedWidget
 'Opens a HTML-Browser on the documentation file of the selected widget.'
 
+#historyMenuItem
+'Edit this windowSpec.'
+
 #moveWidgetDown
 'Moves the selected widget one step down.'
 
@@ -260,10 +263,13 @@
 'Opens a dialog to show/hide the grid points or to change the distances between them.'
 
 #settingsRedefineAspectMethods
-'Turns on/off the permission of redefinition of the aspect methods.'
+'Toggles the permission to overwrite existing aspect methods.'
+
+#settingsAspectsAsInstances
+'Genrate aspects as instance variables (or bindings, if off).'
 
 #settingsTranscriptHelp
-'Turns on/off showing help texts in a transcript (after opening of a new GUI Painter).'
+'Toggles display of help texts (after opening a new GUI Painter).'
 
 #settingsUndoManager
 'Opens a dialog to undo modifications.'
@@ -275,14 +281,14 @@
 'Sets the vertical spaces between the selected widgets as the same.'
 
 #testGeometryTestMode
-'Toggles geometry test mode in order to define ratios of variable panels.'
+'Toggles geometry test mode (to define ratios of variable panels and top-window dimension).'
 
 #testStartApplication
 'Starts the application with the current window spec.'
 
 )
 
-    "Modified: / 20.5.1998 / 02:09:00 / cg"
+    "Modified: / 29.7.1998 / 11:54:16 / cg"
 ! !
 
 !UIPainter class methodsFor:'helpers'!
@@ -1049,6 +1055,13 @@
                           #indication: #redefineAspectMethods:
                       )
                        #(#MenuItem
+                          #label: 'Aspects As Instances'
+                          #translateLabel: true
+                          #activeHelpKey: #settingsAspectsAsInstances
+                          #enabled: #hasSpecClass
+                          #indication: #generateAspectsAsInstanceVariables:
+                      )
+                       #(#MenuItem
                           #label: '-'
                       )
                        #(#MenuItem
@@ -1155,7 +1168,7 @@
           nil
       )
 
-    "Modified: / 20.5.1998 / 01:44:19 / cg"
+    "Modified: / 29.7.1998 / 12:03:44 / cg"
 !
 
 menuAlign
@@ -2633,6 +2646,24 @@
 
 !UIPainter methodsFor:'settings'!
 
+generateAspectsAsInstanceVariables
+    "if on, aspects are held as instance variables;
+     if off (the default), they are kept in the bindings dictionary.
+    "
+    ^ UIPainterView generateAspectsAsInstanceVariables
+
+    "Created: / 29.7.1998 / 11:17:59 / cg"
+!
+
+generateAspectsAsInstanceVariables:aBoolean
+    "if on, aspects are held as instance variables;
+     if off (the default), they are kept in the bindings dictionary.
+    "
+    ^ UIPainterView generateAspectsAsInstanceVariables:aBoolean
+
+    "Created: / 29.7.1998 / 11:18:20 / cg"
+!
+
 redefineAspectMethods
     "redefine methods yes or no. If a method is defined in super class
      should the message be reinstalled ?