Merge branch 'feature/upstrem' into develop

1 files changed, 50 insertions, 45 deletions

diff --git a/app/lib/demos/dmgroup.xtr b/app/lib/demos/dmgroup.xtr
index f5ed0dd..2c7741b 100644
--- a/app/lib/demos/dmgroup.xtr
+++ b/app/lib/demos/dmgroup.xtr
@@ -34,18 +34,23 @@ COMMAND DrawLine
 MOUSE 2 2.500 3.000
 MOUSE 4 2.500 1.500
 COMMAND DrawLine
-KEYSTATE 12
+KEYSTATE A
 MOUSE 2 3.200 3.000
-KEYSTATE 12
+KEYSTATE A
 MOUSE 4 3.200 1.500
 STEP
 COMMAND DrawFilledBox
 PARAMETER draw linecolor 0
 PARAMETER GROUP draw
+KEYSTATE A
 MOUSE 1 2.600 3.000
+KEYSTATE A
 MOUSE 2 2.600 3.000
+KEYSTATE A
 MOUSE 4 3.100 2.500
+KEYSTATE A
 MOUSE 2 2.600 2.000
+KEYSTATE A
 MOUSE 4 3.100 1.500
 MESSAGE
 _________________________________________
@@ -136,24 +141,24 @@ _________________________________________
 Now Select the lines and squares.
 END
 STEP
-#KEYSTATE 12
-MOUSE 1 2.469 2.812
-#KEYSTATE 12
-MOUSE 2 2.469 2.812
-KEYSTATE 12
-MOUSE 4 2.469 2.812
-KEYSTATE 12
-MOUSE 2 2.688 2.875
-KEYSTATE 12
-MOUSE 4 2.688 2.875
-KEYSTATE 12
-MOUSE 2 3.188 2.844
-KEYSTATE 12
-MOUSE 4 3.188 2.844
-KEYSTATE 12
-MOUSE 2 2.812 1.656
-KEYSTATE 12
-MOUSE 4 2.812 1.656
+#KEYSTATE C
+MOUSE 1 2.500 2.812
+#KEYSTATE C
+MOUSE 2 2.500 2.812
+KEYSTATE C
+MOUSE 4 2.500 2.812
+KEYSTATE C
+MOUSE 2 2.850 2.500
+KEYSTATE C
+MOUSE 4 2.850 2.500
+KEYSTATE C
+MOUSE 2 3.200 2.000
+KEYSTATE C
+MOUSE 4 3.200 2.000
+KEYSTATE C
+MOUSE 2 2.850 1.500
+KEYSTATE C
+MOUSE 4 2.850 1.500
 MOUSE 1 5.000 1.000
 MESSAGE
 _________________________________________
@@ -169,8 +174,8 @@ And move the Label out of the way.
 END
 STEP
 COMMAND MoveLabel
-MOUSE 1 4.281 2.031
-MOUSE 2 4.281 2.031
+MOUSE 1 5.000 2.116
+MOUSE 2 5.000 2.116
 MOUSE 4 4.594 0.844
 ORIG 1.0 0.0 0.0
 MESSAGE
@@ -212,9 +217,9 @@ You can later Group this turnout with the straight segments to recreate the turn
 
 END
 STEP
-KEYSTATE 2
+KEYSTATE S
 MOUSE 2 4.625 1.969
-KEYSTATE 2
+KEYSTATE S
 MOUSE 4 4.625 1.969
 REGRESSION START 10 - group 1
 TURNOUT  16 0 32 0 0 DEMO 2 2.477615 1.950213 0 0.000000 "Peco-55	Modified Medium Right	SL-E395F"
@@ -292,9 +297,9 @@ BIGPAUSE
 MOUSE 1 5.219 3.000
 MOUSE 2 5.219 3.000
 MOUSE 4 5.219 3.000
-KEYSTATE 12
+KEYSTATE S
 MOUSE 2 5.219 2.000
-KEYSTATE 12
+KEYSTATE S
 MOUSE 4 5.219 2.000
 PARAMETER misc cmdDelete
 MESSAGE
@@ -304,7 +309,7 @@ Now draw the green circles...
 END
 STEP
 ORIG 1.0 0.0 0.0
-COMMAND DrawFilledCircleTangent
+COMMAND DrawFilledCircleCenter
 PARAMETER draw linecolor 0
 PARAMETER GROUP draw
 PARAMETER draw linecolor 65280
@@ -324,13 +329,13 @@ END
 STEP
 ORIG 1.0 0.0 0.0
 COMMAND Select
-KEYSTATE 12
+KEYSTATE S
 MOUSE 1 3.719 4.156
-KEYSTATE 12
+KEYSTATE S
 MOUSE 2 3.719 4.156
-KEYSTATE 12
+KEYSTATE S
 MOUSE 3 10.531 0.969
-KEYSTATE 12
+KEYSTATE S
 MOUSE 4 10.531 0.969
 BIGPAUSE
 PARAMETER misc cmdGroup
@@ -343,9 +348,9 @@ _________________________________________
 Notice that the turnout in the HotBar is angled the same as the turnout on the layout.  Make sure your new definition is rotated the way you want it.
 END
 STEP
-KEYSTATE 2
+KEYSTATE S
 MOUSE 2 5.000 2.188
-KEYSTATE 2
+KEYSTATE S
 MOUSE 4 5.000 2.188
 REGRESSION START 10 - group 2
 STRAIGHT 19 0 0 0 0 DEMO 2
@@ -389,21 +394,21 @@ MOUSE 3 10.000 2.000
 MOUSE 4 10.000 2.000
 MESSAGE
 
-When we create the curve from the straight track endpoint we need to hold down the Shift key to prevent XTrackCAD from trying to join the two tracks.
+When we create the curve from the straight track endpoint we need to hold down the <Shift> key to prevent XTrackCAD from trying to join the two tracks.
 END
 COMMAND CurveEndPt
 MOUSE 1 2.000 2.000
-KEYSTATE 12
+KEYSTATE S
 MOUSE 2 2.000 2.000
-KEYSTATE 12
+KEYSTATE S
 MOUSE 3 9.000 2.000
-KEYSTATE 12
+KEYSTATE S
 MOUSE 4 9.000 2.000
-KEYSTATE 12
+KEYSTATE S
 MOUSE 2 9.000 2.000
-KEYSTATE 12
+KEYSTATE S
 MOUSE 3 8.875 3.062
-KEYSTATE 12
+KEYSTATE S
 MOUSE 4 8.875 3.062
 MESSAGE
 _________________________________________
@@ -422,7 +427,7 @@ _________________________________________
 
 We'll make the Length 7.5".
 
-If we change the Length, each End-Point will be moved to shorten the track.  We want to just move the Right End-Point.  To control this, change the Pivot to First which means the Left End-Point will be unchanged when we change the length (or angle) of the track.
+If we change the Length, each End-Point will be moved to shorten the track.  We want to just move the Right End-Point.  To control this, change the Lock to First which means the Left End-Point will be unchanged when we change the length (or angle) of the track.
 END
 STEP
 #DESCRIBE Pivot	0
@@ -451,7 +456,7 @@ MOUSE 4 7.688 2.625
 MESSAGE
 _________________________________________
 
-Here the Left End-Point (which we don't want to move) is the Second End-Point, so we'll make that the Pivot.
+Here the Left End-Point (which we don't want to move) is the Second End-Point, so we'll make that the Lock.
 END
 STEP
 #DESCRIBE Pivot	2
@@ -483,11 +488,11 @@ COMMAND Select
 MOUSE 1 7.500 2.750
 MOUSE 2 7.500 2.750
 MOUSE 4 7.500 2.750
-KEYSTATE 12
+KEYSTATE S
 MOUSE 1 8.000 2.000
-KEYSTATE 12
+KEYSTATE S
 MOUSE 2 8.000 2.000
-KEYSTATE 12
+KEYSTATE S
 MOUSE 4 8.000 2.000
 MESSAGE
 and Group them.