From: plaa Date: Sat, 17 Mar 2012 20:18:49 +0000 (+0000) Subject: Guided tour updates X-Git-Tag: upstream/12.03~1^2~6 X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=6e0545c0a958ac6387a3ab47a1a424ce0072f585;p=debian%2Fopenrocket Guided tour updates git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@465 180e2498-e6e9-4542-8430-84ac67f01cd8 --- diff --git a/core/resources-src/datafiles/tours/convert-images.sh b/core/resources-src/datafiles/tours/convert-images.sh index f9fa53c1..c62314a6 100755 --- a/core/resources-src/datafiles/tours/convert-images.sh +++ b/core/resources-src/datafiles/tours/convert-images.sh @@ -6,7 +6,7 @@ # files into the suitably sized jpg images in the datafiles directory. # -DEST=../../datafiles/tours +DEST=../../../resources/datafiles/tours CONVERSION="-background #ececec -flatten -geometry 600x400 -quality 85" @@ -27,4 +27,4 @@ find -iname "*.png" -o -iname "*.jpg" | grep -v MANUAL | while read FILE; do BASE="$(echo $FILE | sed 's/\.png$//' | sed 's/\.jpg$//')" convert $CONVERSION $FILE $DEST/$BASE.jpg -done \ No newline at end of file +done diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-1-nosecone.xcf.gz b/core/resources-src/datafiles/tours/creating_design/dialog-1-nosecone.xcf.gz new file mode 100644 index 00000000..b60a2a97 Binary files /dev/null and b/core/resources-src/datafiles/tours/creating_design/dialog-1-nosecone.xcf.gz differ diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-1.png b/core/resources-src/datafiles/tours/creating_design/dialog-1.png deleted file mode 100644 index 39a68327..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/dialog-1.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-1_es.png b/core/resources-src/datafiles/tours/creating_design/dialog-1_es.png deleted file mode 100644 index e0223b4d..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/dialog-1_es.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-1_fr.png b/core/resources-src/datafiles/tours/creating_design/dialog-1_fr.png deleted file mode 100644 index 89dbc473..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/dialog-1_fr.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-2-bodytube.xcf.gz b/core/resources-src/datafiles/tours/creating_design/dialog-2-bodytube.xcf.gz new file mode 100644 index 00000000..cdd7797d Binary files /dev/null and b/core/resources-src/datafiles/tours/creating_design/dialog-2-bodytube.xcf.gz differ diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-2.png b/core/resources-src/datafiles/tours/creating_design/dialog-2.png deleted file mode 100644 index e9f417c7..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/dialog-2.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-2_es.png b/core/resources-src/datafiles/tours/creating_design/dialog-2_es.png deleted file mode 100644 index ac400dc9..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/dialog-2_es.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-2_fr.png b/core/resources-src/datafiles/tours/creating_design/dialog-2_fr.png deleted file mode 100644 index 5b30a026..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/dialog-2_fr.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-3-finset.xcf.gz b/core/resources-src/datafiles/tours/creating_design/dialog-3-finset.xcf.gz new file mode 100644 index 00000000..0969c466 Binary files /dev/null and b/core/resources-src/datafiles/tours/creating_design/dialog-3-finset.xcf.gz differ diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-3.png b/core/resources-src/datafiles/tours/creating_design/dialog-3.png deleted file mode 100644 index 429281c1..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/dialog-3.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-3_es.png b/core/resources-src/datafiles/tours/creating_design/dialog-3_es.png deleted file mode 100644 index 03c4bd17..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/dialog-3_es.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-3_fr.png b/core/resources-src/datafiles/tours/creating_design/dialog-3_fr.png deleted file mode 100644 index 510e51fe..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/dialog-3_fr.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-4-innertube.xcf.gz b/core/resources-src/datafiles/tours/creating_design/dialog-4-innertube.xcf.gz new file mode 100644 index 00000000..b356c603 Binary files /dev/null and b/core/resources-src/datafiles/tours/creating_design/dialog-4-innertube.xcf.gz differ diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-4.png b/core/resources-src/datafiles/tours/creating_design/dialog-4.png deleted file mode 100644 index 9ea8faec..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/dialog-4.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-4_es.png b/core/resources-src/datafiles/tours/creating_design/dialog-4_es.png deleted file mode 100644 index 1de9a8f4..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/dialog-4_es.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-4_fr.png b/core/resources-src/datafiles/tours/creating_design/dialog-4_fr.png deleted file mode 100644 index b2625362..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/dialog-4_fr.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-5-centeringring.xcf.gz b/core/resources-src/datafiles/tours/creating_design/dialog-5-centeringring.xcf.gz new file mode 100644 index 00000000..07317833 Binary files /dev/null and b/core/resources-src/datafiles/tours/creating_design/dialog-5-centeringring.xcf.gz differ diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-5.png b/core/resources-src/datafiles/tours/creating_design/dialog-5.png deleted file mode 100644 index 927772b2..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/dialog-5.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-5_es.png b/core/resources-src/datafiles/tours/creating_design/dialog-5_es.png deleted file mode 100644 index 734e57b1..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/dialog-5_es.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-5_fr.png b/core/resources-src/datafiles/tours/creating_design/dialog-5_fr.png deleted file mode 100644 index 6fca5da5..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/dialog-5_fr.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-6-parachute.xcf.gz b/core/resources-src/datafiles/tours/creating_design/dialog-6-parachute.xcf.gz new file mode 100644 index 00000000..37071f74 Binary files /dev/null and b/core/resources-src/datafiles/tours/creating_design/dialog-6-parachute.xcf.gz differ diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-6.png b/core/resources-src/datafiles/tours/creating_design/dialog-6.png deleted file mode 100644 index d5b45424..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/dialog-6.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-6_es.png b/core/resources-src/datafiles/tours/creating_design/dialog-6_es.png deleted file mode 100644 index 891d8fb4..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/dialog-6_es.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-6_fr.png b/core/resources-src/datafiles/tours/creating_design/dialog-6_fr.png deleted file mode 100644 index 90eb1754..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/dialog-6_fr.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/final.png b/core/resources-src/datafiles/tours/creating_design/final.png deleted file mode 100644 index fae17ac1..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/final.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/final_es.png b/core/resources-src/datafiles/tours/creating_design/final_es.png deleted file mode 100644 index beafe478..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/final_es.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/final_fr.png b/core/resources-src/datafiles/tours/creating_design/final_fr.png deleted file mode 100644 index bf8bf23c..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/final_fr.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/initial.png b/core/resources-src/datafiles/tours/creating_design/initial.png deleted file mode 100644 index e26b31ad..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/initial.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/initial_es.png b/core/resources-src/datafiles/tours/creating_design/initial_es.png deleted file mode 100644 index ebe5bbcb..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/initial_es.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/initial_fr.png b/core/resources-src/datafiles/tours/creating_design/initial_fr.png deleted file mode 100644 index 62ac21ae..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/initial_fr.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-0-initial.png b/core/resources-src/datafiles/tours/creating_design/main-0-initial.png new file mode 100644 index 00000000..e26b31ad Binary files /dev/null and b/core/resources-src/datafiles/tours/creating_design/main-0-initial.png differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-1-nosecone.xcf.gz b/core/resources-src/datafiles/tours/creating_design/main-1-nosecone.xcf.gz new file mode 100644 index 00000000..20b79212 Binary files /dev/null and b/core/resources-src/datafiles/tours/creating_design/main-1-nosecone.xcf.gz differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-1.xcf.gz b/core/resources-src/datafiles/tours/creating_design/main-1.xcf.gz deleted file mode 100644 index ff7cc039..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/main-1.xcf.gz and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-1_es.png b/core/resources-src/datafiles/tours/creating_design/main-1_es.png deleted file mode 100644 index e3bb75dd..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/main-1_es.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-1_fr.png b/core/resources-src/datafiles/tours/creating_design/main-1_fr.png deleted file mode 100644 index fef407d8..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/main-1_fr.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-2-bodytube.xcf.gz b/core/resources-src/datafiles/tours/creating_design/main-2-bodytube.xcf.gz new file mode 100644 index 00000000..d6834fc7 Binary files /dev/null and b/core/resources-src/datafiles/tours/creating_design/main-2-bodytube.xcf.gz differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-2.png b/core/resources-src/datafiles/tours/creating_design/main-2.png deleted file mode 100644 index e2cb3806..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/main-2.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-2_es.png b/core/resources-src/datafiles/tours/creating_design/main-2_es.png deleted file mode 100644 index a9e86454..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/main-2_es.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-2_fr.png b/core/resources-src/datafiles/tours/creating_design/main-2_fr.png deleted file mode 100644 index ff8179b1..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/main-2_fr.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-3-finset.xcf.gz b/core/resources-src/datafiles/tours/creating_design/main-3-finset.xcf.gz new file mode 100644 index 00000000..07f34f36 Binary files /dev/null and b/core/resources-src/datafiles/tours/creating_design/main-3-finset.xcf.gz differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-3.png b/core/resources-src/datafiles/tours/creating_design/main-3.png deleted file mode 100644 index 8f8c0930..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/main-3.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-3_es.png b/core/resources-src/datafiles/tours/creating_design/main-3_es.png deleted file mode 100644 index e62c8d6b..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/main-3_es.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-3_fr.png b/core/resources-src/datafiles/tours/creating_design/main-3_fr.png deleted file mode 100644 index 4ad9eb91..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/main-3_fr.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-4-innertube.xcf.gz b/core/resources-src/datafiles/tours/creating_design/main-4-innertube.xcf.gz new file mode 100644 index 00000000..7711f7d2 Binary files /dev/null and b/core/resources-src/datafiles/tours/creating_design/main-4-innertube.xcf.gz differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-4.png b/core/resources-src/datafiles/tours/creating_design/main-4.png deleted file mode 100644 index 18726265..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/main-4.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-4_es.png b/core/resources-src/datafiles/tours/creating_design/main-4_es.png deleted file mode 100644 index da08cd39..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/main-4_es.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-4_fr.png b/core/resources-src/datafiles/tours/creating_design/main-4_fr.png deleted file mode 100644 index c7ef4ce1..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/main-4_fr.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-5-centeringring.xcf.gz b/core/resources-src/datafiles/tours/creating_design/main-5-centeringring.xcf.gz new file mode 100644 index 00000000..1a54298b Binary files /dev/null and b/core/resources-src/datafiles/tours/creating_design/main-5-centeringring.xcf.gz differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-5.png b/core/resources-src/datafiles/tours/creating_design/main-5.png deleted file mode 100644 index 65cec4e5..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/main-5.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-5_es.png b/core/resources-src/datafiles/tours/creating_design/main-5_es.png deleted file mode 100644 index b0cc343f..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/main-5_es.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-5_fr.png b/core/resources-src/datafiles/tours/creating_design/main-5_fr.png deleted file mode 100644 index 78ca3e56..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/main-5_fr.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-6-parachute.xcf.gz b/core/resources-src/datafiles/tours/creating_design/main-6-parachute.xcf.gz new file mode 100644 index 00000000..3d65c371 Binary files /dev/null and b/core/resources-src/datafiles/tours/creating_design/main-6-parachute.xcf.gz differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-6.png b/core/resources-src/datafiles/tours/creating_design/main-6.png deleted file mode 100644 index e3714711..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/main-6.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-6_es.png b/core/resources-src/datafiles/tours/creating_design/main-6_es.png deleted file mode 100644 index c5a35bb6..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/main-6_es.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-6_fr.png b/core/resources-src/datafiles/tours/creating_design/main-6_fr.png deleted file mode 100644 index abfbd979..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/main-6_fr.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-7-rest.xcf.gz b/core/resources-src/datafiles/tours/creating_design/main-7-rest.xcf.gz new file mode 100644 index 00000000..1e3d3784 Binary files /dev/null and b/core/resources-src/datafiles/tours/creating_design/main-7-rest.xcf.gz differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-7.png b/core/resources-src/datafiles/tours/creating_design/main-7.png deleted file mode 100644 index 55320646..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/main-7.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-7_es.png b/core/resources-src/datafiles/tours/creating_design/main-7_es.png deleted file mode 100644 index ad14bf40..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/main-7_es.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-7_fr.png b/core/resources-src/datafiles/tours/creating_design/main-7_fr.png deleted file mode 100644 index 2a6f07c9..00000000 Binary files a/core/resources-src/datafiles/tours/creating_design/main-7_fr.png and /dev/null differ diff --git a/core/resources-src/datafiles/tours/creating_design/main-8-final.png b/core/resources-src/datafiles/tours/creating_design/main-8-final.png new file mode 100644 index 00000000..fae17ac1 Binary files /dev/null and b/core/resources-src/datafiles/tours/creating_design/main-8-final.png differ diff --git a/core/resources/datafiles/tours/creating_design/creating_design.tour b/core/resources/datafiles/tours/creating_design/creating_design.tour index 6d437c9c..3b51c570 100644 --- a/core/resources/datafiles/tours/creating_design/creating_design.tour +++ b/core/resources/datafiles/tours/creating_design/creating_design.tour @@ -4,7 +4,7 @@ Creating a simple rocket design

This tour shows how to create a simple rocket design from scratch. -[initial.jpg] +[main-0-initial.jpg]

When you choose to create a new design, you are presented with a blank design and the Rocket configuration dialog is displayed. @@ -15,14 +15,14 @@ the design name, designer, comments and revision information. component in the component tree. -[main-1.jpg] +[main-1-nosecone.jpg]

Next, add a Nose cone to the design by clicking the corresponding component addition button. This opens the nose cone configuration dialog. -[dialog-1.jpg] +[dialog-1-nosecone.jpg]

The configuration dialog contains settings for the nose cone shape, dimensions and material. Set the nose cone length to 10 cm, @@ -32,26 +32,26 @@ base diameter to 2.5 cm and material to Polystyrene (plastic). default units in Preferences. -[main-2.jpg] +[main-2-bodytube.jpg]

The design window displays the nose cone. Next, add a Body tube to the design. -[dialog-2.jpg] +[dialog-2-bodytube.jpg]

Change the body tube length to 25 cm. The Automatic option for the outer diameter is ticked by default, in which case the diameter is automatically the same as that of the nose cone. -[main-3.jpg] +[main-3-finset.jpg]

Next, add a Trapezoidal fin set to the rocket. The body tube must be selected in order to add the component. -[dialog-3.jpg] +[dialog-3-finset.jpg]

The trapezoidal fin set has numerous dimension parameters. The most important are the root and tip chord (length next to the body @@ -60,20 +60,20 @@ tube and tip), height and sweep.

The default values are okay for the example design. -[main-4.jpg] +[main-4-innertube.jpg]

Next, add an Inner tube as a motor mount. Select the body tube, and then click the component addition button. -[dialog-4.jpg] +[dialog-4-innertube.jpg]

The default dimensions are suitable for Estes A-C motors. To have the motor mount overhang a bit, change the position parameter to Bottom of parent component plus 0.5 cm. -[main-5.jpg] +[main-5-centeringring.jpg]

To add Centering rings to keep the mount in place, select the body tube and click the centering ring button. @@ -83,7 +83,7 @@ ring will be added inside the inner tube. Use Edit → Undo to undo the latest action.) -[dialog-5.jpg] +[dialog-5-centeringring.jpg]

The centering ring automatically selects the appropriate outer and inner diameter when the Automatic checkboxes are selected. @@ -96,12 +96,12 @@ the position parameter to Bottom of parent component plus parameter zero. -[main-6.jpg] +[main-6-parachute.jpg]

Next add a Parachute to the body tube. -[dialog-6.jpg] +[dialog-6-parachute.jpg]

The canopy diameter and drag coefficient determine how much the parachute slows down the rocket during descent. @@ -111,21 +111,22 @@ mass. The packed length, diameter and parachute.

The Deploys at propery can be used to affect when the -parachute deploys. For First ejection charge of this stage +parachute deploys. The First ejection charge of this stage option will deploy the parachute when the ejection charge is fired, as is typical in small model rockets. -[main-7.jpg] +[main-7-rest.jpg]

Now the functional aspects of the rocket design are complete. -

For completeness you can still attach a Mass component to -the body tube for wadding, and an Engine block to the inner -tube for holding the motor in place. +

For completeness you can still attach a Shock cord and a +Mass component to the body tube for wadding, and an +Engine block to the inner tube for holding the motor in +place. -[final.jpg] +[main-8-final.jpg]

Now the rocket design is complete. diff --git a/core/resources/datafiles/tours/creating_design/creating_design_es.tour b/core/resources/datafiles/tours/creating_design/creating_design_es.tour index 8b7e6fc6..9593b8aa 100644 --- a/core/resources/datafiles/tours/creating_design/creating_design_es.tour +++ b/core/resources/datafiles/tours/creating_design/creating_design_es.tour @@ -4,7 +4,7 @@ Crear un diseño de cohete básico

Este tema muestra cómo crear un diseño de cohete básico desde el principio. -[initial_es.jpg] +[main-0-initial.jpg]

Cuando elija crear un diseño nuevo, se le abrirá un diseño en blanco y aparecerá el cuadro de diálogo Configuración del cohete. @@ -15,62 +15,62 @@ Crear un diseño de cohete básico -[main-1_es.jpg] +[main-1-nosecone.jpg]

Seguidamente añadimos una Ojiva al diseño haciendo clic sobre el icono del componente correspondiente. Se abrirá la ventana de configuración de la Ojiva. -[dialog-1_es.jpg] +[dialog-1-nosecone.jpg]

La ventana de configuración contiene los parámetros de configuración para la forma de la Ojiva, dimensiones y material. Establezca la longitud de la Ojiva a 10 cm, el diámetro de la base a 2.5 cm, y el material a Cartón (0.68 g/cm^3).

Para cambiar a pulgadas, haga clic sobre la unidad de medida, o bien modifique las unidades por defecto en Preferencias. -[main-2_es.jpg] +[main-2-bodytube.jpg]

La ventana de diseño muestra la Ojiva. Seguidamente añadimos el Cuerpo tubular al diseño, haciendo clic sobre el icono correspondiente. -[dialog-2_es.jpg] +[dialog-2-bodytube.jpg]

Modifique la longitud del cuerpo a 25 cm. El casillero para el diámetro exterior Automático está marcado por defecto, en este caso el diámetro exterior se establece de forma automática al mismo diámetro de la base de la Ojiva. -[main-3_es.jpg] +[main-3-finset.jpg]

Seguidamente añadiremos un Juego de aletas Trapezoidales al cohete.

Para poder añadirlas, el Cuerpo tubular debe estar seleccionado en el árbol del diseño. Después haga clic sobre el icono del componente de aletas correspondiente. -[dialog-3_es.jpg] +[dialog-3-finset.jpg]

El juego de aletas trapezoidales posee una gran cantidad de parámetros de configuración. Los más importantes son: la longitud de la línea base, la longitud del borde superior, el ángulo de inclinación del borde de ataque, la altura y su localización en el cuerpo.

Los valores establecidos por defecto son correctos para este ejemplo. -[main-4_es.jpg] +[main-4-innertube.jpg]

A continuación añadiremos un Tubo interior como porta-motor. Primero seleccione el Cuerpo tubular en el árbol del diseño, y después haga clic sobre el icono correspondiente para añadirlo. -[dialog-4_es.jpg] +[dialog-4-innertube.jpg]

Las dimensiones por defecto están ajustadas para los motores ESTES de clase A hasta la C. Para que el porta-motor sobresalga un poco, cambie el parámetro de la localización a Extremo inferior del componente con 0.5 cm. En la pestaña “Motor” marque el casillero Este componente es un porta motor. -[main-5_es.jpg] +[main-5-centeringring.jpg]

Para añadir los Anillos de centrado que mantienen el porta-motor en su sitio, seleccione primero el Cuerpo tubular en el árbol de componentes y seguidamente haga clic sobre el icono correspondiente.

Aviso Si tuviera seleccionado el Tubo interior en el árbol del diseño, al hacer clic sobre el icono del Anillo de centrado éste se añadirá en el interior del tubo porta-motor. Si se ha equivocado, utilice el menú Edición → Deshacer para deshacer la última acción. -[dialog-5_es.jpg] +[dialog-5-centeringring.jpg]

El casillero Automático está activado por defecto en los parámetros de las dimensiones del componente, por lo que el anillo de centrado se ajustará automáticamente a las dimensiones internas del Cuerpo tubular y a las dimensiones externas del Tubo porta-motor. @@ -79,26 +79,26 @@ Crear un diseño de cohete básico

Seguidamente agregue otro anillo de centrado en el borde trasero del Cuerpo tubular, poniendo el parámetro de la localización a cero. -[main-6_es.jpg] +[main-6-parachute.jpg]

A continuación incorporaremos un Paracaídas al Cuerpo tubular. Primero seleccione el Cuerpo tubualr en el árbol del diseño, y después haga clic sobre el icono del Paracaídas. -[dialog-6_es.jpg] +[dialog-6-parachute.jpg]

El diámetro del pabellón y el coeficiente de arrastre determinan la velocidad con la que el paracaídas hará descender el cohete a tierra. El material y las cuerdas tienen su efecto en la masa total del cohete, mientras que la longitud del empaquetado, el diámetro y la posición afectan al tamaño del empaquetado y la ubicación del paracaídas en el diseño.

La propiedad Desplegar en puede establecerse para indicar el instante en el que se despliega el paracaídas. Con la opción Primera carga de eyección de ésta etapa se desplegará el paracaídas en el instante en el que se quema la carga de eyección del motor, que es lo habitual en los pequeños modelos de cohete. -[main-7_es.jpg] +[main-7-rest.jpg]

Ahora los aspectos funcionales del diseño del cohete ya están completados.

Para completarlo aún más, puede añadir un componente Masa al Cuerpo tubular para el algodón ignífugo, y un Retén de motor en el interior del Tubo interior para mantener el motor en su sitio y así evitar que pueda desplazarse por el interior del cohete. -[final_es.jpg] +[main-8-final.jpg]

El diseño del cohete ya está completo. diff --git a/core/resources/datafiles/tours/creating_design/creating_design_fr.tour b/core/resources/datafiles/tours/creating_design/creating_design_fr.tour index c2aaa764..422c379c 100644 --- a/core/resources/datafiles/tours/creating_design/creating_design_fr.tour +++ b/core/resources/datafiles/tours/creating_design/creating_design_fr.tour @@ -4,7 +4,7 @@ Concevoir une fusée simple

Ce tour d'horizon montre comment concevoir une fusée simple en partant de rien. -[initial_fr.jpg] +[main-0-initial.jpg]

Lorsque vous décidez de créer un nouveau projet, un projet vide vous est proposé et la fenêtre de dialogue configuration fusée est affichée. @@ -15,7 +15,7 @@ nom du projet, le concepteur, des commentaires et informations sur chaque versio parent de l'arbre des pièces. -[main-1.jpg] +[main-1-nosecone.jpg]

Ensuite, ajoutez une ogive au projet en cliquant sur le bouton correspondant à la la pièce. Cela ouvre la fenêtre de dialogue de configuration @@ -23,7 +23,7 @@ de l'ogive. -[dialog-1_fr.jpg] +[dialog-1-nosecone.jpg]

La fenêtre de dialogue de configuration contient des paramètres pour la forme de l'ogive, ses dimensions et matériaux. Mettez la longueur de l'ogive à 10 cm, @@ -33,26 +33,26 @@ le diamètre de la base à 2.5 cm et comme matériau du Polystyrène (plast soit vous changez les unités par défaut dans les Préférences. -[main-2_fr.jpg] +[main-2-bodytube.jpg]

La fenêtre de conception affiche l'ogive. Ensuite, ajoutez au projet un tube pour le corps. -[dialog-2_fr.jpg] +[dialog-2-bodytube.jpg]

Changez la longueur du tube à 25 cm. L'option Automatique pour le diamètre externe est cochée par défaut, et dans ce cas le diamètre est automatiquement le même que celui de l'ogive. -[main-3_fr.jpg] +[main-3-finset.jpg]

Ensuite ajoutez à la fusée un jeu d'ailerons Trapézoïdaux. Le tube du corps doit être sélectionné pour pouvoir ajouter les pièces. -[dialog-3_fr.jpg] +[dialog-3-finset.jpg]

Le jeu d'ailerons trapézoïdaux a plusieurs paramètres de dimension. Les plus important sont "the root" et "tip chord" (length next to the body @@ -61,20 +61,20 @@ tube and tip), height and sweep.

Les valeurs par défaut sont ok pour l'exemple de projet. -[main-4_fr.jpg] +[main-4-innertube.jpg]

Ensuite ajouter un tube interne pour faire un porte moteur. Sélectionnez le tube du corps et ensuite cliquez sur le bouton d'ajout de la pièce. -[dialog-4_fr.jpg] +[dialog-4-innertube.jpg]

Les dimensions par défaut sont celles des moteurs Estes A-C. Pour avoir le porte moteur qui ressort un peu changez le paramètre de position en Bas de la pièce parent plus 0.5 cm. -[main-5_fr.jpg] +[main-5-centeringring.jpg]

Pour ajouter des Anneaux de Centrage pour garder le porte moteur en place, sélectionnez le tube du corps et cliquez sur le bouton d'anneaux de centrage. @@ -84,7 +84,7 @@ sera ajouté à l'interieur du tube interne. Utilisez Modifier → Défaire pour défaire la dernière action.) -[dialog-5_fr.jpg] +[dialog-5-centeringring.jpg]

L'anneau de centrage choisi automatiquement le diamètre externe et interne approprié lorsque les cases Automatiques sont cochées. @@ -97,12 +97,12 @@ lorsque les cases Automatiques sont cochées. zéro. -[main-6_fr.jpg] +[main-6-parachute.jpg]

Ensuite ajoutez au tube du corps un Parachute. -[dialog-6_fr.jpg] +[dialog-6-parachute.jpg]

Le diamètre de canopé et le coefficient trainée détermine le freinage du parachute sur la fusée pendant la descente. @@ -116,7 +116,7 @@ déploiera le parachute lorsque la charge d'éjection est allumée, comme c'est en générale le cas dans les petites fusées modèle réduit. -[main-7_fr.jpg] +[main-7-rest.jpg]

Les aspects fonctionnel de la conception de la fusée sont maintenant terminés. @@ -125,7 +125,7 @@ tube du corps pour le "wadding", et une bague de blocage moteur au tube interne pour maintenir le moteur en place. -[final_fr.jpg] +[main-8-final.jpg]

Maintenant le projet fusée est terminé. diff --git a/core/resources/datafiles/tours/creating_design/creating_design_it.tour b/core/resources/datafiles/tours/creating_design/creating_design_it.tour index e4ffbdfa..7d9de78e 100644 --- a/core/resources/datafiles/tours/creating_design/creating_design_it.tour +++ b/core/resources/datafiles/tours/creating_design/creating_design_it.tour @@ -4,19 +4,19 @@ Crea un semplice progetto di razzo

Questo tour mostra come creare un semplice progetto di razzo da zero. -[initial.jpg] +[main-0-initial.jpg]

Quando scegli di creare un nuovo progetto, ti viene mostrato un progetto vuoto con in primo piano la finestra Configurazione razzo . Qui puoi inserire le informazioni generali del tuo progetto, come il nome del razzo, il progettista, commenti e informazioni di revisione.

Puoi anche riaprirla in seguito facendo doppio click sul componente radice (il razzo stesso) nell'albero. -[main-1.jpg] +[main-1-nosecone.jpg]

Poi, aggiungi un Naso al progetto cliccando nel corrispettivo pulsante di aggiunta. Questo apre la finestra di configurazione del naso. -[dialog-1.jpg] +[dialog-1-nosecone.jpg]

La finestra contiene,tra le altre, le impostazione della forma, del diametro e del materiale. Imposta la lunghezza a 10 cm, il diametro di base a 2.5 cm ed il materiale a Polystyrene (plastic). @@ -24,41 +24,41 @@ il diametro di base a 2.5 cm ed il materiale a Polystyrene (plastic).

Per usare i pollici invece dei centimetri, o clicca sull'unità per cambiarla temporaneamente, o cambia l'unità di misura predefinita in Preferenze. -[main-2.jpg] +[main-2-bodytube.jpg]

La finestra di disegno mostra il naso. Poi, aggiungi al disegno un corpo. -[dialog-2.jpg] +[dialog-2-bodytube.jpg]

Cambia la lunghezza del corpo a 25 cm. L'opzione Automatico per il diametro esterno è già marcata, in questo caso il diametro viene fissato uguale a quello del naso in modo automatico. -[main-3.jpg] +[main-3-finset.jpg]

Poi, aggiungi al razzo l'insieme di pinne Trapezoidale . Per far ciò deve essere selezionato il corpo. -[dialog-3.jpg] +[dialog-3-finset.jpg]

Puoi cambiare numerosi parametri nella configurazione delle pinne. I più importanti sono la lunghezza prossima al tubo e quella prossima alla punta, l'altezza e l'inclinazione.

I valori preimpostati vanno bene per il progetto d'esempio. -[main-4.jpg] +[main-4-innertube.jpg]

Poi, aggiungi un Tubo interno come alloggiamento per il motore. Seleziona il corpo e poi clicca sul pulsante di aggiunta corrispondente. -[dialog-4.jpg] +[dialog-4-innertube.jpg]

Le dimensioni predefinite vanno bene per i motori Estes delle classi A-B-C. Per far sporgere un po' il motore, cambia il parametro posizione relativa a Parte bassa del componente genitore piu' 0.5 cm. -[main-5.jpg] +[main-5-centeringring.jpg]

Per aggiungere gli Anelli di centraggio per mantenere l'alloggia motore nella sua sede, seleziona il corpo e clicca sul pulsante Anelli di centraggio. @@ -66,7 +66,7 @@ per il diametro esterno è già marcata, in questo caso il diametro viene fissat Annulla per annullare l'ultima azione.) -[dialog-5.jpg] +[dialog-5-centeringring.jpg]

Quando le caselle di selezione Automatico sono selezionate l' Anello di centraggio sceglie gli appropriati diametri esterno ed interno. @@ -76,12 +76,12 @@ per il diametro esterno è già marcata, in questo caso il diametro viene fissat

Poi aggiungi un altro Anello di centraggio alla parte posteriore azzerando il parametro posizione. -[main-6.jpg] +[main-6-parachute.jpg]

Poi aggiungi un Paracadute al corpo. -[dialog-6.jpg] +[dialog-6-parachute.jpg]

Il Diametro ed il Coefficiente d'attrito determinano quanto il paracadute rallenta la discesa del razzo. @@ -92,14 +92,14 @@ Il materiale e Funi modificano la massa totale. Lunghezz farà uscire il paracadute quando si innescherà la carica , caso tipico dei piccoli razzi. -[main-7.jpg] +[main-7-rest.jpg]

Adesso l'aspetto funzionale del progetto è concluso.

Per completezza puoi anche aggiungere una Zavorra al corpo del razzo per l'imbottitura tampone,e un Blocca motore al tubo interno per mantenere in sede il motore. -[final.jpg] +[main-8-final.jpg]

Il razzo è completo! diff --git a/core/resources/datafiles/tours/creating_design/dialog-1-nosecone.jpg b/core/resources/datafiles/tours/creating_design/dialog-1-nosecone.jpg new file mode 100644 index 00000000..17bb86cf Binary files /dev/null and b/core/resources/datafiles/tours/creating_design/dialog-1-nosecone.jpg differ diff --git a/core/resources/datafiles/tours/creating_design/dialog-1.jpg b/core/resources/datafiles/tours/creating_design/dialog-1.jpg deleted file mode 100644 index e64c5406..00000000 Binary files a/core/resources/datafiles/tours/creating_design/dialog-1.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/dialog-1_es.jpg b/core/resources/datafiles/tours/creating_design/dialog-1_es.jpg deleted file mode 100644 index 8f638545..00000000 Binary files a/core/resources/datafiles/tours/creating_design/dialog-1_es.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/dialog-1_fr.jpg b/core/resources/datafiles/tours/creating_design/dialog-1_fr.jpg deleted file mode 100644 index d35c5c8b..00000000 Binary files a/core/resources/datafiles/tours/creating_design/dialog-1_fr.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/dialog-2-bodytube.jpg b/core/resources/datafiles/tours/creating_design/dialog-2-bodytube.jpg new file mode 100644 index 00000000..a6fdf004 Binary files /dev/null and b/core/resources/datafiles/tours/creating_design/dialog-2-bodytube.jpg differ diff --git a/core/resources/datafiles/tours/creating_design/dialog-2.jpg b/core/resources/datafiles/tours/creating_design/dialog-2.jpg deleted file mode 100644 index 39fddc3c..00000000 Binary files a/core/resources/datafiles/tours/creating_design/dialog-2.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/dialog-2_es.jpg b/core/resources/datafiles/tours/creating_design/dialog-2_es.jpg deleted file mode 100644 index c0208318..00000000 Binary files a/core/resources/datafiles/tours/creating_design/dialog-2_es.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/dialog-2_fr.jpg b/core/resources/datafiles/tours/creating_design/dialog-2_fr.jpg deleted file mode 100644 index b4db40e5..00000000 Binary files a/core/resources/datafiles/tours/creating_design/dialog-2_fr.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/dialog-3-finset.jpg b/core/resources/datafiles/tours/creating_design/dialog-3-finset.jpg new file mode 100644 index 00000000..4394764a Binary files /dev/null and b/core/resources/datafiles/tours/creating_design/dialog-3-finset.jpg differ diff --git a/core/resources/datafiles/tours/creating_design/dialog-3.jpg b/core/resources/datafiles/tours/creating_design/dialog-3.jpg deleted file mode 100644 index dac8757e..00000000 Binary files a/core/resources/datafiles/tours/creating_design/dialog-3.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/dialog-3_es.jpg b/core/resources/datafiles/tours/creating_design/dialog-3_es.jpg deleted file mode 100644 index dac32497..00000000 Binary files a/core/resources/datafiles/tours/creating_design/dialog-3_es.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/dialog-3_fr.jpg b/core/resources/datafiles/tours/creating_design/dialog-3_fr.jpg deleted file mode 100644 index 4a8e6f9e..00000000 Binary files a/core/resources/datafiles/tours/creating_design/dialog-3_fr.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/dialog-4-innertube.jpg b/core/resources/datafiles/tours/creating_design/dialog-4-innertube.jpg new file mode 100644 index 00000000..8b097ee9 Binary files /dev/null and b/core/resources/datafiles/tours/creating_design/dialog-4-innertube.jpg differ diff --git a/core/resources/datafiles/tours/creating_design/dialog-4.jpg b/core/resources/datafiles/tours/creating_design/dialog-4.jpg deleted file mode 100644 index 3015b785..00000000 Binary files a/core/resources/datafiles/tours/creating_design/dialog-4.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/dialog-4_es.jpg b/core/resources/datafiles/tours/creating_design/dialog-4_es.jpg deleted file mode 100644 index 871b9835..00000000 Binary files a/core/resources/datafiles/tours/creating_design/dialog-4_es.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/dialog-4_fr.jpg b/core/resources/datafiles/tours/creating_design/dialog-4_fr.jpg deleted file mode 100644 index bf3475dd..00000000 Binary files a/core/resources/datafiles/tours/creating_design/dialog-4_fr.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/dialog-5-centeringring.jpg b/core/resources/datafiles/tours/creating_design/dialog-5-centeringring.jpg new file mode 100644 index 00000000..682c6e58 Binary files /dev/null and b/core/resources/datafiles/tours/creating_design/dialog-5-centeringring.jpg differ diff --git a/core/resources/datafiles/tours/creating_design/dialog-5.jpg b/core/resources/datafiles/tours/creating_design/dialog-5.jpg deleted file mode 100644 index 58e7d584..00000000 Binary files a/core/resources/datafiles/tours/creating_design/dialog-5.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/dialog-5_es.jpg b/core/resources/datafiles/tours/creating_design/dialog-5_es.jpg deleted file mode 100644 index 1fd2f18b..00000000 Binary files a/core/resources/datafiles/tours/creating_design/dialog-5_es.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/dialog-5_fr.jpg b/core/resources/datafiles/tours/creating_design/dialog-5_fr.jpg deleted file mode 100644 index 74f29480..00000000 Binary files a/core/resources/datafiles/tours/creating_design/dialog-5_fr.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/dialog-6-parachute.jpg b/core/resources/datafiles/tours/creating_design/dialog-6-parachute.jpg new file mode 100644 index 00000000..c22bc872 Binary files /dev/null and b/core/resources/datafiles/tours/creating_design/dialog-6-parachute.jpg differ diff --git a/core/resources/datafiles/tours/creating_design/dialog-6.jpg b/core/resources/datafiles/tours/creating_design/dialog-6.jpg deleted file mode 100644 index 1a386278..00000000 Binary files a/core/resources/datafiles/tours/creating_design/dialog-6.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/dialog-6_es.jpg b/core/resources/datafiles/tours/creating_design/dialog-6_es.jpg deleted file mode 100644 index 77d115c6..00000000 Binary files a/core/resources/datafiles/tours/creating_design/dialog-6_es.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/dialog-6_fr.jpg b/core/resources/datafiles/tours/creating_design/dialog-6_fr.jpg deleted file mode 100644 index 97f397da..00000000 Binary files a/core/resources/datafiles/tours/creating_design/dialog-6_fr.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/final.jpg b/core/resources/datafiles/tours/creating_design/final.jpg deleted file mode 100644 index 126924b8..00000000 Binary files a/core/resources/datafiles/tours/creating_design/final.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/final_es.jpg b/core/resources/datafiles/tours/creating_design/final_es.jpg deleted file mode 100644 index 0906f3de..00000000 Binary files a/core/resources/datafiles/tours/creating_design/final_es.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/final_fr.jpg b/core/resources/datafiles/tours/creating_design/final_fr.jpg deleted file mode 100644 index 063f0698..00000000 Binary files a/core/resources/datafiles/tours/creating_design/final_fr.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/initial.jpg b/core/resources/datafiles/tours/creating_design/initial.jpg deleted file mode 100644 index f1159f53..00000000 Binary files a/core/resources/datafiles/tours/creating_design/initial.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/initial_es.jpg b/core/resources/datafiles/tours/creating_design/initial_es.jpg deleted file mode 100644 index 01d0a036..00000000 Binary files a/core/resources/datafiles/tours/creating_design/initial_es.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/initial_fr.jpg b/core/resources/datafiles/tours/creating_design/initial_fr.jpg deleted file mode 100644 index 0edea4e7..00000000 Binary files a/core/resources/datafiles/tours/creating_design/initial_fr.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/main-0-initial.jpg b/core/resources/datafiles/tours/creating_design/main-0-initial.jpg new file mode 100644 index 00000000..f1159f53 Binary files /dev/null and b/core/resources/datafiles/tours/creating_design/main-0-initial.jpg differ diff --git a/core/resources/datafiles/tours/creating_design/main-1-nosecone.jpg b/core/resources/datafiles/tours/creating_design/main-1-nosecone.jpg new file mode 100644 index 00000000..6b81a812 Binary files /dev/null and b/core/resources/datafiles/tours/creating_design/main-1-nosecone.jpg differ diff --git a/core/resources/datafiles/tours/creating_design/main-1.jpg b/core/resources/datafiles/tours/creating_design/main-1.jpg deleted file mode 100644 index 8f3e19fa..00000000 Binary files a/core/resources/datafiles/tours/creating_design/main-1.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/main-1_es.jpg b/core/resources/datafiles/tours/creating_design/main-1_es.jpg deleted file mode 100644 index ba6f6b18..00000000 Binary files a/core/resources/datafiles/tours/creating_design/main-1_es.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/main-1_fr.jpg b/core/resources/datafiles/tours/creating_design/main-1_fr.jpg deleted file mode 100644 index f0867974..00000000 Binary files a/core/resources/datafiles/tours/creating_design/main-1_fr.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/main-2-bodytube.jpg b/core/resources/datafiles/tours/creating_design/main-2-bodytube.jpg new file mode 100644 index 00000000..62f23db1 Binary files /dev/null and b/core/resources/datafiles/tours/creating_design/main-2-bodytube.jpg differ diff --git a/core/resources/datafiles/tours/creating_design/main-2.jpg b/core/resources/datafiles/tours/creating_design/main-2.jpg deleted file mode 100644 index a37edf52..00000000 Binary files a/core/resources/datafiles/tours/creating_design/main-2.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/main-2_es.jpg b/core/resources/datafiles/tours/creating_design/main-2_es.jpg deleted file mode 100644 index b76595ab..00000000 Binary files a/core/resources/datafiles/tours/creating_design/main-2_es.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/main-2_fr.jpg b/core/resources/datafiles/tours/creating_design/main-2_fr.jpg deleted file mode 100644 index 1fb93631..00000000 Binary files a/core/resources/datafiles/tours/creating_design/main-2_fr.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/main-3-finset.jpg b/core/resources/datafiles/tours/creating_design/main-3-finset.jpg new file mode 100644 index 00000000..8bbd85df Binary files /dev/null and b/core/resources/datafiles/tours/creating_design/main-3-finset.jpg differ diff --git a/core/resources/datafiles/tours/creating_design/main-3.jpg b/core/resources/datafiles/tours/creating_design/main-3.jpg deleted file mode 100644 index 328bee03..00000000 Binary files a/core/resources/datafiles/tours/creating_design/main-3.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/main-3_es.jpg b/core/resources/datafiles/tours/creating_design/main-3_es.jpg deleted file mode 100644 index 40d712fb..00000000 Binary files a/core/resources/datafiles/tours/creating_design/main-3_es.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/main-3_fr.jpg b/core/resources/datafiles/tours/creating_design/main-3_fr.jpg deleted file mode 100644 index f468c139..00000000 Binary files a/core/resources/datafiles/tours/creating_design/main-3_fr.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/main-4-innertube.jpg b/core/resources/datafiles/tours/creating_design/main-4-innertube.jpg new file mode 100644 index 00000000..89d954d7 Binary files /dev/null and b/core/resources/datafiles/tours/creating_design/main-4-innertube.jpg differ diff --git a/core/resources/datafiles/tours/creating_design/main-4.jpg b/core/resources/datafiles/tours/creating_design/main-4.jpg deleted file mode 100644 index 53304010..00000000 Binary files a/core/resources/datafiles/tours/creating_design/main-4.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/main-4_es.jpg b/core/resources/datafiles/tours/creating_design/main-4_es.jpg deleted file mode 100644 index 3c431eb9..00000000 Binary files a/core/resources/datafiles/tours/creating_design/main-4_es.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/main-4_fr.jpg b/core/resources/datafiles/tours/creating_design/main-4_fr.jpg deleted file mode 100644 index 9578c246..00000000 Binary files a/core/resources/datafiles/tours/creating_design/main-4_fr.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/main-5-centeringring.jpg b/core/resources/datafiles/tours/creating_design/main-5-centeringring.jpg new file mode 100644 index 00000000..55885f72 Binary files /dev/null and b/core/resources/datafiles/tours/creating_design/main-5-centeringring.jpg differ diff --git a/core/resources/datafiles/tours/creating_design/main-5.jpg b/core/resources/datafiles/tours/creating_design/main-5.jpg deleted file mode 100644 index ef9a45bb..00000000 Binary files a/core/resources/datafiles/tours/creating_design/main-5.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/main-5_es.jpg b/core/resources/datafiles/tours/creating_design/main-5_es.jpg deleted file mode 100644 index f9ac386b..00000000 Binary files a/core/resources/datafiles/tours/creating_design/main-5_es.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/main-5_fr.jpg b/core/resources/datafiles/tours/creating_design/main-5_fr.jpg deleted file mode 100644 index edbb6d03..00000000 Binary files a/core/resources/datafiles/tours/creating_design/main-5_fr.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/main-6-parachute.jpg b/core/resources/datafiles/tours/creating_design/main-6-parachute.jpg new file mode 100644 index 00000000..e3f7f3a5 Binary files /dev/null and b/core/resources/datafiles/tours/creating_design/main-6-parachute.jpg differ diff --git a/core/resources/datafiles/tours/creating_design/main-6.jpg b/core/resources/datafiles/tours/creating_design/main-6.jpg deleted file mode 100644 index bb4cf136..00000000 Binary files a/core/resources/datafiles/tours/creating_design/main-6.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/main-6_es.jpg b/core/resources/datafiles/tours/creating_design/main-6_es.jpg deleted file mode 100644 index eb89dcee..00000000 Binary files a/core/resources/datafiles/tours/creating_design/main-6_es.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/main-6_fr.jpg b/core/resources/datafiles/tours/creating_design/main-6_fr.jpg deleted file mode 100644 index 5ef08e66..00000000 Binary files a/core/resources/datafiles/tours/creating_design/main-6_fr.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/main-7-rest.jpg b/core/resources/datafiles/tours/creating_design/main-7-rest.jpg new file mode 100644 index 00000000..5650e1fc Binary files /dev/null and b/core/resources/datafiles/tours/creating_design/main-7-rest.jpg differ diff --git a/core/resources/datafiles/tours/creating_design/main-7.jpg b/core/resources/datafiles/tours/creating_design/main-7.jpg deleted file mode 100644 index a3aeeb2a..00000000 Binary files a/core/resources/datafiles/tours/creating_design/main-7.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/main-7_es.jpg b/core/resources/datafiles/tours/creating_design/main-7_es.jpg deleted file mode 100644 index 44d6526e..00000000 Binary files a/core/resources/datafiles/tours/creating_design/main-7_es.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/main-7_fr.jpg b/core/resources/datafiles/tours/creating_design/main-7_fr.jpg deleted file mode 100644 index a0225218..00000000 Binary files a/core/resources/datafiles/tours/creating_design/main-7_fr.jpg and /dev/null differ diff --git a/core/resources/datafiles/tours/creating_design/main-8-final.jpg b/core/resources/datafiles/tours/creating_design/main-8-final.jpg new file mode 100644 index 00000000..126924b8 Binary files /dev/null and b/core/resources/datafiles/tours/creating_design/main-8-final.jpg differ diff --git a/core/resources/datafiles/tours/test1/left_design.png b/core/resources/datafiles/tours/test1/left_design.png deleted file mode 100644 index 4c496d50..00000000 Binary files a/core/resources/datafiles/tours/test1/left_design.png and /dev/null differ diff --git a/core/resources/datafiles/tours/test1/main_window.png b/core/resources/datafiles/tours/test1/main_window.png deleted file mode 100644 index d6f7f70c..00000000 Binary files a/core/resources/datafiles/tours/test1/main_window.png and /dev/null differ diff --git a/core/resources/datafiles/tours/test1/test.tour b/core/resources/datafiles/tours/test1/test.tour deleted file mode 100644 index f5a278b8..00000000 --- a/core/resources/datafiles/tours/test1/test.tour +++ /dev/null @@ -1,20 +0,0 @@ - -# Foo bar - -First test tour - -This is the description. - - -[left_design.png] - -

This is the first slide — the left_design file. - -

It's nifty. It can also contain links (though they don't work yet). -

Tour2: Test2 -

Hyperlink: google - - -[main_window.png] -This is the next slide (and the last). - diff --git a/core/resources/datafiles/tours/test1/test_de.tour b/core/resources/datafiles/tours/test1/test_de.tour deleted file mode 100644 index 615dd84d..00000000 --- a/core/resources/datafiles/tours/test1/test_de.tour +++ /dev/null @@ -1,6 +0,0 @@ - -Das test Tour - -[left_design.png] - -Das is ein test tour. diff --git a/core/resources/datafiles/tours/test2/left_design.png b/core/resources/datafiles/tours/test2/left_design.png deleted file mode 100644 index 4c496d50..00000000 Binary files a/core/resources/datafiles/tours/test2/left_design.png and /dev/null differ diff --git a/core/resources/datafiles/tours/test2/main_window.png b/core/resources/datafiles/tours/test2/main_window.png deleted file mode 100644 index d6f7f70c..00000000 Binary files a/core/resources/datafiles/tours/test2/main_window.png and /dev/null differ diff --git a/core/resources/datafiles/tours/test2/test2.tour b/core/resources/datafiles/tours/test2/test2.tour deleted file mode 100644 index f8daabdb..00000000 --- a/core/resources/datafiles/tours/test2/test2.tour +++ /dev/null @@ -1,15 +0,0 @@ -Another test tour - -

This is the second tour. -

Comprende? - - -[left_design.png] - -This is the second tour. - - -[main_window.png] - -This is the second/last slide. - diff --git a/core/src/net/sf/openrocket/gui/help/tours/SlideShowDialog.java b/core/src/net/sf/openrocket/gui/help/tours/SlideShowDialog.java index aa48ff99..981bf1cc 100644 --- a/core/src/net/sf/openrocket/gui/help/tours/SlideShowDialog.java +++ b/core/src/net/sf/openrocket/gui/help/tours/SlideShowDialog.java @@ -42,7 +42,7 @@ public class SlideShowDialog extends JDialog { JPanel panel = new JPanel(new MigLayout("fill")); slideShowComponent = new SlideShowComponent(); - slideShowComponent.addHyperlinkListener(new SlideShowLinkListener(this)); + slideShowComponent.addHyperlinkListener(new SlideShowLinkListener(parent)); panel.add(slideShowComponent, "spanx, grow, wrap para");