Merge branch 'release/debian/1_5.3.0GA-1'debian/1_5.3.0GA-1

1 files changed, 32 insertions, 31 deletions

diff --git a/app/lib/demos/dmlines.xtr b/app/lib/demos/dmlines.xtr
index 9f2b66f..32555fb 100644
--- a/app/lib/demos/dmlines.xtr
+++ b/app/lib/demos/dmlines.xtr
@@ -48,45 +48,45 @@ _________________________________________
 
 Lines are drawn by clicking at the starting postion and dragging to the final position.
 
-By default, the new line will snap to existing objects.  Hold down the <Ctrl> and <Alt> keys to prevent this from happening.
+By default, the new line will snap to existing objects.  Hold down the <Alt> keys to prevent this from happening.
 END
 STEP
-KEYSTATE 12
+KEYSTATE A
 MOUSE 2 0.533 4.693
-KEYSTATE 12
+KEYSTATE A
 MOUSE 3 4.320 4.693
-KEYSTATE 12
+KEYSTATE A
 MOUSE 4 4.320 4.693
-KEYSTATE 12
+KEYSTATE A
 MOUSE 2 4.373 4.693
-KEYSTATE 12
+KEYSTATE A
 MOUSE 3 4.533 5.120
-KEYSTATE 12
+KEYSTATE A
 MOUSE 4 4.533 5.120
-KEYSTATE 12
+KEYSTATE A
 MOUSE 2 0.533 4.693
-KEYSTATE 12
+KEYSTATE A
 MOUSE 3 0.533 4.693
-KEYSTATE 12
+KEYSTATE A
 MOUSE 4 0.267 5.120
-KEYSTATE 12
+KEYSTATE A
 MOUSE 2 0.267 3.253
-KEYSTATE 12
+KEYSTATE A
 MOUSE 3 0.533 3.787
-KEYSTATE 12
+KEYSTATE A
 MOUSE 4 0.533 3.787
 STEP
-KEYSTATE 12
+KEYSTATE A
 MOUSE 2 0.533 3.787
-KEYSTATE 12
+KEYSTATE A
 MOUSE 3 4.320 3.787
-KEYSTATE 12
+KEYSTATE A
 MOUSE 4 4.320 3.787
-KEYSTATE 12
+KEYSTATE A
 MOUSE 2 4.320 3.787
-KEYSTATE 12
+KEYSTATE A
 MOUSE 3 4.533 3.307
-KEYSTATE 12
+KEYSTATE A
 MOUSE 4 4.533 3.307
 MESSAGE
 _________________________________________
@@ -94,9 +94,10 @@ _________________________________________
 You also draw in various colors and line widths.
 END
 PARAMETER draw linecolor 255
-PARAMETER draw linewidth 6
+PARAMETER draw linewidth 0.055555
 STEP
-MOUSE 2 0.747 4.800
+KEYSTATE A
+MOUSE 2 0.747 4.693
 MOUSE 4 0.693 6.560
 MOUSE 2 0.693 6.560
 MOUSE 4 1.493 7.573
@@ -115,7 +116,7 @@ Here we will draw a Curve by dragging from one End-Point to the other to define
 END
 STEP
 COMMAND DrawCurveChord
-KEYSTATE 12
+KEYSTATE A
 MOUSE 2 0.800 3.680
 #MOUSE 3 0.800 3.573
 #MOUSE 3 0.853 3.467
@@ -174,12 +175,12 @@ MOUSE 2 0.800 3.680
 #MOUSE 3 3.947 3.680
 #MOUSE 3 3.947 3.733
 #MOUSE 3 3.947 3.787
-KEYSTATE 12
+KEYSTATE A
 MOUSE 4 4.107 3.787
 BIGPAUSE
-KEYSTATE 12
+KEYSTATE A
 MOUSE 2 2.9 3.78
-KEYSTATE 12
+KEYSTATE A
 MOUSE 4 2.9 1.5
 MESSAGE
 _________________________________________
@@ -195,10 +196,10 @@ MESSAGE
 _________________________________________
 
 Circles can be drawn by clicking on the center or edge and dragging to set the radius.
-Here we will drag from the Center.
+Here we will drag from the edge to the Center.
 END
 STEP
-COMMAND DrawCircleCenter
+COMMAND DrawCircleTangent
 MOUSE 2 7.360 6.453
 MOUSE 4 8.533 5.920
 MESSAGE
@@ -212,15 +213,15 @@ MOUSE 2 11.307 6.400
 MOUSE 4 11.307 6.400
 #BIGPAUSE
 #PARAMETER misc cmdDelete
-KEYSTATE 4
+KEYSTATE C
 MOUSE 2 4.160 5.493
-KEYSTATE 4
+KEYSTATE C
 MOUSE 4 4.160 5.493
 #BIGPAUSE
 #PARAMETER misc cmdDelete
-KEYSTATE 4
+KEYSTATE C
 MOUSE 2 3.467 6.933
-KEYSTATE 4
+KEYSTATE C
 MOUSE 4 3.467 6.933
 BIGPAUSE
 PARAMETER misc cmdDelete