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 f9fa53c15b79507296357ee89ccab432f199a666..c62314a6ce56f80208e2444e72b456f0285d35e7 100755 (executable)
--- 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.
 #
 
 # 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"
 
 
 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
 
     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 (file)
index 0000000..b60a2a9
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 (file)
index 39a6832..0000000
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 (file)
index e0223b4..0000000
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 (file)
index 89dbc47..0000000
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 (file)
index 0000000..cdd7797
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 (file)
index e9f417c..0000000
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 (file)
index ac400dc..0000000
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 (file)
index 5b30a02..0000000
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 (file)
index 0000000..0969c46
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 (file)
index 429281c..0000000
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 (file)
index 03c4bd1..0000000
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 (file)
index 510e51f..0000000
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 (file)
index 0000000..b356c60
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 (file)
index 9ea8fae..0000000
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 (file)
index 1de9a8f..0000000
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 (file)
index b262536..0000000
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 (file)
index 0000000..0731783
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 (file)
index 927772b..0000000
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 (file)
index 734e57b..0000000
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 (file)
index 6fca5da..0000000
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 (file)
index 0000000..37071f7
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 (file)
index d5b4542..0000000
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 (file)
index 891d8fb..0000000
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 (file)
index 90eb175..0000000
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 (file)
index fae17ac..0000000
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 (file)
index beafe47..0000000
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 (file)
index bf8bf23..0000000
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 (file)
index e26b31a..0000000
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 (file)
index ebe5bbc..0000000
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 (file)
index 62ac21a..0000000
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 (file)
index 0000000..e26b31a
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 (file)
index 0000000..20b7921
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 (file)
index ff7cc03..0000000
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 (file)
index e3bb75d..0000000
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 (file)
index fef407d..0000000
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 (file)
index 0000000..d6834fc
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 (file)
index e2cb380..0000000
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 (file)
index a9e8645..0000000
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 (file)
index ff8179b..0000000
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 (file)
index 0000000..07f34f3
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 (file)
index 8f8c093..0000000
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 (file)
index e62c8d6..0000000
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 (file)
index 4ad9eb9..0000000
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 (file)
index 0000000..7711f7d
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 (file)
index 1872626..0000000
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 (file)
index da08cd3..0000000
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 (file)
index c7ef4ce..0000000
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 (file)
index 0000000..1a54298
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 (file)
index 65cec4e..0000000
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 (file)
index b0cc343..0000000
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 (file)
index 78ca3e5..0000000
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 (file)
index 0000000..3d65c37
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 (file)
index e371471..0000000
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 (file)
index c5a35bb..0000000
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 (file)
index abfbd97..0000000
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 (file)
index 0000000..1e3d378
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 (file)
index 5532064..0000000
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 (file)
index ad14bf4..0000000
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 (file)
index 2a6f07c..0000000
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 (file)
index 0000000..fae17ac
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 6d437c9cdb1831822da7f2419c2326a62c24d355..3b51c570d5a650bb0d92d966dde929ac8532fc8e 100644 (file)
--- 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
 <p>This tour shows how to create a simple rocket design from scratch.
 
 
 <p>This tour shows how to create a simple rocket design from scratch.
 
 

-[initial.jpg]
+[main-0-initial.jpg]

 
 <p>When you choose to create a new design, you are presented with a blank
 design and the <em>Rocket configuration</em> dialog is displayed.
 
 <p>When you choose to create a new design, you are presented with a blank
 design and the <em>Rocket configuration</em> dialog is displayed.


@@ -15,14 +15,14 @@ the design name, designer, comments and revision information.
 component in the component tree.
 
 
 component in the component tree.
 
 

-[main-1.jpg]
+[main-1-nosecone.jpg]

 
 <p>Next, add a <em>Nose cone</em> to the design by clicking the
 corresponding component addition button.  This opens the nose cone
 configuration dialog.
 
 
 
 <p>Next, add a <em>Nose cone</em> to the design by clicking the
 corresponding component addition button.  This opens the nose cone
 configuration dialog.
 
 

-[dialog-1.jpg]
+[dialog-1-nosecone.jpg]

 
 <p>The configuration dialog contains settings for the nose cone shape,
 dimensions and material.  Set the nose cone length to 10&nbsp;cm,
 
 <p>The configuration dialog contains settings for the nose cone shape,
 dimensions and material.  Set the nose cone length to 10&nbsp;cm,


@@ -32,26 +32,26 @@ base diameter to 2.5&nbsp;cm and material to Polystyrene (plastic).
 default units in <a href="FIXME">Preferences</a>.
 
 
 default units in <a href="FIXME">Preferences</a>.
 
 

-[main-2.jpg]
+[main-2-bodytube.jpg]

 
 <p>The design window displays the nose cone.  Next, add a <em>Body
 tube</em> to the design.
 
 
 
 <p>The design window displays the nose cone.  Next, add a <em>Body
 tube</em> to the design.
 
 

-[dialog-2.jpg]
+[dialog-2-bodytube.jpg]

 
 <p>Change the body tube length to 25&nbsp;cm.  The <em>Automatic</em>
 option for the outer diameter is ticked by default, in which case the
 diameter is automatically the same as that of the nose cone.
 
 
 
 <p>Change the body tube length to 25&nbsp;cm.  The <em>Automatic</em>
 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]

 
 <p>Next, add a <em>Trapezoidal fin set</em> to the rocket.  The body
 tube must be selected in order to add the component.
 
 
 
 <p>Next, add a <em>Trapezoidal fin set</em> to the rocket.  The body
 tube must be selected in order to add the component.
 
 

-[dialog-3.jpg]
+[dialog-3-finset.jpg]

 
 <p>The trapezoidal fin set has numerous dimension parameters.  The
 most important are the root and tip chord (length next to the body
 
 <p>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.
 <p>The default values are okay for the example design.
 
 
 <p>The default values are okay for the example design.
 
 

-[main-4.jpg]
+[main-4-innertube.jpg]

 
 <p>Next, add an <em>Inner tube</em> as a motor mount.  Select the body
 tube, and then click the component addition button.
 
 
 
 <p>Next, add an <em>Inner tube</em> as a motor mount.  Select the body
 tube, and then click the component addition button.
 
 

-[dialog-4.jpg]
+[dialog-4-innertube.jpg]

 
 <p>The default dimensions are suitable for Estes A-C motors.  To have
 the motor mount overhang a bit, change the position parameter to
 <em>Bottom of parent component</em> plus 0.5&nbsp;cm.
 
 
 
 <p>The default dimensions are suitable for Estes A-C motors.  To have
 the motor mount overhang a bit, change the position parameter to
 <em>Bottom of parent component</em> plus 0.5&nbsp;cm.
 
 

-[main-5.jpg]
+[main-5-centeringring.jpg]

 
 <p>To add <em>Centering rings</em> to keep the mount in place, select
 the body tube and click the centering ring button.
 
 <p>To add <em>Centering rings</em> 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 <b>Edit</b> &rarr;
 <b>Undo</b> to undo the latest action.)
 
 
 <b>Undo</b> to undo the latest action.)
 
 

-[dialog-5.jpg]
+[dialog-5-centeringring.jpg]

 
 <p>The centering ring automatically selects the appropriate outer and
 inner diameter when the <em>Automatic</em> checkboxes are selected.
 
 <p>The centering ring automatically selects the appropriate outer and
 inner diameter when the <em>Automatic</em> checkboxes are selected.


@@ -96,12 +96,12 @@ the position parameter to <em>Bottom of parent component</em> plus
 parameter zero.
 
 
 parameter zero.
 
 

-[main-6.jpg]
+[main-6-parachute.jpg]

 
 <p>Next add a <em>Parachute</em> to the body tube.
 
 
 
 <p>Next add a <em>Parachute</em> to the body tube.
 
 

-[dialog-6.jpg]
+[dialog-6-parachute.jpg]

 
 <p>The <em>canopy diameter</em> and <em>drag coefficient</em>
 determine how much the parachute slows down the rocket during descent.
 
 <p>The <em>canopy diameter</em> and <em>drag coefficient</em>
 determine how much the parachute slows down the rocket during descent.


@@ -111,21 +111,22 @@ mass.  The <em>packed length</em>, <em>diameter</em> and
 parachute.
 
 <p>The <em>Deploys at</em> propery can be used to affect when the
 parachute.
 
 <p>The <em>Deploys at</em> propery can be used to affect when the

-parachute deploys.  For <em>First ejection charge of this stage</em>
+parachute deploys.  The <em>First ejection charge of this stage</em>

 option will deploy the parachute when the ejection charge is fired, as
 is typical in small model rockets.
 
 
 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]

 
 <p>Now the functional aspects of the rocket design are complete.
 
 
 <p>Now the functional aspects of the rocket design are complete.
 

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

 
 
 
 

-[final.jpg]
+[main-8-final.jpg]

 
 <p>Now the rocket design is complete.
 
 
 <p>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 8b7e6fc6205aa64de330d03710925561600ac401..9593b8aa98b1278760d4fcb75d070c9b739d17ed 100644 (file)
--- 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
 <p>Este tema muestra cómo crear un diseño de cohete básico desde el principio.
 
 
 <p>Este tema muestra cómo crear un diseño de cohete básico desde el principio.
 
 

-[initial_es.jpg]
+[main-0-initial.jpg]

 
 <p>Cuando elija crear un diseño nuevo, se le abrirá un diseño en blanco y aparecerá el cuadro de diálogo <em>Configuración del cohete</em>.
 
 
 <p>Cuando elija crear un diseño nuevo, se le abrirá un diseño en blanco y aparecerá el cuadro de diálogo <em>Configuración del cohete</em>.
 


@@ -15,62 +15,62 @@ Crear un diseño de cohete básico
 
 
 
 
 
 

-[main-1_es.jpg]
+[main-1-nosecone.jpg]

 
 <p>Seguidamente añadimos una <em>Ojiva</em> al diseño haciendo clic sobre el icono del componente correspondiente.  Se abrirá la ventana de configuración de la Ojiva. 
 
 
 
 
 <p>Seguidamente añadimos una <em>Ojiva</em> 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]

 
 <p>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&nbsp;cm, el diámetro de la base a 2.5&nbsp;cm, y el material a Cartón (0.68 g/cm^3).
 
 <p>Para cambiar a pulgadas, haga clic sobre la unidad de medida, o bien modifique las unidades por defecto en <a href="FIXME">Preferencias</a>.
 
 
 
 <p>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&nbsp;cm, el diámetro de la base a 2.5&nbsp;cm, y el material a Cartón (0.68 g/cm^3).
 
 <p>Para cambiar a pulgadas, haga clic sobre la unidad de medida, o bien modifique las unidades por defecto en <a href="FIXME">Preferencias</a>.
 
 

-[main-2_es.jpg]
+[main-2-bodytube.jpg]

 
 <p>La ventana de diseño muestra la Ojiva.  Seguidamente añadimos el <em>Cuerpo tubular</em> al diseño, haciendo clic sobre el icono correspondiente. 
 
 
 
 
 <p>La ventana de diseño muestra la Ojiva.  Seguidamente añadimos el <em>Cuerpo tubular</em> al diseño, haciendo clic sobre el icono correspondiente. 
 
 
 

-[dialog-2_es.jpg]
+[dialog-2-bodytube.jpg]

 
 <p>Modifique la longitud del cuerpo a 25&nbsp;cm.  El casillero para el diámetro exterior <em>Automático</em> 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.
 
 
 
 <p>Modifique la longitud del cuerpo a 25&nbsp;cm.  El casillero para el diámetro exterior <em>Automático</em> 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]

 
 <p>Seguidamente añadiremos un <em>Juego de aletas Trapezoidales</em> al cohete.  
 
 <p>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.
 
 
 
 <p>Seguidamente añadiremos un <em>Juego de aletas Trapezoidales</em> al cohete.  
 
 <p>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]

 
 <p>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. 
 
 <p>Los valores establecidos por defecto son correctos para este ejemplo.
 
 
 
 <p>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. 
 
 <p>Los valores establecidos por defecto son correctos para este ejemplo.
 
 

-[main-4_es.jpg]
+[main-4-innertube.jpg]

 
 <p>A continuación añadiremos un <em>Tubo interior</em> 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.
 
 
 
 <p>A continuación añadiremos un <em>Tubo interior</em> 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]

 
 <p>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 <em>Extremo inferior del componente</em> con 0.5&nbsp;cm. En la pestaña “Motor” marque el casillero <em>Este componente es un porta motor</em>.
 
 
 
 <p>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 <em>Extremo inferior del componente</em> con 0.5&nbsp;cm. En la pestaña “Motor” marque el casillero <em>Este componente es un porta motor</em>.
 
 

-[main-5_es.jpg]
+[main-5-centeringring.jpg]

 
 <p>Para añadir los <em>Anillos de centrado</em> 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.
 
 <p><b>Aviso</b> Si tuviera seleccionado el Tubo interior en el árbol del diseño, al hacer clic sobre el icono del <em>Anillo de centrado</em> éste se añadirá en el interior del tubo porta-motor. Si se ha equivocado, utilice el menú <b>Edición</b> &rarr; <b>Deshacer</b> para deshacer la última acción.
 
 
 
 <p>Para añadir los <em>Anillos de centrado</em> 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.
 
 <p><b>Aviso</b> Si tuviera seleccionado el Tubo interior en el árbol del diseño, al hacer clic sobre el icono del <em>Anillo de centrado</em> éste se añadirá en el interior del tubo porta-motor. Si se ha equivocado, utilice el menú <b>Edición</b> &rarr; <b>Deshacer</b> para deshacer la última acción.
 
 

-[dialog-5_es.jpg]
+[dialog-5-centeringring.jpg]

 
 <p>El casillero <em>Automático</em> 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.
 
 
 <p>El casillero <em>Automático</em> 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
 <p>Seguidamente agregue otro anillo de centrado en el borde trasero del Cuerpo tubular, poniendo el parámetro de la localización a cero.
 
 
 <p>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]

 
 <p>A continuación incorporaremos un <em>Paracaídas</em> 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.
 
 
 
 <p>A continuación incorporaremos un <em>Paracaídas</em> 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]

 
 <p>El <em>diámetro del pabellón</em> y el <em>coeficiente de arrastre</em> determinan la velocidad con la que el paracaídas hará descender el cohete a tierra. El <em>material</em> y las <em>cuerdas</em> tienen su efecto en la masa total del cohete, mientras que la longitud del <em>empaquetado</em>, el <em>diámetro</em> y la <em>posición</em> afectan al tamaño del empaquetado y la ubicación del paracaídas en el diseño.
 
 <p>La propiedad <em>Desplegar en</em> puede establecerse para indicar el instante en el que se despliega el paracaídas.  Con la opción <em>Primera carga de eyección de ésta etapa</em> 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.
 
 
 
 <p>El <em>diámetro del pabellón</em> y el <em>coeficiente de arrastre</em> determinan la velocidad con la que el paracaídas hará descender el cohete a tierra. El <em>material</em> y las <em>cuerdas</em> tienen su efecto en la masa total del cohete, mientras que la longitud del <em>empaquetado</em>, el <em>diámetro</em> y la <em>posición</em> afectan al tamaño del empaquetado y la ubicación del paracaídas en el diseño.
 
 <p>La propiedad <em>Desplegar en</em> puede establecerse para indicar el instante en el que se despliega el paracaídas.  Con la opción <em>Primera carga de eyección de ésta etapa</em> 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]

 
 <p>Ahora los aspectos funcionales del diseño del cohete ya están completados.
 
 <p>Para completarlo aún más, puede añadir un componente <em>Masa</em> al Cuerpo tubular para el algodón ignífugo, y un <em>Retén de motor</em> en el interior del Tubo interior para mantener el motor en su sitio y así evitar que pueda desplazarse por el interior del cohete.
 
 
 
 <p>Ahora los aspectos funcionales del diseño del cohete ya están completados.
 
 <p>Para completarlo aún más, puede añadir un componente <em>Masa</em> al Cuerpo tubular para el algodón ignífugo, y un <em>Retén de motor</em> 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]

 
 <p>El diseño del cohete ya está completo.
 
 
 <p>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 c2aaa764982ffed5923db5bd0d3cdc1a679146cd..422c379c091afeb0bbb2c9505a04803b6792378d 100644 (file)
--- 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
 <p>Ce tour d'horizon montre comment concevoir une fusée simple en partant de rien.
 
 
 <p>Ce tour d'horizon montre comment concevoir une fusée simple en partant de rien.
 
 

-[initial_fr.jpg]
+[main-0-initial.jpg]

 
 <p>Lorsque vous décidez de créer un nouveau projet, un projet vide vous 
 est proposé et la fenêtre de dialogue <em>configuration fusée</em> est affichée.
 
 <p>Lorsque vous décidez de créer un nouveau projet, un projet vide vous 
 est proposé et la fenêtre de dialogue <em>configuration fusée</em> 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.
 
 
 parent de l'arbre des pièces.
 
 

-[main-1.jpg]
+[main-1-nosecone.jpg]

 
 <p>Ensuite,  ajoutez une <em>ogive</em> au projet en cliquant sur le bouton 
 correspondant à la la pièce. Cela ouvre la fenêtre de dialogue de configuration
 
 <p>Ensuite,  ajoutez une <em>ogive</em> 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]

 
 <p>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&nbsp;cm,
 
 <p>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&nbsp;cm,


@@ -33,26 +33,26 @@ le diamètre de la base à 2.5&nbsp;cm et comme matériau du Polystyrène (plast
 soit vous changez les unités par défaut dans les <a href="FIXME">Préférences</a>.
 
 
 soit vous changez les unités par défaut dans les <a href="FIXME">Préférences</a>.
 
 

-[main-2_fr.jpg]
+[main-2-bodytube.jpg]

 
 <p>La fenêtre de conception affiche l'ogive. Ensuite, ajoutez au projet un <em>tube pour
 le corps</em>.
 
 
 
 <p>La fenêtre de conception affiche l'ogive. Ensuite, ajoutez au projet un <em>tube pour
 le corps</em>.
 
 

-[dialog-2_fr.jpg]
+[dialog-2-bodytube.jpg]

 
 <p>Changez la longueur du tube à 25&nbsp;cm.  L'option <em>Automatique</em>
 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.
 
 
 
 <p>Changez la longueur du tube à 25&nbsp;cm.  L'option <em>Automatique</em>
 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]

 
 <p>Ensuite ajoutez à la fusée un <em>jeu d'ailerons Trapézoïdaux</em>.  Le tube 
 du corps doit être sélectionné pour pouvoir ajouter les pièces.
 
 
 
 <p>Ensuite ajoutez à la fusée un <em>jeu d'ailerons Trapézoïdaux</em>.  Le tube 
 du corps doit être sélectionné pour pouvoir ajouter les pièces.
 
 

-[dialog-3_fr.jpg]
+[dialog-3-finset.jpg]

 
 <p>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
 
 <p>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.
 <p>Les valeurs par défaut sont ok pour l'exemple de projet.
 
 
 <p>Les valeurs par défaut sont ok pour l'exemple de projet.
 
 

-[main-4_fr.jpg]
+[main-4-innertube.jpg]

 
 <p>Ensuite ajouter un <em>tube interne</em> pour faire un porte moteur. Sélectionnez
 le tube du corps et ensuite cliquez sur le bouton d'ajout de la pièce.
 
 
 
 <p>Ensuite ajouter un <em>tube interne</em> 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]

 
 <p>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 
 <em>Bas de la pièce parent</em> plus 0.5&nbsp;cm.
 
 
 
 <p>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 
 <em>Bas de la pièce parent</em> plus 0.5&nbsp;cm.
 
 

-[main-5_fr.jpg]
+[main-5-centeringring.jpg]

 
 <p>Pour ajouter des <em>Anneaux de Centrage</em> pour garder le porte moteur en place, sélectionnez
 le tube du corps et cliquez sur le bouton d'anneaux de centrage.
 
 <p>Pour ajouter des <em>Anneaux de Centrage</em> 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 <b>Modifier</b> &rarr;
 <b>Défaire</b> pour défaire la dernière action.)
 
 
 <b>Défaire</b> pour défaire la dernière action.)
 
 

-[dialog-5_fr.jpg]
+[dialog-5-centeringring.jpg]

 
 <p>L'anneau de centrage choisi automatiquement le diamètre externe et interne approprié 
 lorsque les cases <em>Automatiques</em> sont cochées.
 
 <p>L'anneau de centrage choisi automatiquement le diamètre externe et interne approprié 
 lorsque les cases <em>Automatiques</em> sont cochées.


@@ -97,12 +97,12 @@ lorsque les cases <em>Automatiques</em> sont cochées.
 zéro.
 
 
 zéro.
 
 

-[main-6_fr.jpg]
+[main-6-parachute.jpg]

 
 <p>Ensuite ajoutez au tube du corps un <em>Parachute</em>.
 
 
 
 <p>Ensuite ajoutez au tube du corps un <em>Parachute</em>.
 
 

-[dialog-6_fr.jpg]
+[dialog-6-parachute.jpg]

 
 <p>Le <em>diamètre de canopé</em> et <em>le coefficient trainée</em>
 détermine le freinage du parachute sur la fusée pendant la descente.
 
 <p>Le <em>diamètre de canopé</em> et <em>le coefficient trainée</em>
 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.
 
 
  en générale le cas dans les petites fusées modèle réduit.
 
 

-[main-7_fr.jpg]
+[main-7-rest.jpg]

 
 <p>Les aspects fonctionnel de la conception de la fusée sont maintenant terminés.
 
 
 <p>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 <em>bague de blocage moteur</em> au
 tube interne pour maintenir le moteur en place.
 
 
 tube interne pour maintenir le moteur en place.
 
 

-[final_fr.jpg]
+[main-8-final.jpg]

 
 <p>Maintenant le projet fusée est terminé.
 
 
 <p>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 e4ffbdfaafa6ffd9915f1217a9535767be8d6925..7d9de78e38dd616cf0ccd8bcd4cc1fe35774e851 100644 (file)
--- 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
 <p>Questo tour mostra come creare un semplice progetto di razzo da zero.
 
 
 <p>Questo tour mostra come creare un semplice progetto di razzo da zero.
 
 

-[initial.jpg]
+[main-0-initial.jpg]

 
 <p>Quando scegli di creare un nuovo progetto, ti viene mostrato un progetto vuoto con in primo piano la finestra  <em>Configurazione razzo</em> .
 Qui puoi inserire le informazioni generali del tuo progetto, come il nome del razzo, il progettista, commenti e informazioni di revisione.
 
 <p>Puoi anche riaprirla in seguito facendo doppio click sul componente radice (il razzo stesso) nell'albero.
 
 
 <p>Quando scegli di creare un nuovo progetto, ti viene mostrato un progetto vuoto con in primo piano la finestra  <em>Configurazione razzo</em> .
 Qui puoi inserire le informazioni generali del tuo progetto, come il nome del razzo, il progettista, commenti e informazioni di revisione.
 
 <p>Puoi anche riaprirla in seguito facendo doppio click sul componente radice (il razzo stesso) nell'albero.
 

-[main-1.jpg]
+[main-1-nosecone.jpg]

 
 <p>Poi, aggiungi un <em>Naso</em> al progetto cliccando nel corrispettivo pulsante di aggiunta.  Questo apre la finestra di configurazione del naso.
 
 
 
 <p>Poi, aggiungi un <em>Naso</em> al progetto cliccando nel corrispettivo pulsante di aggiunta.  Questo apre la finestra di configurazione del naso.
 
 

-[dialog-1.jpg]
+[dialog-1-nosecone.jpg]

 
 <p>La finestra contiene,tra le altre, le impostazione della forma, del diametro e del materiale.  Imposta la lunghezza a  10&nbsp;cm,
 il diametro di base  a 2.5&nbsp;cm ed il materiale a Polystyrene (plastic).
 
 <p>La finestra contiene,tra le altre, le impostazione della forma, del diametro e del materiale.  Imposta la lunghezza a  10&nbsp;cm,
 il diametro di base  a 2.5&nbsp;cm ed il materiale a Polystyrene (plastic).


@@ -24,41 +24,41 @@ il diametro di base  a 2.5&nbsp;cm ed il materiale a Polystyrene (plastic).
 <p>Per usare i pollici invece dei centimetri, o clicca sull'unità per cambiarla temporaneamente, o cambia l'unità di misura predefinita in <a href="FIXME">Preferenze</a>.
 
 
 <p>Per usare i pollici invece dei centimetri, o clicca sull'unità per cambiarla temporaneamente, o cambia l'unità di misura predefinita in <a href="FIXME">Preferenze</a>.
 
 

-[main-2.jpg]
+[main-2-bodytube.jpg]

 
 <p>La finestra di disegno mostra il naso.  Poi, aggiungi al disegno un <em>corpo</em>.
 
 
 
 <p>La finestra di disegno mostra il naso.  Poi, aggiungi al disegno un <em>corpo</em>.
 
 

-[dialog-2.jpg]
+[dialog-2-bodytube.jpg]

 
 <p>Cambia la lunghezza del corpo a 25&nbsp;cm.  L'opzione <em>Automatico</em>
 per il diametro esterno è già marcata, in questo caso il diametro viene fissato uguale a quello del naso in modo automatico.
 
 
 
 <p>Cambia la lunghezza del corpo a 25&nbsp;cm.  L'opzione <em>Automatico</em>
 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]

 
 <p>Poi, aggiungi al razzo l'insieme di pinne <em>Trapezoidale</em> .  Per far ciò deve essere selezionato il corpo.
 
 
 
 <p>Poi, aggiungi al razzo l'insieme di pinne <em>Trapezoidale</em> .  Per far ciò deve essere selezionato il corpo.
 
 

-[dialog-3.jpg]
+[dialog-3-finset.jpg]

 
 <p>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.
 
 <p>I valori preimpostati vanno bene per il progetto d'esempio.
 
 
 
 <p>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.
 
 <p>I valori preimpostati vanno bene per il progetto d'esempio.
 
 

-[main-4.jpg]
+[main-4-innertube.jpg]

 
 <p>Poi, aggiungi un <em>Tubo interno</em> come alloggiamento per il motore.  Seleziona il corpo e poi clicca sul pulsante di aggiunta corrispondente.
 
 
 
 <p>Poi, aggiungi un <em>Tubo interno</em> come alloggiamento per il motore.  Seleziona il corpo e poi clicca sul pulsante di aggiunta corrispondente.
 
 

-[dialog-4.jpg]
+[dialog-4-innertube.jpg]

 
 <p>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 
 <em>Parte bassa del componente genitore</em> piu' 0.5&nbsp;cm.
 
 
 
 <p>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 
 <em>Parte bassa del componente genitore</em> piu' 0.5&nbsp;cm.
 
 

-[main-5.jpg]
+[main-5-centeringring.jpg]

 
 <p>Per aggiungere gli <em>Anelli di centraggio</em> per mantenere l'alloggia motore nella sua sede, seleziona il corpo e clicca sul pulsante Anelli di centraggio.
 
 
 <p>Per aggiungere gli <em>Anelli di centraggio</em> 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
 <b>Annulla</b> per annullare l'ultima azione.)
 
 
 <b>Annulla</b> per annullare l'ultima azione.)
 
 

-[dialog-5.jpg]
+[dialog-5-centeringring.jpg]

 
 <p>Quando le caselle di selezione <em>Automatico</em> sono selezionate l' Anello di centraggio sceglie gli appropriati diametri esterno ed interno.
 
 
 <p>Quando le caselle di selezione <em>Automatico</em> 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
 <p>Poi aggiungi un altro Anello di centraggio alla parte posteriore azzerando il parametro posizione.
 
 
 <p>Poi aggiungi un altro Anello di centraggio alla parte posteriore azzerando il parametro posizione.
 
 

-[main-6.jpg]
+[main-6-parachute.jpg]

 
 <p>Poi aggiungi un <em>Paracadute</em> al corpo.
 
 
 
 <p>Poi aggiungi un <em>Paracadute</em> al corpo.
 
 

-[dialog-6.jpg]
+[dialog-6-parachute.jpg]

 
 <p>Il <em>Diametro</em> ed il  <em>Coefficiente d'attrito</em>
 determinano quanto il paracadute rallenta la discesa del razzo.
 
 <p>Il <em>Diametro</em> ed il  <em>Coefficiente d'attrito</em>
 determinano quanto il paracadute rallenta la discesa del razzo.


@@ -92,14 +92,14 @@ Il <em>materiale</em> e <em>Funi</em> modificano la massa totale.   <em>Lunghezz
 farà uscire il paracadute quando si innescherà la carica , caso tipico dei piccoli razzi.
 
 
 farà uscire il paracadute quando si innescherà la carica , caso tipico dei piccoli razzi.
 
 

-[main-7.jpg]
+[main-7-rest.jpg]

 
 <p>Adesso l'aspetto funzionale del progetto è concluso.
 
 <p>Per completezza puoi anche aggiungere una  <em>Zavorra</em> al corpo del razzo per l'imbottitura tampone,e un <em>Blocca motore</em> al tubo interno per mantenere in sede il motore.
 
 
 
 <p>Adesso l'aspetto funzionale del progetto è concluso.
 
 <p>Per completezza puoi anche aggiungere una  <em>Zavorra</em> al corpo del razzo per l'imbottitura tampone,e un <em>Blocca motore</em> al tubo interno per mantenere in sede il motore.
 
 

-[final.jpg]
+[main-8-final.jpg]

 
 <p>Il razzo è completo!
 
 
 <p>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 (file)
index 0000000..17bb86c
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 (file)
index e64c540..0000000
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 (file)
index 8f63854..0000000
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 (file)
index d35c5c8..0000000
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 (file)
index 0000000..a6fdf00
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 (file)
index 39fddc3..0000000
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 (file)
index c020831..0000000
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 (file)
index b4db40e..0000000
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 (file)
index 0000000..4394764
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 (file)
index dac8757..0000000
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 (file)
index dac3249..0000000
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 (file)
index 4a8e6f9..0000000
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 (file)
index 0000000..8b097ee
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 (file)
index 3015b78..0000000
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 (file)
index 871b983..0000000
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 (file)
index bf3475d..0000000
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 (file)
index 0000000..682c6e5
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 (file)
index 58e7d58..0000000
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 (file)
index 1fd2f18..0000000
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 (file)
index 74f2948..0000000
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 (file)
index 0000000..c22bc87
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 (file)
index 1a38627..0000000
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 (file)
index 77d115c..0000000
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 (file)
index 97f397d..0000000
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 (file)
index 126924b..0000000
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 (file)
index 0906f3d..0000000
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 (file)
index 063f069..0000000
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 (file)
index f1159f5..0000000
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 (file)
index 01d0a03..0000000
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 (file)
index 0edea4e..0000000
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 (file)
index 0000000..f1159f5
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 (file)
index 0000000..6b81a81
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 (file)
index 8f3e19f..0000000
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 (file)
index ba6f6b1..0000000
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 (file)
index f086797..0000000
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 (file)
index 0000000..62f23db
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 (file)
index a37edf5..0000000
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 (file)
index b76595a..0000000
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 (file)
index 1fb9363..0000000
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 (file)
index 0000000..8bbd85d
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 (file)
index 328bee0..0000000
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 (file)
index 40d712f..0000000
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 (file)
index f468c13..0000000
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 (file)
index 0000000..89d954d
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 (file)
index 5330401..0000000
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 (file)
index 3c431eb..0000000
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 (file)
index 9578c24..0000000
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 (file)
index 0000000..55885f7
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 (file)
index ef9a45b..0000000
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 (file)
index f9ac386..0000000
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 (file)
index edbb6d0..0000000
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 (file)
index 0000000..e3f7f3a
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 (file)
index bb4cf13..0000000
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 (file)
index eb89dce..0000000
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 (file)
index 5ef08e6..0000000
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 (file)
index 0000000..5650e1f
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 (file)
index a3aeeb2..0000000
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 (file)
index 44d6526..0000000
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 (file)
index a022521..0000000
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 (file)
index 0000000..126924b
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 (file)
index 4c496d5..0000000
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 (file)
index d6f7f70..0000000
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 (file)
index f5a278b..0000000
--- a/core/resources/datafiles/tours/test1/test.tour
+++ /dev/null
@@ -1,20 +0,0 @@
-
-# Foo bar
-
-First test tour
-
-This is the <i>description</i>.
-
-
-[left_design.png]
-
-<p>This is the first slide &mdash; the left_design file.
-
-<p>It's nifty. It can also contain <a href="foobar">links</a> (though they don't work yet).
-<p>Tour2: <a href="test2/test2.tour">Test2</a>
-<p>Hyperlink: <a href="http://www.google.com">google</a>
-
-
-[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 (file)
index 615dd84..0000000
--- 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 (file)
index 4c496d5..0000000
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 (file)
index d6f7f70..0000000
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 (file)
index f8daabd..0000000
--- a/core/resources/datafiles/tours/test2/test2.tour
+++ /dev/null
@@ -1,15 +0,0 @@
-Another test tour
-
-<p>This is the second tour.
-<p>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 aa48ff9954f4f8a77896b093421fe9ef3c3e2de1..981bf1cc2751edc5ca7df6dcf50c967dd91feb16 100644 (file)
--- 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();
                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");
                
                
                panel.add(slideShowComponent, "spanx, grow, wrap para");