moving to core/

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@290 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/core/datafiles-src/thrustcurves/Loki_J175.rse b/core/datafiles-src/thrustcurves/Loki_J175.rse
new file mode 100644 (file)
index 0000000..981ee62
--- /dev/null
+++ b/core/datafiles-src/thrustcurves/Loki_J175.rse
@@ -0,0 +1,27 @@
+<engine-database>\r
+ <engine-list>\r
+<engine FDiv="10" FFix="1" FStep="-1." Isp="199.98" Itot="1157.08" Type="reloadable" auto-calc-cg="1" auto-calc-mass="1" avgThrust="178.012" burn-time="6.5" cgDiv="10" cgFix="1" cgStep="-1." code="J175" delays="1000" dia="54." exitDia="0." initWt="1264." len="327." mDiv="10" mFix="1" mStep="-1." massFrac="46.68" mfg="Loki Research" peakThrust="420.4" propWt="590." tDiv="10" tFix="1" tStep="-1." throatDia="0.">\r
+<data>\r
+<eng-data cg="163.5" f="0." m="590." t="0."/>\r
+<eng-data cg="163.5" f="4.8" m="589.988" t="0.01"/>\r
+<eng-data cg="163.5" f="420.4" m="580.231" t="0.1"/>\r
+<eng-data cg="163.5" f="347.5" m="560.653" t="0.2"/>\r
+<eng-data cg="163.5" f="349.9" m="542.873" t="0.3"/>\r
+<eng-data cg="163.5" f="364.5" m="524.659" t="0.4"/>\r
+<eng-data cg="163.5" f="320.7" m="507.19" t="0.5"/>\r
+<eng-data cg="163.5" f="296.4" m="428.524" t="1."/>\r
+<eng-data cg="163.5" f="279.4" m="355.123" t="1.5"/>\r
+<eng-data cg="163.5" f="260." m="286.363" t="2."/>\r
+<eng-data cg="163.5" f="238.1" m="222.867" t="2.5"/>\r
+<eng-data cg="163.5" f="209." m="165.872" t="3."/>\r
+<eng-data cg="163.5" f="172." m="117.304" t="3.5"/>\r
+<eng-data cg="163.5" f="133.6" m="78.3469" t="4."/>\r
+<eng-data cg="163.5" f="102." m="48.3135" t="4.5"/>\r
+<eng-data cg="163.5" f="75.3" m="25.712" t="5."/>\r
+<eng-data cg="163.5" f="46.2" m="10.2236" t="5.5"/>\r
+<eng-data cg="163.5" f="17." m="2.1671" t="6."/>\r
+<eng-data cg="163.5" f="0." m="0." t="6.5"/>\r
+</data>\r
+</engine>\r
+ </engine-list>\r
+</engine-database>\r

diff --git a/core/datafiles-src/thrustcurves/README.txt b/core/datafiles-src/thrustcurves/README.txt
new file mode 100644 (file)
index 0000000..3c6da04
--- /dev/null
+++ b/core/datafiles-src/thrustcurves/README.txt
@@ -0,0 +1,9 @@
+
+This directory contains manually added / modified thrust curves.
+All other thrust curves are from www.thrustcurve.org
+(all RASP and RSE files).
+
+SF_*.eng - Thrust curves for Weco Feuerwerk motors, created by Sampo N.
+
+Loki_J175.rse - Corrected motor type from hybrid to reloadable
+

diff --git a/core/datafiles-src/thrustcurves/SF_A8.eng b/core/datafiles-src/thrustcurves/SF_A8.eng
new file mode 100644 (file)
index 0000000..292f5e3
--- /dev/null
+++ b/core/datafiles-src/thrustcurves/SF_A8.eng
@@ -0,0 +1,16 @@
+; Sachsen Feuerwerk / WECO Feuerwerk A8-3
+; Created by Sampo Niskanen for OpenRocket, released into the Public Domain
+; Thrust curve data taken from:
+; http://www.raketenmodellbautechnik.de/produkte/Motoren/SF-Motoren.pdf
+; Mass measured by the author.
+A8 18 70 3 0.00312 0.0153 SF
+   0.065 0.44
+   0.11 1.832
+   0.199 6.412
+   0.298 12.0
+   0.332 7.805
+   0.363 5.716
+   0.438 4.397
+   0.462 4.379
+   0.555 1.227
+   0.62 0.0

diff --git a/core/datafiles-src/thrustcurves/SF_B4.eng b/core/datafiles-src/thrustcurves/SF_B4.eng
new file mode 100644 (file)
index 0000000..e8a4adf
--- /dev/null
+++ b/core/datafiles-src/thrustcurves/SF_B4.eng
@@ -0,0 +1,16 @@
+; Sachsen Feuerwerk / WECO Feuerwerk B4-0, B4-4
+; Created by Sampo Niskanen for OpenRocket, released into the Public Domain
+; Thrust curve data taken from:
+; http://www.raketenmodellbautechnik.de/produkte/Motoren/SF-Motoren.pdf
+; Mass measured by the author from B4-4 motors.
+B4 18 70 0-4 0.00833 0.0195 SF
+   0.088 0.542
+   0.167 3.007
+   0.319 11.678
+   0.373 5.297
+   0.525 4.091
+   0.648 3.461
+   0.8 3.321
+   1.305 3.321
+   1.389 0.455
+   1.443 0.0

diff --git a/core/datafiles-src/thrustcurves/SF_C2.eng b/core/datafiles-src/thrustcurves/SF_C2.eng
new file mode 100644 (file)
index 0000000..8e0b6e6
--- /dev/null
+++ b/core/datafiles-src/thrustcurves/SF_C2.eng
@@ -0,0 +1,29 @@
+; Sachsen Feuerwerk / WECO Feuerwerk Held 1000
+; Created by Sampo Niskanen for OpenRocket, released into the Public Domain
+; Thrust curve data taken from:
+; http://www.raketenmodellbautechnik.de/produkte/Motoren/SF-Motoren.pdf
+; True propellant weight unknown, estimates from various sources
+C2 15 95 P 0.012 0.024 SF
+   0.075 3.543
+   0.16 8.231
+   0.184 8.007
+   0.255 3.134
+   0.316 1.765
+   0.444 1.304
+   0.821 1.251
+   0.963 1.04
+   1.538 1.277
+   1.736 1.133
+   2.491 1.317
+   2.704 1.264
+   3.397 1.436
+   3.907 1.436
+   4.157 1.277
+   4.459 1.449
+   4.469 2.292
+   4.53 1.436
+   4.917 1.449
+   4.931 2.292
+   4.969 1.422
+   5.002 1.436
+   5.068 0.0

diff --git a/core/datafiles-src/thrustcurves/SF_C6.eng b/core/datafiles-src/thrustcurves/SF_C6.eng
new file mode 100644 (file)
index 0000000..00da30e
--- /dev/null
+++ b/core/datafiles-src/thrustcurves/SF_C6.eng
@@ -0,0 +1,21 @@
+; Sachsen Feuerwerk / WECO Feuerwerk C6-0, C6-3, C6-5
+; Created by Sampo Niskanen for OpenRocket, released into the Public Domain
+; Thrust curve data taken from:
+; http://www.raketenmodellbautechnik.de/produkte/Motoren/SF-Motoren.pdf
+; Mass measured by the author from C6-3 motors.
+C6 18 70 0-3-5 0.01248 0.022 SF
+   0.096 0.579
+   0.152 2.441
+   0.184 4.372
+   0.312 11.642
+   0.354 11.589
+   0.395 6.269
+   0.441 5.127
+   0.537 4.091
+   0.643 3.529
+   0.983 3.301
+   1.162 3.249
+   1.217 3.02
+   1.882 3.652
+   1.919 1.141
+   1.997 0.0

diff --git a/core/datafiles-src/thrustcurves/SF_D7.eng b/core/datafiles-src/thrustcurves/SF_D7.eng
new file mode 100644 (file)
index 0000000..1a7dfe0
--- /dev/null
+++ b/core/datafiles-src/thrustcurves/SF_D7.eng
@@ -0,0 +1,19 @@
+; Sachsen Feuerwerk / WECO Feuerwerk D7-0, D7-3
+; Created by Sampo Niskanen for OpenRocket, released into the Public Domain
+; Thrust curve data taken from:
+; http://www.raketenmodellbautechnik.de/produkte/Motoren/SF-Motoren.pdf
+; Mass measured by the author from D7-3 motors.
+D7 25 70 0-3 0.019 0.043 SF
+   0.079 1.625
+   0.179 6.979
+   0.326 18.992
+   0.355 19.407
+   0.372 20.426
+   0.422 20.331
+   0.48 14.085
+   0.538 11.536
+   0.68 9.815
+   0.96 7.839
+   1.34 8.253
+   1.461 2.167
+   1.582 0.0

diff --git a/core/datafiles-src/tours/convert-images.sh b/core/datafiles-src/tours/convert-images.sh
new file mode 100755 (executable)
index 0000000..f9fa53c
--- /dev/null
+++ b/core/datafiles-src/tours/convert-images.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+#
+# A script to batch-convert all source image files into suitable
+# slideset image files.  It converts all *.png, *.jpg and *.xcf.gz
+# files into the suitably sized jpg images in the datafiles directory.
+#
+
+DEST=../../datafiles/tours
+
+CONVERSION="-background #ececec -flatten -geometry 600x400 -quality 85"
+
+
+# Convert all xcf files
+find -iname "*.xcf.gz" | grep -v MANUAL | while read FILE; do
+
+    echo Converting $FILE
+    BASE="$(echo $FILE | sed 's/\.xcf\.gz$//')"
+    xcf2png "$FILE" | convert $CONVERSION - $DEST/$BASE.jpg
+
+done
+
+# Convert all png and jpg files
+find -iname "*.png" -o -iname "*.jpg" | grep -v MANUAL | while read FILE; do 
+
+    echo Converting $FILE
+    BASE="$(echo $FILE | sed 's/\.png$//' | sed 's/\.jpg$//')"
+    convert $CONVERSION $FILE $DEST/$BASE.jpg
+
+done
\ No newline at end of file

diff --git a/core/datafiles-src/tours/creating_design/dialog-1.png b/core/datafiles-src/tours/creating_design/dialog-1.png
new file mode 100644 (file)
index 0000000..2345dc0
Binary files /dev/null and b/core/datafiles-src/tours/creating_design/dialog-1.png differ

diff --git a/core/datafiles-src/tours/creating_design/dialog-2.png b/core/datafiles-src/tours/creating_design/dialog-2.png
new file mode 100644 (file)
index 0000000..e9f417c
Binary files /dev/null and b/core/datafiles-src/tours/creating_design/dialog-2.png differ

diff --git a/core/datafiles-src/tours/creating_design/dialog-3.png b/core/datafiles-src/tours/creating_design/dialog-3.png
new file mode 100644 (file)
index 0000000..429281c
Binary files /dev/null and b/core/datafiles-src/tours/creating_design/dialog-3.png differ

diff --git a/core/datafiles-src/tours/creating_design/dialog-4.png b/core/datafiles-src/tours/creating_design/dialog-4.png
new file mode 100644 (file)
index 0000000..9ea8fae
Binary files /dev/null and b/core/datafiles-src/tours/creating_design/dialog-4.png differ

diff --git a/core/datafiles-src/tours/creating_design/dialog-5.png b/core/datafiles-src/tours/creating_design/dialog-5.png
new file mode 100644 (file)
index 0000000..927772b
Binary files /dev/null and b/core/datafiles-src/tours/creating_design/dialog-5.png differ

diff --git a/core/datafiles-src/tours/creating_design/dialog-6.png b/core/datafiles-src/tours/creating_design/dialog-6.png
new file mode 100644 (file)
index 0000000..d5b4542
Binary files /dev/null and b/core/datafiles-src/tours/creating_design/dialog-6.png differ

diff --git a/core/datafiles-src/tours/creating_design/final.png b/core/datafiles-src/tours/creating_design/final.png
new file mode 100644 (file)
index 0000000..fae17ac
Binary files /dev/null and b/core/datafiles-src/tours/creating_design/final.png differ

diff --git a/core/datafiles-src/tours/creating_design/initial.png b/core/datafiles-src/tours/creating_design/initial.png
new file mode 100644 (file)
index 0000000..e26b31a
Binary files /dev/null and b/core/datafiles-src/tours/creating_design/initial.png differ

diff --git a/core/datafiles-src/tours/creating_design/main-1.xcf.gz b/core/datafiles-src/tours/creating_design/main-1.xcf.gz
new file mode 100644 (file)
index 0000000..ff7cc03
Binary files /dev/null and b/core/datafiles-src/tours/creating_design/main-1.xcf.gz differ

diff --git a/core/datafiles-src/tours/creating_design/main-2.png b/core/datafiles-src/tours/creating_design/main-2.png
new file mode 100644 (file)
index 0000000..e2cb380
Binary files /dev/null and b/core/datafiles-src/tours/creating_design/main-2.png differ

diff --git a/core/datafiles-src/tours/creating_design/main-3.png b/core/datafiles-src/tours/creating_design/main-3.png
new file mode 100644 (file)
index 0000000..8f8c093
Binary files /dev/null and b/core/datafiles-src/tours/creating_design/main-3.png differ

diff --git a/core/datafiles-src/tours/creating_design/main-4.png b/core/datafiles-src/tours/creating_design/main-4.png
new file mode 100644 (file)
index 0000000..1872626
Binary files /dev/null and b/core/datafiles-src/tours/creating_design/main-4.png differ

diff --git a/core/datafiles-src/tours/creating_design/main-5.png b/core/datafiles-src/tours/creating_design/main-5.png
new file mode 100644 (file)
index 0000000..65cec4e
Binary files /dev/null and b/core/datafiles-src/tours/creating_design/main-5.png differ

diff --git a/core/datafiles-src/tours/creating_design/main-6.png b/core/datafiles-src/tours/creating_design/main-6.png
new file mode 100644 (file)
index 0000000..e371471
Binary files /dev/null and b/core/datafiles-src/tours/creating_design/main-6.png differ

diff --git a/core/datafiles-src/tours/creating_design/main-7.png b/core/datafiles-src/tours/creating_design/main-7.png
new file mode 100644 (file)
index 0000000..5532064
Binary files /dev/null and b/core/datafiles-src/tours/creating_design/main-7.png differ

diff --git a/core/datafiles-src/tours/introduction/advanced_features.xcf.gz b/core/datafiles-src/tours/introduction/advanced_features.xcf.gz
new file mode 100644 (file)
index 0000000..5c687d3
Binary files /dev/null and b/core/datafiles-src/tours/introduction/advanced_features.xcf.gz differ

diff --git a/core/datafiles-src/tours/introduction/flight_simulations.xcf.gz b/core/datafiles-src/tours/introduction/flight_simulations.xcf.gz
new file mode 100644 (file)
index 0000000..e3fb8ad
Binary files /dev/null and b/core/datafiles-src/tours/introduction/flight_simulations.xcf.gz differ

diff --git a/core/datafiles-src/tours/introduction/logo-MANUAL.xcf.gz b/core/datafiles-src/tours/introduction/logo-MANUAL.xcf.gz
new file mode 100644 (file)
index 0000000..be322dd
Binary files /dev/null and b/core/datafiles-src/tours/introduction/logo-MANUAL.xcf.gz differ

diff --git a/core/datafiles-src/tours/introduction/main_window.png b/core/datafiles-src/tours/introduction/main_window.png
new file mode 100644 (file)
index 0000000..8a217a9
Binary files /dev/null and b/core/datafiles-src/tours/introduction/main_window.png differ

diff --git a/core/datafiles-src/tours/introduction/main_window_bottom.xcf.gz b/core/datafiles-src/tours/introduction/main_window_bottom.xcf.gz
new file mode 100644 (file)
index 0000000..3a2f23e
Binary files /dev/null and b/core/datafiles-src/tours/introduction/main_window_bottom.xcf.gz differ

diff --git a/core/datafiles-src/tours/introduction/main_window_top.xcf.gz b/core/datafiles-src/tours/introduction/main_window_top.xcf.gz
new file mode 100644 (file)
index 0000000..ba08206
Binary files /dev/null and b/core/datafiles-src/tours/introduction/main_window_top.xcf.gz differ

diff --git a/datafiles-src/thrustcurves/Loki_J175.rse b/datafiles-src/thrustcurves/Loki_J175.rse
deleted file mode 100644 (file)
index 981ee62..0000000
--- a/datafiles-src/thrustcurves/Loki_J175.rse
+++ /dev/null
@@ -1,27 +0,0 @@
-<engine-database>\r
- <engine-list>\r
-<engine FDiv="10" FFix="1" FStep="-1." Isp="199.98" Itot="1157.08" Type="reloadable" auto-calc-cg="1" auto-calc-mass="1" avgThrust="178.012" burn-time="6.5" cgDiv="10" cgFix="1" cgStep="-1." code="J175" delays="1000" dia="54." exitDia="0." initWt="1264." len="327." mDiv="10" mFix="1" mStep="-1." massFrac="46.68" mfg="Loki Research" peakThrust="420.4" propWt="590." tDiv="10" tFix="1" tStep="-1." throatDia="0.">\r
-<data>\r
-<eng-data cg="163.5" f="0." m="590." t="0."/>\r
-<eng-data cg="163.5" f="4.8" m="589.988" t="0.01"/>\r
-<eng-data cg="163.5" f="420.4" m="580.231" t="0.1"/>\r
-<eng-data cg="163.5" f="347.5" m="560.653" t="0.2"/>\r
-<eng-data cg="163.5" f="349.9" m="542.873" t="0.3"/>\r
-<eng-data cg="163.5" f="364.5" m="524.659" t="0.4"/>\r
-<eng-data cg="163.5" f="320.7" m="507.19" t="0.5"/>\r
-<eng-data cg="163.5" f="296.4" m="428.524" t="1."/>\r
-<eng-data cg="163.5" f="279.4" m="355.123" t="1.5"/>\r
-<eng-data cg="163.5" f="260." m="286.363" t="2."/>\r
-<eng-data cg="163.5" f="238.1" m="222.867" t="2.5"/>\r
-<eng-data cg="163.5" f="209." m="165.872" t="3."/>\r
-<eng-data cg="163.5" f="172." m="117.304" t="3.5"/>\r
-<eng-data cg="163.5" f="133.6" m="78.3469" t="4."/>\r
-<eng-data cg="163.5" f="102." m="48.3135" t="4.5"/>\r
-<eng-data cg="163.5" f="75.3" m="25.712" t="5."/>\r
-<eng-data cg="163.5" f="46.2" m="10.2236" t="5.5"/>\r
-<eng-data cg="163.5" f="17." m="2.1671" t="6."/>\r
-<eng-data cg="163.5" f="0." m="0." t="6.5"/>\r
-</data>\r
-</engine>\r
- </engine-list>\r
-</engine-database>\r

diff --git a/datafiles-src/thrustcurves/README.txt b/datafiles-src/thrustcurves/README.txt
deleted file mode 100644 (file)
index 3c6da04..0000000
--- a/datafiles-src/thrustcurves/README.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-
-This directory contains manually added / modified thrust curves.
-All other thrust curves are from www.thrustcurve.org
-(all RASP and RSE files).
-
-SF_*.eng - Thrust curves for Weco Feuerwerk motors, created by Sampo N.
-
-Loki_J175.rse - Corrected motor type from hybrid to reloadable
-

diff --git a/datafiles-src/thrustcurves/SF_A8.eng b/datafiles-src/thrustcurves/SF_A8.eng
deleted file mode 100644 (file)
index 292f5e3..0000000
--- a/datafiles-src/thrustcurves/SF_A8.eng
+++ /dev/null
@@ -1,16 +0,0 @@
-; Sachsen Feuerwerk / WECO Feuerwerk A8-3
-; Created by Sampo Niskanen for OpenRocket, released into the Public Domain
-; Thrust curve data taken from:
-; http://www.raketenmodellbautechnik.de/produkte/Motoren/SF-Motoren.pdf
-; Mass measured by the author.
-A8 18 70 3 0.00312 0.0153 SF
-   0.065 0.44
-   0.11 1.832
-   0.199 6.412
-   0.298 12.0
-   0.332 7.805
-   0.363 5.716
-   0.438 4.397
-   0.462 4.379
-   0.555 1.227
-   0.62 0.0

diff --git a/datafiles-src/thrustcurves/SF_B4.eng b/datafiles-src/thrustcurves/SF_B4.eng
deleted file mode 100644 (file)
index e8a4adf..0000000
--- a/datafiles-src/thrustcurves/SF_B4.eng
+++ /dev/null
@@ -1,16 +0,0 @@
-; Sachsen Feuerwerk / WECO Feuerwerk B4-0, B4-4
-; Created by Sampo Niskanen for OpenRocket, released into the Public Domain
-; Thrust curve data taken from:
-; http://www.raketenmodellbautechnik.de/produkte/Motoren/SF-Motoren.pdf
-; Mass measured by the author from B4-4 motors.
-B4 18 70 0-4 0.00833 0.0195 SF
-   0.088 0.542
-   0.167 3.007
-   0.319 11.678
-   0.373 5.297
-   0.525 4.091
-   0.648 3.461
-   0.8 3.321
-   1.305 3.321
-   1.389 0.455
-   1.443 0.0

diff --git a/datafiles-src/thrustcurves/SF_C2.eng b/datafiles-src/thrustcurves/SF_C2.eng
deleted file mode 100644 (file)
index 8e0b6e6..0000000
--- a/datafiles-src/thrustcurves/SF_C2.eng
+++ /dev/null
@@ -1,29 +0,0 @@
-; Sachsen Feuerwerk / WECO Feuerwerk Held 1000
-; Created by Sampo Niskanen for OpenRocket, released into the Public Domain
-; Thrust curve data taken from:
-; http://www.raketenmodellbautechnik.de/produkte/Motoren/SF-Motoren.pdf
-; True propellant weight unknown, estimates from various sources
-C2 15 95 P 0.012 0.024 SF
-   0.075 3.543
-   0.16 8.231
-   0.184 8.007
-   0.255 3.134
-   0.316 1.765
-   0.444 1.304
-   0.821 1.251
-   0.963 1.04
-   1.538 1.277
-   1.736 1.133
-   2.491 1.317
-   2.704 1.264
-   3.397 1.436
-   3.907 1.436
-   4.157 1.277
-   4.459 1.449
-   4.469 2.292
-   4.53 1.436
-   4.917 1.449
-   4.931 2.292
-   4.969 1.422
-   5.002 1.436
-   5.068 0.0

diff --git a/datafiles-src/thrustcurves/SF_C6.eng b/datafiles-src/thrustcurves/SF_C6.eng
deleted file mode 100644 (file)
index 00da30e..0000000
--- a/datafiles-src/thrustcurves/SF_C6.eng
+++ /dev/null
@@ -1,21 +0,0 @@
-; Sachsen Feuerwerk / WECO Feuerwerk C6-0, C6-3, C6-5
-; Created by Sampo Niskanen for OpenRocket, released into the Public Domain
-; Thrust curve data taken from:
-; http://www.raketenmodellbautechnik.de/produkte/Motoren/SF-Motoren.pdf
-; Mass measured by the author from C6-3 motors.
-C6 18 70 0-3-5 0.01248 0.022 SF
-   0.096 0.579
-   0.152 2.441
-   0.184 4.372
-   0.312 11.642
-   0.354 11.589
-   0.395 6.269
-   0.441 5.127
-   0.537 4.091
-   0.643 3.529
-   0.983 3.301
-   1.162 3.249
-   1.217 3.02
-   1.882 3.652
-   1.919 1.141
-   1.997 0.0

diff --git a/datafiles-src/thrustcurves/SF_D7.eng b/datafiles-src/thrustcurves/SF_D7.eng
deleted file mode 100644 (file)
index 1a7dfe0..0000000
--- a/datafiles-src/thrustcurves/SF_D7.eng
+++ /dev/null
@@ -1,19 +0,0 @@
-; Sachsen Feuerwerk / WECO Feuerwerk D7-0, D7-3
-; Created by Sampo Niskanen for OpenRocket, released into the Public Domain
-; Thrust curve data taken from:
-; http://www.raketenmodellbautechnik.de/produkte/Motoren/SF-Motoren.pdf
-; Mass measured by the author from D7-3 motors.
-D7 25 70 0-3 0.019 0.043 SF
-   0.079 1.625
-   0.179 6.979
-   0.326 18.992
-   0.355 19.407
-   0.372 20.426
-   0.422 20.331
-   0.48 14.085
-   0.538 11.536
-   0.68 9.815
-   0.96 7.839
-   1.34 8.253
-   1.461 2.167
-   1.582 0.0

diff --git a/datafiles-src/tours/convert-images.sh b/datafiles-src/tours/convert-images.sh
deleted file mode 100755 (executable)
index f9fa53c..0000000
--- a/datafiles-src/tours/convert-images.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-#
-# A script to batch-convert all source image files into suitable
-# slideset image files.  It converts all *.png, *.jpg and *.xcf.gz
-# files into the suitably sized jpg images in the datafiles directory.
-#
-
-DEST=../../datafiles/tours
-
-CONVERSION="-background #ececec -flatten -geometry 600x400 -quality 85"
-
-
-# Convert all xcf files
-find -iname "*.xcf.gz" | grep -v MANUAL | while read FILE; do
-
-    echo Converting $FILE
-    BASE="$(echo $FILE | sed 's/\.xcf\.gz$//')"
-    xcf2png "$FILE" | convert $CONVERSION - $DEST/$BASE.jpg
-
-done
-
-# Convert all png and jpg files
-find -iname "*.png" -o -iname "*.jpg" | grep -v MANUAL | while read FILE; do 
-
-    echo Converting $FILE
-    BASE="$(echo $FILE | sed 's/\.png$//' | sed 's/\.jpg$//')"
-    convert $CONVERSION $FILE $DEST/$BASE.jpg
-
-done
\ No newline at end of file

diff --git a/datafiles-src/tours/creating_design/dialog-1.png b/datafiles-src/tours/creating_design/dialog-1.png
deleted file mode 100644 (file)
index 2345dc0..0000000
Binary files a/datafiles-src/tours/creating_design/dialog-1.png and /dev/null differ

diff --git a/datafiles-src/tours/creating_design/dialog-2.png b/datafiles-src/tours/creating_design/dialog-2.png
deleted file mode 100644 (file)
index e9f417c..0000000
Binary files a/datafiles-src/tours/creating_design/dialog-2.png and /dev/null differ

diff --git a/datafiles-src/tours/creating_design/dialog-3.png b/datafiles-src/tours/creating_design/dialog-3.png
deleted file mode 100644 (file)
index 429281c..0000000
Binary files a/datafiles-src/tours/creating_design/dialog-3.png and /dev/null differ

diff --git a/datafiles-src/tours/creating_design/dialog-4.png b/datafiles-src/tours/creating_design/dialog-4.png
deleted file mode 100644 (file)
index 9ea8fae..0000000
Binary files a/datafiles-src/tours/creating_design/dialog-4.png and /dev/null differ

diff --git a/datafiles-src/tours/creating_design/dialog-5.png b/datafiles-src/tours/creating_design/dialog-5.png
deleted file mode 100644 (file)
index 927772b..0000000
Binary files a/datafiles-src/tours/creating_design/dialog-5.png and /dev/null differ

diff --git a/datafiles-src/tours/creating_design/dialog-6.png b/datafiles-src/tours/creating_design/dialog-6.png
deleted file mode 100644 (file)
index d5b4542..0000000
Binary files a/datafiles-src/tours/creating_design/dialog-6.png and /dev/null differ

diff --git a/datafiles-src/tours/creating_design/final.png b/datafiles-src/tours/creating_design/final.png
deleted file mode 100644 (file)
index fae17ac..0000000
Binary files a/datafiles-src/tours/creating_design/final.png and /dev/null differ

diff --git a/datafiles-src/tours/creating_design/initial.png b/datafiles-src/tours/creating_design/initial.png
deleted file mode 100644 (file)
index e26b31a..0000000
Binary files a/datafiles-src/tours/creating_design/initial.png and /dev/null differ

diff --git a/datafiles-src/tours/creating_design/main-1.xcf.gz b/datafiles-src/tours/creating_design/main-1.xcf.gz
deleted file mode 100644 (file)
index ff7cc03..0000000
Binary files a/datafiles-src/tours/creating_design/main-1.xcf.gz and /dev/null differ

diff --git a/datafiles-src/tours/creating_design/main-2.png b/datafiles-src/tours/creating_design/main-2.png
deleted file mode 100644 (file)
index e2cb380..0000000
Binary files a/datafiles-src/tours/creating_design/main-2.png and /dev/null differ

diff --git a/datafiles-src/tours/creating_design/main-3.png b/datafiles-src/tours/creating_design/main-3.png
deleted file mode 100644 (file)
index 8f8c093..0000000
Binary files a/datafiles-src/tours/creating_design/main-3.png and /dev/null differ

diff --git a/datafiles-src/tours/creating_design/main-4.png b/datafiles-src/tours/creating_design/main-4.png
deleted file mode 100644 (file)
index 1872626..0000000
Binary files a/datafiles-src/tours/creating_design/main-4.png and /dev/null differ

diff --git a/datafiles-src/tours/creating_design/main-5.png b/datafiles-src/tours/creating_design/main-5.png
deleted file mode 100644 (file)
index 65cec4e..0000000
Binary files a/datafiles-src/tours/creating_design/main-5.png and /dev/null differ

diff --git a/datafiles-src/tours/creating_design/main-6.png b/datafiles-src/tours/creating_design/main-6.png
deleted file mode 100644 (file)
index e371471..0000000
Binary files a/datafiles-src/tours/creating_design/main-6.png and /dev/null differ

diff --git a/datafiles-src/tours/creating_design/main-7.png b/datafiles-src/tours/creating_design/main-7.png
deleted file mode 100644 (file)
index 5532064..0000000
Binary files a/datafiles-src/tours/creating_design/main-7.png and /dev/null differ

diff --git a/datafiles-src/tours/introduction/advanced_features.xcf.gz b/datafiles-src/tours/introduction/advanced_features.xcf.gz
deleted file mode 100644 (file)
index 5c687d3..0000000
Binary files a/datafiles-src/tours/introduction/advanced_features.xcf.gz and /dev/null differ

diff --git a/datafiles-src/tours/introduction/flight_simulations.xcf.gz b/datafiles-src/tours/introduction/flight_simulations.xcf.gz
deleted file mode 100644 (file)
index e3fb8ad..0000000
Binary files a/datafiles-src/tours/introduction/flight_simulations.xcf.gz and /dev/null differ

diff --git a/datafiles-src/tours/introduction/logo-MANUAL.xcf.gz b/datafiles-src/tours/introduction/logo-MANUAL.xcf.gz
deleted file mode 100644 (file)
index be322dd..0000000
Binary files a/datafiles-src/tours/introduction/logo-MANUAL.xcf.gz and /dev/null differ

diff --git a/datafiles-src/tours/introduction/main_window.png b/datafiles-src/tours/introduction/main_window.png
deleted file mode 100644 (file)
index 8a217a9..0000000
Binary files a/datafiles-src/tours/introduction/main_window.png and /dev/null differ

diff --git a/datafiles-src/tours/introduction/main_window_bottom.xcf.gz b/datafiles-src/tours/introduction/main_window_bottom.xcf.gz
deleted file mode 100644 (file)
index 3a2f23e..0000000
Binary files a/datafiles-src/tours/introduction/main_window_bottom.xcf.gz and /dev/null differ

diff --git a/datafiles-src/tours/introduction/main_window_top.xcf.gz b/datafiles-src/tours/introduction/main_window_top.xcf.gz
deleted file mode 100644 (file)
index ba08206..0000000
Binary files a/datafiles-src/tours/introduction/main_window_top.xcf.gz and /dev/null differ