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

1 files changed, 64 insertions, 50 deletions

diff --git a/app/lib/demos/dmctlpnl.xtr b/app/lib/demos/dmctlpnl.xtr
index 99646d5..f06f1a3 100644
--- a/app/lib/demos/dmctlpnl.xtr
+++ b/app/lib/demos/dmctlpnl.xtr
@@ -117,7 +117,7 @@ RESET
 MESSAGE
 _________________________________________
 
-For our control panel we will use ¼" lines. 
+For our control panel we will use ¼" lines. 
 Also, we will use a 1/8" grid to lay out our controls.
 
 First, we will set up the Snap Grid for 1" grid lines and 8 divisions.
@@ -147,19 +147,16 @@ PARAMETER misc cmdDelete
 MESSAGE
 First step: draw the lines representing the tracks.
 
-We specify the line width in pixels when at 1:1 zoom.
+We specify the line width in inches.
 
-To create a 1/4" line, divide the dots-per-inch (DPI) of your display by 4.
-
-For MS-Windows the DPI is usually 98, so choose: 98/4 = 24 (approximately).
-For Linux, the DPI is usually 72, so choose: 72/4 = 18.
+To create a 1/4" line, enter 0.250 in the "Straight Line Width" box at the bottom of the window.
 END
 STEP
 COMMAND DrawLine
 PARAMETER draw linewidth 0
 PARAMETER draw linecolor 0
 PARAMETER GROUP draw
-PARAMETER draw linewidth 24
+PARAMETER draw linewidth 0.250
 STEP
 KEYSTATE 2
 MOUSE 2 1.000 6.000
@@ -495,7 +492,7 @@ MOUSE 4 8.000 3.000
 MESSAGE
 _________________________________________
 
-Notice how the Snap Grid keeps the main line and siding track parallel and the connecting tracks and spur at a 45° angle.
+Notice how the Snap Grid keeps the main line and siding track parallel and the connecting tracks and spur at a 45° angle.
 END
 STEP
 RESET
@@ -562,7 +559,7 @@ Now we'll add push buttons to control the turnouts.
 END
 STEP
 ORIG 1 0.0000000 4.000000
-HOTBARSELECT Switch	¼" Push Button	 
+HOTBARSELECT Switch	¼" Push Button	 
 MOUSE 2 2.750 6.000
 MOUSE 4 2.750 6.000
 BIGPAUSE
@@ -607,7 +604,7 @@ MOUSE 2 2.953 7.344
 MOUSE 4 1.625 5.578
 MESSAGE
 
-We rotate the signals by Shift-Right-Click and select 90° CW on the popup menu.  We can not show the popup menu in demo mode, but will simulate the effect.
+We rotate the signals by Shift-Right-Click and select 90° CW on the popup menu.  We can not show the popup menu in demo mode, but will simulate the effect.
 END
 BIGPAUSE
 MENU 1.625 5.578 "Structure Rotate" "90  CW"
@@ -712,20 +709,20 @@ MESSAGE
 Now for some touch-ups.
 
 Notice when the line meet at an angle there is a gap.
-We will fill this gap with the ¼" dot.
+We will fill this gap with the ¼" dot.
 
 Note: Win95/Win98/WinME does not support drawing lines with flat end-caps, but only with round end-caps.
 Users on those platforms will not see the gap.
 END
 STEP
 ORIG 1 2.000 4.000
-HOTBARSELECT Symbols	¼" DOT	 
+HOTBARSELECT Symbols	¼" DOT	 
 MOUSE 2 3.000 5.000
 MOUSE 4 3.000 5.000
 BIGPAUSE
 MOUSE 8200 3.000 5.000
 ORIG 1 8.000 4.000
-HOTBARSELECT Symbols	¼" DOT	 
+HOTBARSELECT Symbols	¼" DOT	 
 MOUSE 2 9.000 5.000
 MOUSE 4 9.000 5.000
 BIGPAUSE
@@ -736,7 +733,7 @@ _________________________________________
 
 Add an arrow head to indicate the tracks that connect to the rest of the layout.
 
-The second arrow will be flipped 180°"
+The second arrow will be flipped 180°"
 END
 STEP
 HOTBARSELECT Symbols	Arrow	 
@@ -755,7 +752,7 @@ MOUSE 6920 0.500 6.000
 #MESSAGE
 #_________________________________________
 #
-#Rotate the arrow head by 180° and move into position.
+#Rotate the arrow head by 180° and move into position.
 #END
 #MOUSE 2 0.500 6.000
 #MOUSE 4 0.500 6.000
@@ -776,10 +773,12 @@ And add some labels.
 END
 STEP
 COMMAND Text
-PARAMETER text Fontsize 0 18
+PARAMETER text fontsize 0 18
+PARAMETER text boxed 0
 PARAMETER GROUP text
-PARAMETER text Fontsize -1 48
-PARAMETER text Color 0
+PARAMETER text fontsize -1 48
+PARAMETER text boxed 0
+PARAMETER text color 0
 MOUSE 2 4.500 6.969
 MOUSE 4 4.391 6.672
 KEYSTATE 2
@@ -792,9 +791,9 @@ MOUSE 29704 4.391 6.672
 MOUSE 2 4.500 6.656
 MOUSE 4 4.812 6.625
 MOUSE 3336 5.156 6.766
-PARAMETER text Fontsize -1 48
-PARAMETER text Fontsize 11 24
-PARAMETER text Fontsize -1 24
+PARAMETER text fontsize -1 48
+PARAMETER text fontsize 11 24
+PARAMETER text fontsize -1 24
 MOUSE 2 0.500 5.016
 MOUSE 4 0.641 5.016
 KEYSTATE 2
@@ -806,7 +805,7 @@ MOUSE 29704 1.312 5.016
 MOUSE 27656 1.312 5.016
 MOUSE 25864 1.312 5.016
 MOUSE 3336 3.031 3.859
-PARAMETER text Fontsize -1 24
+PARAMETER text fontsize -1 24
 PARAMETER GROUP text
 MOUSE 2 10.375 5.047
 MOUSE 4 10.125 5.047
@@ -825,11 +824,11 @@ MOUSE 28424 10.125 5.047
 MOUSE 2 10.094 5.125
 MOUSE 4 9.891 5.000
 MOUSE 3336 9.906 5.031
-PARAMETER text Fontsize -1 24
+PARAMETER text fontsize -1 24
 PARAMETER GROUP text
 CLEAR
 MESSAGE
-We want to print our control panel onto a 8½x11 page, but the control panel is a bit too wide.
+We want to print our control panel onto a 8½x11 page, but the control panel is a bit too wide.
 
 Lets tighten it up a bit.
 
@@ -925,20 +924,26 @@ The cross-hairs on the LEDs and switch show the centers for drilling.
 END
 REGRESSION START 10 - control panel
 DRAW 18 0 0 0 0 0.000000 0.000000 0 0.000000
-	L3 0 0.333333 1.000000 6.000000 0 9.772000 6.000000 0
-	END
-DRAW 19 0 0 0 0 -1.250000 0.000000 0 0.000000
-	L3 0 0.333333 10.000000 6.000000 0 9.000000 5.000000 0
+	L3 0 0.250 1.000000 6.000000 0 9.772000 6.000000 0
 	END
+DRAW 19 0 0 0 0 0.000000 0.000000 0 0.000000
+	L3 0 0.250000 8.750000 6.000000 0 7.750000 5.000000 0
+	END$SEGS
+#DRAW 19 0 0 0 0 -1.250000 0.000000 0 0.000000
+#	L3 0 0.250 10.000000 6.000000 0 9.000000 5.000000 0
+#	END
 DRAW 20 0 0 0 0 0.000000 0.000000 0 0.000000
-	L3 0 0.333333 7.666000 5.000000 0 3.000000 5.000000 0
+	L3 0 0.250 7.666000 5.000000 0 3.000000 5.000000 0
 	END
 DRAW 21 0 0 0 0 0.000000 0.000000 0 0.000000
-	L3 0 0.333333 3.000000 5.000000 0 2.000000 6.000000 0
-	END
-DRAW 22 0 0 0 0 -0.813000 0.000000 0 0.000000
-	L3 0 0.333333 6.000000 5.000000 0 8.000000 3.000000 0
+	L3 0 0.250 3.000000 5.000000 0 2.000000 6.000000 0
 	END
+DRAW 22 0 0 0 0 0.000000 0.000000 0 0.000000
+	L3 0 0.250000 5.187000 5.000000 0 7.187000 3.000000 0
+	END$SEGS
+#DRAW 22 0 0 0 0 -0.813000 0.000000 0 0.000000
+#	L3 0 0.320 6.000000 5.000000 0 8.000000 3.000000 0
+#	END
 STRUCTURE 23 0 0 0 0 DEMO 2 2.375000 6.000000 0 0.000000 "LED 	T1 Green LED	 "
 	D 0.000000 0.000000
 	G3 16448250 0.000000 0.059000 0.000000 0.000000 0
@@ -981,7 +986,7 @@ STRUCTURE 28 0 0 0 0 DEMO 2 5.437000 4.750000 0 0.000000 "LED 	T1 Red LED	 "
 	L3 0 0.000000 0.059000 0.000000 0 -0.059000 0.000000 0
 	L3 0 0.000000 0.000000 0.059000 0 0.000000 -0.059000 0
 	END
-STRUCTURE 29 0 0 0 0 DEMO 2 2.750000 6.000000 0 0.000000 "Switch	¼"" Push Button	 "
+STRUCTURE 29 0 0 0 0 DEMO 2 2.750000 6.000000 0 0.000000 "Switch	¼"" Push Button	 "
 	D 0.000000 0.000000
 	G3 16448250 0.000000 0.125000 0.000000 0.000000 0
 	A3 0 0.013889 0.125000 0.000000 0.000000 0 0.000000 360.000000
@@ -989,7 +994,7 @@ STRUCTURE 29 0 0 0 0 DEMO 2 2.750000 6.000000 0 0.000000 "Switch	¼"" Push Button
 	L3 0 0.000000 0.125000 0.000000 0 -0.125000 0.000000 0
 	L3 0 0.000000 0.000000 0.125000 0 0.000000 -0.125000 0
 	END
-STRUCTURE 30 0 0 0 0 DEMO 2 2.500000 5.500000 0 0.000000 "Switch	¼"" Push Button	 "
+STRUCTURE 30 0 0 0 0 DEMO 2 2.500000 5.500000 0 0.000000 "Switch	¼"" Push Button	 "
 	D 0.000000 0.000000
 	G3 16448250 0.000000 0.125000 0.000000 0.000000 0
 	A3 0 0.013889 0.125000 0.000000 0.000000 0 0.000000 360.000000
@@ -997,7 +1002,7 @@ STRUCTURE 30 0 0 0 0 DEMO 2 2.500000 5.500000 0 0.000000 "Switch	¼"" Push Button
 	L3 0 0.000000 0.125000 0.000000 0 -0.125000 0.000000 0
 	L3 0 0.000000 0.000000 0.125000 0 0.000000 -0.125000 0
 	END
-STRUCTURE 31 0 0 0 0 DEMO 2 8.000000 6.000000 0 0.000000 "Switch	¼"" Push Button	 "
+STRUCTURE 31 0 0 0 0 DEMO 2 8.000000 6.000000 0 0.000000 "Switch	¼"" Push Button	 "
 	D 0.000000 0.000000
 	G3 16448250 0.000000 0.125000 0.000000 0.000000 0
 	A3 0 0.013889 0.125000 0.000000 0.000000 0 0.000000 360.000000
@@ -1005,7 +1010,7 @@ STRUCTURE 31 0 0 0 0 DEMO 2 8.000000 6.000000 0 0.000000 "Switch	¼"" Push Button
 	L3 0 0.000000 0.125000 0.000000 0 -0.125000 0.000000 0
 	L3 0 0.000000 0.000000 0.125000 0 0.000000 -0.125000 0
 	END
-STRUCTURE 32 0 0 0 0 DEMO 2 8.250000 5.500000 0 0.000000 "Switch	¼"" Push Button	 "
+STRUCTURE 32 0 0 0 0 DEMO 2 8.250000 5.500000 0 0.000000 "Switch	¼"" Push Button	 "
 	D 0.000000 0.000000
 	G3 16448250 0.000000 0.125000 0.000000 0.000000 0
 	A3 0 0.013889 0.125000 0.000000 0.000000 0 0.000000 360.000000
@@ -1013,7 +1018,7 @@ STRUCTURE 32 0 0 0 0 DEMO 2 8.250000 5.500000 0 0.000000 "Switch	¼"" Push Button
 	L3 0 0.000000 0.125000 0.000000 0 -0.125000 0.000000 0
 	L3 0 0.000000 0.000000 0.125000 0 0.000000 -0.125000 0
 	END
-STRUCTURE 33 0 0 0 0 DEMO 2 5.937000 5.000000 0 0.000000 "Switch	¼"" Push Button	 "
+STRUCTURE 33 0 0 0 0 DEMO 2 5.937000 5.000000 0 0.000000 "Switch	¼"" Push Button	 "
 	D 0.000000 0.000000
 	G3 16448250 0.000000 0.125000 0.000000 0.000000 0
 	A3 0 0.013889 0.125000 0.000000 0.000000 0 0.000000 360.000000
@@ -1021,7 +1026,7 @@ STRUCTURE 33 0 0 0 0 DEMO 2 5.937000 5.000000 0 0.000000 "Switch	¼"" Push Button
 	L3 0 0.000000 0.125000 0.000000 0 -0.125000 0.000000 0
 	L3 0 0.000000 0.000000 0.125000 0 0.000000 -0.125000 0
 	END
-STRUCTURE 34 0 0 0 0 DEMO 2 5.687000 4.500000 0 0.000000 "Switch	¼"" Push Button	 "
+STRUCTURE 34 0 0 0 0 DEMO 2 5.687000 4.500000 0 0.000000 "Switch	¼"" Push Button	 "
 	D 0.000000 0.000000
 	G3 16448250 0.000000 0.125000 0.000000 0.000000 0
 	A3 0 0.013889 0.125000 0.000000 0.000000 0 0.000000 360.000000
@@ -1099,11 +1104,11 @@ STRUCTURE 40 0 0 0 0 DEMO 2 7.500000 4.625000 0 90.000000 "Signals 	Sgl Signal	1
 	L3 0 0.027778 0.000000 -0.109375 0 0.000000 -0.600000 0
 	L3 0 0.027778 -0.100000 -0.600000 0 0.100000 -0.600000 0
 	END
-STRUCTURE 41 0 0 0 0 DEMO 2 3.000000 5.000000 0 0.000000 "Symbols	¼"" DOT	 "
+STRUCTURE 41 0 0 0 0 DEMO 2 3.000000 5.000000 0 0.000000 "Symbols	¼"" DOT	 "
 	D 0.000000 0.000000
 	G3 0 0.000000 0.125000 0.000000 0.000000 0
 	END
-STRUCTURE 42 0 0 0 0 DEMO 2 7.750000 5.000000 0 0.000000 "Symbols	¼"" DOT	 "
+STRUCTURE 42 0 0 0 0 DEMO 2 7.750000 5.000000 0 0.000000 "Symbols	¼"" DOT	 "
 	D 0.000000 0.000000
 	G3 0 0.000000 0.125000 0.000000 0.000000 0
 	END
@@ -1121,15 +1126,24 @@ STRUCTURE 44 0 0 0 0 DEMO 2 1.000000 6.250000 0 180.000000 "Symbols	Arrow	 "
 		0.000000 0.000000 0
 		0.378906 0.250000 0
 	END
-DRAW 45 0 0 0 0 3.937000 6.625000 0 0.000000
-	Z 0 0.000000 0.000000 0.000000 0 48.000000 "Summit"
-	END
-DRAW 46 0 0 0 0 0.641000 5.016000 0 0.000000
-	Z 0 0.000000 0.000000 0.000000 0 24.000000 "Seattle"
-	END
-DRAW 47 0 0 0 0 8.641000 5.000000 0 0.000000
-	Z 0 0.000000 0.000000 0.000000 0 24.000000 "Chicago"
-	END
+DRAW 45 0 0 0 0 0.000000 0.000000 0 0.000000
+	Z 0 3.937000 6.625000 0.000000 0 48.000000 "Summit"
+	END$SEGS
+DRAW 46 0 0 0 0 0.000000 0.000000 0 0.000000
+	Z 0 0.641000 5.016000 0.000000 0 24.000000 "Seattle"
+	END$SEGS
+DRAW 47 0 0 0 0 0.000000 0.000000 0 0.000000
+	Z 0 8.641000 5.000000 0.000000 0 24.000000 "Chicago"
+	END$SEGS
+#DRAW 45 0 0 0 0 3.937000 6.625000 0 0.000000
+#	Z 0 0.000000 0.000000 0.000000 0 48.000000 "Summit"
+#	END
+#DRAW 46 0 0 0 0 0.641000 5.016000 0 0.000000
+#	Z 0 0.000000 0.000000 0.000000 0 24.000000 "Seattle"
+#	END
+#DRAW 47 0 0 0 0 8.641000 5.000000 0 0.000000
+#	Z 0 0.000000 0.000000 0.000000 0 24.000000 "Chicago"
+#	END
 REGRESSION END
 STEP
 CLEAR