Copyright + web page update

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

diff --git a/core/LICENSE.TXT b/core/LICENSE.TXT
index 61a98f5aaafb6fb70792b78c3233674d3400b374..ced6952bc59337dedbb84f24c6a175dcbee827af 100644 (file)
--- a/core/LICENSE.TXT
+++ b/core/LICENSE.TXT
@@ -1,6 +1,6 @@
 OpenRocket - A model rocket simulator
 
 OpenRocket - A model rocket simulator
 

-Copyright (C) 2007-2011 Sampo Niskanen
+Copyright (C) 2007-2012 Sampo Niskanen and others

 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/core/README.TXT b/core/README.TXT
index c3c68458e9b120c94a4432847501a2d631e2e873..86467aa53cc685a965f32aea214e404dba401b06 100644 (file)
--- a/core/README.TXT
+++ b/core/README.TXT
@@ -2,7 +2,7 @@
 OpenRocket - an Open Source model rocket simulator
 --------------------------------------------------
 
 OpenRocket - an Open Source model rocket simulator
 --------------------------------------------------
 

-Copyright (C) 2007-2011  Sampo Niskanen
+Copyright (C) 2007-2012  Sampo Niskanen and others

 
 
 For license information see the file LICENSE.TXT.
 
 
 For license information see the file LICENSE.TXT.


@@ -25,8 +25,15 @@ Contributions have been made by:
 --------------------------------
 
 Sampo Niskanen, main developer
 --------------------------------
 
 Sampo Niskanen, main developer

-Doug Pedrick, support for reading RockSim designs, printing
+Doug Pedrick, support for RockSim designs, printing
+Kevin Ruland, Android version

 Richard Graham, geodetic computations
 Boris du Reau, internationalization
 Richard Graham, geodetic computations
 Boris du Reau, internationalization

-Tripoli France, Tripoli Spain, Stefan Lobas / ERIG, translations
+
+Translations contributed by:
+Tripoli France
+Tripoli Spain
+Stefan Lobas / ERIG
+Mauro Biasutti
+Sky Dart Team

 
 

diff --git a/core/pix-src/splashscreen-1.0.png b/core/pix-src/splashscreen-1.0.png
index 5af7cfb9c3cb654dd77bfb1fc7b282b2ff700d90..c2767aa53cdb6754b7d26e92dfe18d09eb577ac5 100644 (file)
Binary files a/core/pix-src/splashscreen-1.0.png and b/core/pix-src/splashscreen-1.0.png differ

diff --git a/core/pix-src/splashscreen-1.0.xcf.gz b/core/pix-src/splashscreen-1.0.xcf.gz
index 063de3e5f9b0a339cd4301e51de3874b09b560cf..19a3e4f2728c5a5b43b6486cd698fdfccaf07fba 100644 (file)
Binary files a/core/pix-src/splashscreen-1.0.xcf.gz and b/core/pix-src/splashscreen-1.0.xcf.gz differ

diff --git a/core/resources/pix/splashscreen.png b/core/resources/pix/splashscreen.png
index 5af7cfb9c3cb654dd77bfb1fc7b282b2ff700d90..c2767aa53cdb6754b7d26e92dfe18d09eb577ac5 100644 (file)
Binary files a/core/resources/pix/splashscreen.png and b/core/resources/pix/splashscreen.png differ

diff --git a/core/src/net/sf/openrocket/gui/dialogs/AboutDialog.java b/core/src/net/sf/openrocket/gui/dialogs/AboutDialog.java
index 7aaadd24778daa7902e39a99aeee22533f0be8a1..74600503fe8f998e1fcdf388b7f495ed264d2471 100644 (file)
--- a/core/src/net/sf/openrocket/gui/dialogs/AboutDialog.java
+++ b/core/src/net/sf/openrocket/gui/dialogs/AboutDialog.java
@@ -30,12 +30,15 @@ public class AboutDialog extends JDialog {
                        "<font size=\"+1\"><b>OpenRocket has been developed by:</b></font><br><br>" +
                        "Sampo Niskanen (main developer)<br>" +
                        "Doug Pedrick (RockSim file format, printing)<br>" +
                        "<font size=\"+1\"><b>OpenRocket has been developed by:</b></font><br><br>" +
                        "Sampo Niskanen (main developer)<br>" +
                        "Doug Pedrick (RockSim file format, printing)<br>" +

+                       "Kevin Ruland (Android version)<br>" +

                        "Boris du Reau (internationalization, translation lead)<br>" +
                        "Richard Graham (geodetic computations)<br><br>" +
                        "<b>Translations by:</b><br><br>" +
                        "Tripoli France (French)<br>" +
                        "Stefan Lobas / ERIG e.V. (German)<br>" +
                        "Boris du Reau (internationalization, translation lead)<br>" +
                        "Richard Graham (geodetic computations)<br><br>" +
                        "<b>Translations by:</b><br><br>" +
                        "Tripoli France (French)<br>" +
                        "Stefan Lobas / ERIG e.V. (German)<br>" +

-                       "Tripoli Spain (Spanish)<br><br>" +
+                       "Tripoli Spain (Spanish)<br>" +
+                       "Sky Dart Team (Russian)<br>" +
+                       "Mauro Biasutti (Italian)<br><br>" +

                        "<b>OpenRocket utilizes the following libraries:</b><br><br>" +
                        "MiG Layout (http://www.miglayout.com/)<br>" +
                        "JFreeChart (http://www.jfree.org/jfreechart/)<br>" +
                        "<b>OpenRocket utilizes the following libraries:</b><br><br>" +
                        "MiG Layout (http://www.miglayout.com/)<br>" +
                        "JFreeChart (http://www.jfree.org/jfreechart/)<br>" +


@@ -50,22 +53,22 @@ public class AboutDialog extends JDialog {
                JPanel panel = new JPanel(new MigLayout("fill"));
                JPanel sub;
                
                JPanel panel = new JPanel(new MigLayout("fill"));
                JPanel sub;
                

-
+               

                // OpenRocket logo
                panel.add(new JLabel(Icons.loadImageIcon("pix/icon/icon-about.png", "OpenRocket")), "top");
                
                // OpenRocket logo
                panel.add(new JLabel(Icons.loadImageIcon("pix/icon/icon-about.png", "OpenRocket")), "top");
                

-
+               

                // OpenRocket version info + copyright
                sub = new JPanel(new MigLayout("fill"));
                
                sub.add(new StyledLabel("OpenRocket", 20), "ax 50%, growy, wrap para");
                sub.add(new StyledLabel(trans.get("lbl.version").trim() + " " + version, 3), "ax 50%, growy, wrap rel");
                // OpenRocket version info + copyright
                sub = new JPanel(new MigLayout("fill"));
                
                sub.add(new StyledLabel("OpenRocket", 20), "ax 50%, growy, wrap para");
                sub.add(new StyledLabel(trans.get("lbl.version").trim() + " " + version, 3), "ax 50%, growy, wrap rel");

-               sub.add(new StyledLabel("Copyright " + Chars.COPY + " 2007-2011 Sampo Niskanen"), "ax 50%, growy, wrap para");
+               sub.add(new StyledLabel("Copyright " + Chars.COPY + " 2007-2012 Sampo Niskanen and others"), "ax 50%, growy, wrap para");

                
                sub.add(new URLLabel(OPENROCKET_URL), "ax 50%, growy, wrap para");
                panel.add(sub, "grow");
                
                
                sub.add(new URLLabel(OPENROCKET_URL), "ax 50%, growy, wrap para");
                panel.add(sub, "grow");
                

-
+               

                // Translation information (if present)
                String translation = trans.get("lbl.translation").trim();
                String translator = trans.get("lbl.translator").trim();
                // Translation information (if present)
                String translation = trans.get("lbl.translation").trim();
                String translator = trans.get("lbl.translator").trim();


@@ -91,10 +94,10 @@ public class AboutDialog extends JDialog {
                        panel.add(sub);
                }
                
                        panel.add(sub);
                }
                

-
+               

                DescriptionArea info = new DescriptionArea(5);
                info.setText(CREDITS);
                DescriptionArea info = new DescriptionArea(5);
                info.setText(CREDITS);

-               panel.add(info, "newline, width 10px, height 100lp, grow, spanx, wrap para");
+               panel.add(info, "newline, width 10px, height 150lp, grow, spanx, wrap para");

                
                //              JTextArea area = new JTextArea(CREATORS);
                //              area.setEditable(false);
                
                //              JTextArea area = new JTextArea(CREATORS);
                //              area.setEditable(false);


@@ -102,7 +105,7 @@ public class AboutDialog extends JDialog {
                //              area.setWrapStyleWord(true);
                //              panel.add(new JScrollPane(area), "width 10px, height 100lp, grow, spanx, wrap para");
                
                //              area.setWrapStyleWord(true);
                //              panel.add(new JScrollPane(area), "width 10px, height 100lp, grow, spanx, wrap para");
                

-
+               

                //Close button
                JButton close = new JButton(trans.get("button.close"));
                close.addActionListener(new ActionListener() {
                //Close button
                JButton close = new JButton(trans.get("button.close"));
                close.addActionListener(new ActionListener() {

diff --git a/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java b/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java
index 646e402e03b2335931dac17860a81a63cf206a42..8e6fe5d6d71955114aec1eb5f156fe7440e02c06 100644 (file)
--- a/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java
+++ b/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java
@@ -415,8 +415,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
                totalImpulseLabel = new JLabel();
                panel.add(totalImpulseLabel, "split");
                classificationLabel = new JLabel();
                totalImpulseLabel = new JLabel();
                panel.add(totalImpulseLabel, "split");
                classificationLabel = new JLabel();

-               classificationLabel.setEnabled(false); // Gray
-               //              classificationLabel.setForeground(Color.GRAY);
+               classificationLabel.setEnabled(false); // Gray out

                panel.add(classificationLabel, "gapleft unrel, wrap");
                
                //// Avg. thrust:
                panel.add(classificationLabel, "gapleft unrel, wrap");
                
                //// Avg. thrust:

diff --git a/core/src/net/sf/openrocket/gui/main/Splash.java b/core/src/net/sf/openrocket/gui/main/Splash.java
index 85f3d52982cb58be871c71e472e5f9272a830c6b..4d9b68a56215fa9cd31c803016e9561d742710aa 100644 (file)
--- a/core/src/net/sf/openrocket/gui/main/Splash.java
+++ b/core/src/net/sf/openrocket/gui/main/Splash.java
@@ -25,7 +25,7 @@ public class Splash {
        
        // The right edge of the text base line for the version string
        private static final int VERSION_POSITION_X = 617;
        
        // The right edge of the text base line for the version string
        private static final int VERSION_POSITION_X = 617;

-       private static final int VERSION_POSITION_Y = 135;
+       private static final int VERSION_POSITION_Y = 138;

        private static final Font VERSION_FONT = new Font(Font.SANS_SERIF, Font.PLAIN, 9);
        private static final Color VERSION_COLOR = Color.WHITE;
        
        private static final Font VERSION_FONT = new Font(Font.SANS_SERIF, Font.PLAIN, 9);
        private static final Color VERSION_COLOR = Color.WHITE;
        


@@ -60,7 +60,7 @@ public class Splash {
        }
        
        
        }
        
        

-
+       

        private static void drawVersionNumber(Graphics2D g2) {
                String text = "Version " + BuildProperties.getVersion();
                GlyphVector gv = VERSION_FONT.createGlyphVector(g2.getFontRenderContext(), text);
        private static void drawVersionNumber(Graphics2D g2) {
                String text = "Version " + BuildProperties.getVersion();
                GlyphVector gv = VERSION_FONT.createGlyphVector(g2.getFontRenderContext(), text);


@@ -69,7 +69,7 @@ public class Splash {
                double width = rect.getWidth();
                
                g2.setColor(VERSION_COLOR);
                double width = rect.getWidth();
                
                g2.setColor(VERSION_COLOR);

-               g2.drawGlyphVector(gv, (float) (VERSION_POSITION_X - width), (float) VERSION_POSITION_Y);
+               g2.drawGlyphVector(gv, (float) (VERSION_POSITION_X - width), VERSION_POSITION_Y);

                
        }
        
                
        }
        


@@ -88,6 +88,6 @@ public class Splash {
                }
        }
        
                }
        }
        

-
-
+       
+       

 }
 }

diff --git a/core/web/html/android_logo.png b/core/web/html/android_logo.png
new file mode 100644 (file)
index 0000000..198f79c
Binary files /dev/null and b/core/web/html/android_logo.png differ

diff --git a/core/web/html/contact.html b/core/web/html/contact.html
index bd981e3055ac9278bc07780f95a7d9c9cdd2e78f..a878d4bf2c8ad4ef07126a6c4876b331a563806a 100644 (file)
--- a/core/web/html/contact.html
+++ b/core/web/html/contact.html
@@ -69,24 +69,24 @@
       interested in contributing something to OpenRocket or simply want
       hear about and discuss future development.  Note that support
       requests should be sent to the
       interested in contributing something to OpenRocket or simply want
       hear about and discuss future development.  Note that support
       requests should be sent to the

-      <a href="http://apps.sourceforge.net/phpbb/openrocket/">support
+      <a href="http://www.rocketryforum.com/forumdisplay.php?f=36">support

       forums</a> instead!</p>
     <p><strong>Unsubscribing</strong> from the lists can be performed
     in the above links as well.  <em>Please do not send unsubscription
     requests to the list.</em></p>
     <h2>Support forums</h2>
       forums</a> instead!</p>
     <p><strong>Unsubscribing</strong> from the lists can be performed
     in the above links as well.  <em>Please do not send unsubscription
     requests to the list.</em></p>
     <h2>Support forums</h2>

-    <p>The main support channel for the usage of OpenRocket is the
-    support forums.  This way everybody can benefit from the answers
-    provided.</p>
-    <p><em><a href="http://apps.sourceforge.net/phpbb/openrocket/">Go
-    to the support forums &rarr;</a></em></p>
+    <p>The official support forum for OpenRocket is the
+      <a href="http://www.rocketryforum.com/forumdisplay.php?f=36">Rocketry
+      Electronics and Software forum</a> at
+      <a href="http://www.rocketryforum.com/">The Rocketry Forum</a>.</p>
+    <p>Please ask any questions on using OpenRocket on that forum,
+      where others can answer as well and gain knowledge from the
+      answers.</p>

     <h2 id="contact">Contact information</h2>
     <h2 id="contact">Contact information</h2>

-    <p>OpenRocket is primarily developed by Sampo Niskanen.  His contact
+    <p>The main developer of OpenRocket is Sampo Niskanen.  His contact

     information can be found below.</p>
     information can be found below.</p>

-    <p><em>If you would like to contribute something to OpenRocket, please
-    contact me!</em></p>

     <p><strong><em>Support requests</em></strong> should be sent to
     <p><strong><em>Support requests</em></strong> should be sent to

-    the <a href="http://apps.sourceforge.net/phpbb/openrocket/">support
+    the <a href="http://www.rocketryforum.com/forumdisplay.php?f=36">support

     forums</a>.<br/>
 <!--    <strong><em>Bug reports and feature requests</em></strong> should
     be <a href="report.html">reported separately</a>.</p> -->
     forums</a>.<br/>
 <!--    <strong><em>Bug reports and feature requests</em></strong> should
     be <a href="report.html">reported separately</a>.</p> -->

diff --git a/core/web/html/download.html b/core/web/html/download.html
index 86ca9fa125d69c56928212c771ad52ab2ff14a9c..4284bbdbe09b86c6292998a5ecf48605d0f171e0 100644 (file)
--- a/core/web/html/download.html
+++ b/core/web/html/download.html
@@ -48,6 +48,21 @@
   <div class="content">
 <div class="news">
       <h2>Recent news:</h2>
   <div class="content">
 <div class="news">
       <h2>Recent news:</h2>

+  <p><span class="date">10.3.2012:</span> Version 12.03 for desktop
+    and Android is <a href="download.html">released</a>!</p>
+  <p>In this release the version numbering scheme has been changed.
+    From now on the version number is <em>YY.MM</em> indicating the
+    year and month of the release.  Bug fix releases are indicated by
+    an added "<em>.1</em>".</p>
+  <p>This also marks the first release for Android devices.  In this
+    first release you can open files and examine existing simulations,
+    stability data and motor files.  The Android port is thanks to
+    work by Kevin Ruland.</p>
+  <p>Enhancements in the desktop version include saving designs in RKT
+    format thanks to Doug Pedrick, configurable stage separation
+    events, guided help tours and displaying the computed motor
+    designation class.  The application has also been translated to
+    Italian by Mauro Biasutti and Russian by the Sky Dart Team.</p>

   <p><span class="date">24.11.2011:</span> Version 1.1.9 is
     <a href="download.html">released</a>!</p>
   <p>For this version Richard Graham has implemented geodetic
   <p><span class="date">24.11.2011:</span> Version 1.1.9 is
     <a href="download.html">released</a>!</p>
   <p>For this version Richard Graham has implemented geodetic


@@ -68,16 +83,6 @@
   <p>The web pages have also been somewhat updated and Boris du Reau has
     created <a href="http://openrocket.trans.free.fr/">a separate site</a>
     for coordinating the localization efforts for OpenRocket.</p>
   <p>The web pages have also been somewhat updated and Boris du Reau has
     created <a href="http://openrocket.trans.free.fr/">a separate site</a>
     for coordinating the localization efforts for OpenRocket.</p>

-  <p><span class="date">12.8.2011:</span> Version 1.1.7 is
-    <a href="download.html">released</a>!</p>
-  <p>This release includes automatic rocket design optimization
-    support (<em>Analyze</em> &rarr; <em>Rocket optimization</em>).
-    You can optimize any amount of rocket parameters for apogee
-    altitude, maximum velocity or a number of different values.</p>
-  <p>While the automatic optimization is a powerful tool, it is very
-    easy to optimize against particulars of the simulation methods,
-    instead of true physical phenomena.  Always keep common sense at
-    hand and take the results with a grain of salt.</p>

 </div>
     <div class="contentholder">
       <h2>Ready packages</h2>
 </div>
     <div class="contentholder">
       <h2>Ready packages</h2>


@@ -87,40 +92,49 @@
        <a href="http://www.thrustcurve.org/">thrustcurve.org</a>.</p>
       <p>OpenRocket requires <strong>Java version 6</strong> or
          later.  The Sun Java Runtime is recommended.</p>
        <a href="http://www.thrustcurve.org/">thrustcurve.org</a>.</p>
       <p>OpenRocket requires <strong>Java version 6</strong> or
          later.  The Sun Java Runtime is recommended.</p>

-      <h3>Development release</h3>
-      <p>The development release contains the latest and greatest
-       features, but may contain more bugs than the stable version.
-       Currently the development version is the recommended
-       download.</p>
+      <h3>Desktop version</h3>
+      <p>This is the latest version of the desktop version of
+        OpenRocket.  It contains the latest and greatest features, and
+        runs on any system supporting Java.</p>
+      <div class="left">
+        <img src="java_logo.png" alt="" />
+      </div>

       <div class="right support">
         <a href="http://sourceforge.net/donate/index.php?group_id=260357"><img src="project-support.jpg" width="88" height="32" alt="Support This Project" /></a>
       </div>
         <div class="downloadbox">
       <div class="right support">
         <a href="http://sourceforge.net/donate/index.php?group_id=260357"><img src="project-support.jpg" width="88" height="32" alt="Support This Project" /></a>
       </div>
         <div class="downloadbox">

-    <a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.9/OpenRocket-1.1.9.jar/download">
+    <a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/12.03/OpenRocket-12.03.jar/download">

       <strong>Download now!</strong>
       <strong>Download now!</strong>

-      <span>OpenRocket-1.1.9.jar</span>
+      <span>OpenRocket-12.03.jar</span>

     </a>
     <span class="alternative">
     </a>
     <span class="alternative">

-      <a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.9/ReleaseNotes/view">Release notes</a> |
-            <a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.9/OpenRocket-1.1.9-src.zip/download">Source code</a>
+      <a href="https://sourceforge.net/projects/openrocket/files/openrocket/12.03/ReleaseNotes/view">Release notes</a> |
+            <a href="https://sourceforge.net/projects/openrocket/files/openrocket/12.03/OpenRocket-12.03-src.zip/download">Source code</a>

     </span>
   </div>
     </span>
   </div>

-      <h3>Stable release</h3>
-      <p>Occasionally during OpenRocket development focus will shift
-       from feature development towards getting all open bugs fix and
-       to produce a stable release.  No updates are made to the
-       stable branch except for possible bug fixes, so the stable
-       release has less features than the development release.</p>
-      <p>The current stable release is
-       <tt><a class="main"
-       href="https://sourceforge.net/projects/openrocket/files/openrocket/1.0.0/OpenRocket-1.0.0.jar/download">OpenRocket-1.0.0.jar</a></tt></p>
-      <h3>Running OpenRocket</h3>

       <p>OpenRocket can be started in most graphical environments (including
        Windows) by double-clicking the package icon.  No installation is
        required.</p>
       <p>From the command line OpenRocket can be started by
       <p>OpenRocket can be started in most graphical environments (including
        Windows) by double-clicking the package icon.  No installation is
        required.</p>
       <p>From the command line OpenRocket can be started by

-      <span class="command">java -jar OpenRocket-1.1.9.jar</span></p>
-       
+      <span class="command">java -jar OpenRocket-12.03.jar</span></p>
+      <h3>Android version</h3>
+      <p>The Android version allows opening OpenRocket files, viewing
+        simulations and motors.  Later versions will allow running
+        simulations as well.</p>
+      <p>The Android version is thanks to the fantastic work by Kevin
+        Ruland.</p>
+      <div class="left">
+        <img src="android_logo.png" alt="" />
+      </div>
+      <div class="instructions">
+        <p>Installation:</p>
+        <ol>
+          <li>Go to <em>Settings</em> &rarr; <em>Applications</em> and
+            check <em>Unknown sources</em>.</li>
+         <li>Download <a href="https://sourceforge.net/projects/openrocket/files/openrocket/12.03/OpenRocket-Android-12.03.apk/download">OpenRocket-Android-12.03.apk</a>
+           on your device and accept installation.</li>
+        </ol>
+      </div>

     </div>
     <div class="clear"></div>
     <h2>Source code and older versions</h2>
     </div>
     <div class="clear"></div>
     <h2>Source code and older versions</h2>

diff --git a/core/web/html/index.html b/core/web/html/index.html
index 10a6cc204ee07d598a08d6bcb5473f25244598e2..0489dd6040e75217844205556f35ddf72252f010 100644 (file)
--- a/core/web/html/index.html
+++ b/core/web/html/index.html
@@ -49,12 +49,12 @@
     <h2>Introduction</h2>
     <div class="rightpane">
         <div class="downloadbox">
     <h2>Introduction</h2>
     <div class="rightpane">
         <div class="downloadbox">

-    <a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.9/OpenRocket-1.1.9.jar/download">
+    <a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/12.03/OpenRocket-12.03.jar/download">

       <strong>Download now!</strong>
       <strong>Download now!</strong>

-      <span>OpenRocket-1.1.9.jar</span>
+      <span>OpenRocket-12.03.jar</span>

     </a>
     <span class="alternative">
     </a>
     <span class="alternative">

-      <a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.9/ReleaseNotes/view">Release notes</a> |
+      <a href="https://sourceforge.net/projects/openrocket/files/openrocket/12.03/ReleaseNotes/view">Release notes</a> |

             <a href="download.html">Other versions</a>
     </span>
   </div>
             <a href="download.html">Other versions</a>
     </span>
   </div>


@@ -96,6 +96,21 @@
     <div class="clear"></div>
 <div class="news">
       <h2>News</h2>
     <div class="clear"></div>
 <div class="news">
       <h2>News</h2>

+  <p><span class="date">10.3.2012:</span> Version 12.03 for desktop
+    and Android is <a href="download.html">released</a>!</p>
+  <p>In this release the version numbering scheme has been changed.
+    From now on the version number is <em>YY.MM</em> indicating the
+    year and month of the release.  Bug fix releases are indicated by
+    an added "<em>.1</em>".</p>
+  <p>This also marks the first release for Android devices.  In this
+    first release you can open files and examine existing simulations,
+    stability data and motor files.  The Android port is thanks to
+    work by Kevin Ruland.</p>
+  <p>Enhancements in the desktop version include saving designs in RKT
+    format thanks to Doug Pedrick, configurable stage separation
+    events, guided help tours and displaying the computed motor
+    designation class.  The application has also been translated to
+    Italian by Mauro Biasutti and Russian by the Sky Dart Team.</p>

   <p><span class="date">24.11.2011:</span> Version 1.1.9 is
     <a href="download.html">released</a>!</p>
   <p>For this version Richard Graham has implemented geodetic
   <p><span class="date">24.11.2011:</span> Version 1.1.9 is
     <a href="download.html">released</a>!</p>
   <p>For this version Richard Graham has implemented geodetic

diff --git a/core/web/html/java_logo.png b/core/web/html/java_logo.png
new file mode 100644 (file)
index 0000000..1666deb
Binary files /dev/null and b/core/web/html/java_logo.png differ

diff --git a/core/web/html/layout.css b/core/web/html/layout.css
index e0f5bf57faf4d73c697ce772a72b9d6f79e57096..34954ee4ec896c40ff43c6d074d053b8f93891c0 100644 (file)
--- a/core/web/html/layout.css
+++ b/core/web/html/layout.css
@@ -301,6 +301,11 @@ hr {
   margin: 2em 0em;
 }
 
   margin: 2em 0em;
 }
 

+.left {
+  float: left;
+  margin: 0;
+}
+

 .right {
   float: right;
   margin: 0;
 .right {
   float: right;
   margin: 0;


@@ -580,3 +585,7 @@ span.licenseimage {
     margin-left: 10px;
     margin-top: 2px;
 }
     margin-left: 10px;
     margin-top: 2px;
 }

+
+.instructions {
+  margin-left: 100px;
+}
\ No newline at end of file

diff --git a/core/web/html/license.html b/core/web/html/license.html
index daefe3da63833422795f2b8fc7488878105401f0..3bb00857df7909b587d87e74397c04da873287bb 100644 (file)
--- a/core/web/html/license.html
+++ b/core/web/html/license.html
@@ -53,7 +53,7 @@
     <pre class="license">
 OpenRocket - A model rocket simulator
 
     <pre class="license">
 OpenRocket - A model rocket simulator
 

-Copyright (C) 2007-2011 Sampo Niskanen
+Copyright (C) 2007-2012 Sampo Niskanen and others

 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/core/web/html/report.html b/core/web/html/report.html
deleted file mode 100644 (file)
index c9a1270..0000000
--- a/core/web/html/report.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <title>OpenRocket &mdash; Bug reports and feature requests</title>
-  <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-  <meta name="keywords" content="OpenRocket, model rocket, simulator, simulation, rocketry" />
-  <link rel="stylesheet" type="text/css" href="layout.css" />
-<meta name="Generator" content="htp 1.16" />
-</head>
-<body class="page_report">
-  <!--[if lte IE 6]>
-  <div id="iewarn">
-    You are using a browser that is <strong>8 years old!</strong>
-    &nbsp;&nbsp;&nbsp;
-    In Internet-years that is <em>prehistoric!</em><br/>
-    For the sanity of all webmasterkind,
-    <em>please <a href="http://www.mozilla.com/">upgrade</a></em>.  It's easy!
-  </div>
-  <![endif]-->
-  <div class="menucontainer">
-    <div class="menu">
-      <div class="icon"><a href="index.html"></a></div>
-      <ul>
-        <li><a href="index.html">OpenRocket</a></li>
-        <li><a href="features.html">Features and screenshots</a></li>
-        <li><a href="download.html">Download</a></li>
-        <li><a href="documentation.html">Documentation</a></li>
-        <li><a href="http://sourceforge.net/apps/mediawiki/openrocket/">Wiki pages</a></li>
-        <li><a href="http://openrocket.trans.free.fr/">Translations</a></li>
-        <li><a href="getinvolved.html">Get involved!</a></li>
-        <li><a href="contact.html">
-          Mailing lists<br/>
-          Support forums<br/>
-         Contact info</a></li>
-<!--
-        <li><a href="report.html">
-          Report a bug<br/>
-         Request a feature</a></li>
--->
-        <li><a href="license.html">License</a></li>
-      </ul>
-      <div class="logo">
-        <a href="http://sourceforge.net/projects/openrocket"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=260357&amp;type=12" width="120" height="30" alt="Get OpenRocket at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a>
-      </div>
-    </div>
-  </div>
-    <h1>Bug reports and feature requests for OpenRocket</h1>
-  <div class="content">
-    <h2>Bug reports</h2>
-    <p>If you encounter problems with OpenRocket, please report them
-    so they can be fixed in future versions.  Please follow the
-    instructions below to report a bug:</p>
-    <ul>
-      <li>Search the bug repository to see if the bug has already been
-      reported.  If it is, please add extra information to that bug
-      report:
-      <form action="https://sourceforge.net/search/index.php" method="get">
-        <p><input type="hidden" name="group_id" value="260357" />
-       <input type="hidden" name="type_of_search" value="artifact" />
-<!--    <input type="hidden" name="group_artifact_id" value="1127606" /> -->
-<!--    <input type="hidden" name="artifact_group" value="Bug" /> -->
-        <input type="hidden" name="search_summary" value="1" />
-        <input type="hidden" name="search_details" value="1" />
-        <input type="hidden" name="search_comments" value="1" />
-       <input type="text" name="all_words" value="" />
-       <input type="submit" name="form_submit" value="Search" /></p>
-      </form>
-      </li>
-      <li>Report the bug using the
-      <a href="https://sourceforge.net/tracker/?func=add&amp;group_id=260357&amp;atid=1127606">bug
-      tracker</a>.  Follow the instructions provided to fill in the
-      report.</li>
-      <li>If you are unsure about some issue, you can discuss it in
-      the appropriate
-      <a href="http://apps.sourceforge.net/phpbb/openrocket/">support
-      forum</a>.</li>
-    </ul>
-    <h2>Feature requests</h2>
-    <p>Good ideas on how to make OpenRocket better are always welcome!
-    The features will be implemented as there is time.  However, no
-    promises are made of when or whether some feature will be
-    provided.</p>
-    <p>If you would like to implement some feature yourself, patches
-    are sincerely welcome.  Please <a href="contact.html#contact">contact
-    me</a> in order to coordinate our efforts.</p>
-    <p>When requesting a feature:</p>
-    <ul>
-      <li>Check that the feature is not already in the
-       <a href="http://openrocket.svn.sourceforge.net/viewvc/openrocket/trunk/TODO">TODO-file</a> or
-      the <a href="https://sourceforge.net/tracker/?group_id=260357&amp;atid=1127606&amp;artgroup=899287">enhancement requests</a>.</li>
-      <li>Send the request to the <a href="https://sourceforge.net/tracker/?func=add&amp;group_id=260357&amp;atid=1127606">bug tracker</a> as an
-      enhancement request.  Please send multiple enhancements as
-      individual items.</li>
-    </ul>
-  </div>
-  <div class="valid">
-    <p><a href="http://validator.w3.org/check/referer"><img src="valid-xhtml10.png" alt="Valid XHTML 1.0!" /></a>
-    </p>
-  </div>
-<!-- Piwik -->
-<script type="text/javascript">
-var pkBaseURL = (("https:" == document.location.protocol) ? "https://apps.sourceforge.net/piwik/openrocket/" : "http://apps.sourceforge.net/piwik/openrocket/");
-document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-</script><script type="text/javascript">
-piwik_action_name = '';
-piwik_idsite = 1;
-piwik_url = pkBaseURL + "piwik.php";
-piwik_log(piwik_action_name, piwik_idsite, piwik_url);
-</script>
-<noscript><p><img src="http://apps.sourceforge.net/piwik/openrocket/piwik.php?idsite=1" alt="" /></p></noscript>
-<!-- End Piwik Tag -->
-</body>
-</html>

diff --git a/core/web/htp/contact.htp b/core/web/htp/contact.htp
index b7367991859b23bff7cb607963a152d8f1fec9bb..cea23f889fa98119257154906b9d200f83c122ac 100644 (file)
--- a/core/web/htp/contact.htp
+++ b/core/web/htp/contact.htp
@@ -34,7 +34,7 @@
       interested in contributing something to OpenRocket or simply want
       hear about and discuss future development.  Note that support
       requests should be sent to the 
       interested in contributing something to OpenRocket or simply want
       hear about and discuss future development.  Note that support
       requests should be sent to the 

-      <a href="http://apps.sourceforge.net/phpbb/openrocket/">support
+      <a href="http://www.rocketryforum.com/forumdisplay.php?f=36">support

       forums</a> instead!</p>
 
     <p><strong>Unsubscribing</strong> from the lists can be performed
       forums</a> instead!</p>
 
     <p><strong>Unsubscribing</strong> from the lists can be performed


@@ -44,24 +44,22 @@
 
     <h2>Support forums</h2>
 
 
     <h2>Support forums</h2>
 

-    <p>The main support channel for the usage of OpenRocket is the
-    support forums.  This way everybody can benefit from the answers
-    provided.</p>
-
-    <p><em><a href="http://apps.sourceforge.net/phpbb/openrocket/">Go
-    to the support forums &rarr;</a></em></p>
+    <p>The official support forum for OpenRocket is the
+      <a href="http://www.rocketryforum.com/forumdisplay.php?f=36">Rocketry
+      Electronics and Software forum</a> at
+      <a href="http://www.rocketryforum.com/">The Rocketry Forum</a>.</p>

 
 

+    <p>Please ask any questions on using OpenRocket on that forum,
+      where others can answer as well and gain knowledge from the
+      answers.</p>

 
     <h2 id="contact">Contact information</h2>
 
 
     <h2 id="contact">Contact information</h2>
 

-    <p>OpenRocket is primarily developed by Sampo Niskanen.  His contact
+    <p>The main developer of OpenRocket is Sampo Niskanen.  His contact

     information can be found below.</p>
 
     information can be found below.</p>
 

-    <p><em>If you would like to contribute something to OpenRocket, please
-    contact me!</em></p>
-

     <p><strong><em>Support requests</em></strong> should be sent to
     <p><strong><em>Support requests</em></strong> should be sent to

-    the <a href="http://apps.sourceforge.net/phpbb/openrocket/">support 
+    the <a href="http://www.rocketryforum.com/forumdisplay.php?f=36">support 

     forums</a>.<br/>
 <!--    <strong><em>Bug reports and feature requests</em></strong> should
     be <a href="report.html">reported separately</a>.</p> -->
     forums</a>.<br/>
 <!--    <strong><em>Bug reports and feature requests</em></strong> should
     be <a href="report.html">reported separately</a>.</p> -->

diff --git a/core/web/htp/download.htp b/core/web/htp/download.htp
index d4931e4ee55ba3e636eb1aa5dd744dd8a5bc594f..336b8b5f723f6a96df0a37f7cdd41d0e7ea61adc 100644 (file)
--- a/core/web/htp/download.htp
+++ b/core/web/htp/download.htp
@@ -22,13 +22,15 @@
       <p>OpenRocket requires <strong>Java version 6</strong> or
          later.  The Sun Java Runtime is recommended.</p>
       
       <p>OpenRocket requires <strong>Java version 6</strong> or
          later.  The Sun Java Runtime is recommended.</p>
       

-      <h3>Development release</h3>
+      <h3>Desktop version</h3>

 
 

-      <p>The development release contains the latest and greatest
-       features, but may contain more bugs than the stable version.
-       Currently the development version is the recommended
-       download.</p>
+      <p>This is the latest version of the desktop version of
+        OpenRocket.  It contains the latest and greatest features, and
+        runs on any system supporting Java.</p>

       
       

+      <div class="left">
+        <img src="java_logo.png" alt=""/>
+      </div>

       <div class="right support">
         <a href="http://sourceforge.net/donate/index.php?group_id=260357"><img src="project-support.jpg" width="88" height="32" alt="Support This Project" /></a>
       </div>
       <div class="right support">
         <a href="http://sourceforge.net/donate/index.php?group_id=260357"><img src="project-support.jpg" width="88" height="32" alt="Support This Project" /></a>
       </div>


@@ -36,28 +38,36 @@
       <set sourcelink="true">
       <downloadbox>
 
       <set sourcelink="true">
       <downloadbox>
 

-      <h3>Stable release</h3>
-
-      <p>Occasionally during OpenRocket development focus will shift
-       from feature development towards getting all open bugs fix and
-       to produce a stable release.  No updates are made to the
-       stable branch except for possible bug fixes, so the stable
-       release has less features than the development release.</p>
-
-      <p>The current stable release is
-       <tt><a class="main"
-       href="https://sourceforge.net/projects/openrocket/files/openrocket/${stableversion}/OpenRocket-${stableversion}.jar/download">OpenRocket-<use stableversion>.jar</a></tt></p>
-      
-
-      <h3>Running OpenRocket</h3>
-      

       <p>OpenRocket can be started in most graphical environments (including
        Windows) by double-clicking the package icon.  No installation is
        required.</p>
 
       <p>From the command line OpenRocket can be started by
       <span class="command">java -jar OpenRocket-<use version>.jar</span></p>
       <p>OpenRocket can be started in most graphical environments (including
        Windows) by double-clicking the package icon.  No installation is
        required.</p>
 
       <p>From the command line OpenRocket can be started by
       <span class="command">java -jar OpenRocket-<use version>.jar</span></p>

-       
+
+      <h3>Android version</h3>
+
+      <p>The Android version allows opening OpenRocket files, viewing
+        simulations and motors.  Later versions will allow running
+        simulations as well.</p>
+
+      <p>The Android version is thanks to the fantastic work by Kevin
+        Ruland.</p>
+
+      <div class="left">
+        <img src="android_logo.png" alt=""/>
+      </div>
+      <div class="instructions">
+        <p>Installation:</p>
+        <ol>
+          <li>Go to <em>Settings</em> &rarr; <em>Applications</em> and
+            check <em>Unknown sources</em>.</li>
+         <li>Download <a href="https://sourceforge.net/projects/openrocket/files/openrocket/${version}/OpenRocket-Android-${version}.apk/download">OpenRocket-Android-<use version>.apk</a>
+           on your device and accept installation.</li>
+
+        </ol>
+      </div>
+

     </div>
     <div class="clear"></div>
 
     </div>
     <div class="clear"></div>
 

diff --git a/core/web/htp/htp.def b/core/web/htp/htp.def
index be65ee3053fb1d12c61787f5861d74fed240b3b9..d2aedaa14115d9afb26c1dfe561057a7c440d842 100644 (file)
--- a/core/web/htp/htp.def
+++ b/core/web/htp/htp.def
@@ -1,6 +1,4 @@
-<set stableversion="1.0.0">
-<set developmentversion="1.1.9">
-<set version="${developmentversion}">
+<set version="12.03">

 
 <def name="downloadbox">
   <div class="downloadbox">
 
 <def name="downloadbox">
   <div class="downloadbox">

diff --git a/core/web/htp/license.htp b/core/web/htp/license.htp
index a2743f656d788cb8f83381e73a7985d09fa9f204..3835cbb0e56b3d18e509d73805418d5fd9347502 100644 (file)
--- a/core/web/htp/license.htp
+++ b/core/web/htp/license.htp
@@ -16,7 +16,7 @@
     <pre class="license">
 OpenRocket - A model rocket simulator
 
     <pre class="license">
 OpenRocket - A model rocket simulator
 

-Copyright (C) 2007-2011 Sampo Niskanen
+Copyright (C) 2007-2012 Sampo Niskanen and others

 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/core/web/htp/news.htp b/core/web/htp/news.htp
index ae125a8c5515072628a5238aa1fc4cac836671de..675482b3523d87d849f108de8d4ac1079191313a 100644 (file)
--- a/core/web/htp/news.htp
+++ b/core/web/htp/news.htp
@@ -9,6 +9,25 @@
 
   <!--- Remember to move the position of "onlyrecent" below! --->
 
 
   <!--- Remember to move the position of "onlyrecent" below! --->
 

+  <p><span class="date">10.3.2012:</span> Version 12.03 for desktop
+    and Android is <a href="download.html">released</a>!</p>
+
+  <p>In this release the version numbering scheme has been changed.
+    From now on the version number is <em>YY.MM</em> indicating the
+    year and month of the release.  Bug fix releases are indicated by
+    an added "<em>.1</em>".</p>
+
+  <p>This also marks the first release for Android devices.  In this
+    first release you can open files and examine existing simulations,
+    stability data and motor files.  The Android port is thanks to
+    work by Kevin Ruland.</p>
+
+  <p>Enhancements in the desktop version include saving designs in RKT
+    format thanks to Doug Pedrick, configurable stage separation
+    events, guided help tours and displaying the computed motor
+    designation class.  The application has also been translated to
+    Italian by Mauro Biasutti and Russian by the Sky Dart Team.</p>
+

   <p><span class="date">24.11.2011:</span> Version 1.1.9 is 
     <a href="download.html">released</a>!</p>
 
   <p><span class="date">24.11.2011:</span> Version 1.1.9 is 
     <a href="download.html">released</a>!</p>
 


@@ -35,6 +54,10 @@
     created <a href="http://openrocket.trans.free.fr/">a separate site</a>
     for coordinating the localization efforts for OpenRocket.</p>
   
     created <a href="http://openrocket.trans.free.fr/">a separate site</a>
     for coordinating the localization efforts for OpenRocket.</p>
   

+
+  <if not onlyrecent><!--- Older items not shown on download page:  --->
+
+

   <p><span class="date">12.8.2011:</span> Version 1.1.7 is 
     <a href="download.html">released</a>!</p>
 
   <p><span class="date">12.8.2011:</span> Version 1.1.7 is 
     <a href="download.html">released</a>!</p>
 


@@ -48,10 +71,6 @@
     instead of true physical phenomena.  Always keep common sense at
     hand and take the results with a grain of salt.</p>
 
     instead of true physical phenomena.  Always keep common sense at
     hand and take the results with a grain of salt.</p>
 

-
-  <if not onlyrecent><!--- Older items not shown on download page:  --->
-
-

   <p><span class="date">22.7.2011:</span> Version 1.1.6 is 
     <a href="download.html">released</a>!</p>
 
   <p><span class="date">22.7.2011:</span> Version 1.1.6 is 
     <a href="download.html">released</a>!</p>
 

diff --git a/core/web/htp/report.htp b/core/web/htp/report.htp
deleted file mode 100644 (file)
index 0f4f51d..0000000
--- a/core/web/htp/report.htp
+++ /dev/null
@@ -1,68 +0,0 @@
-<file template="body.htt">
-<set title="OpenRocket &mdash; Bug reports and feature requests">
-<set page="report">
-
-<block name="body">
-  <h1>Bug reports and feature requests for OpenRocket</h1>
-  <div class="content">
-
-    <h2>Bug reports</h2>
-
-    <p>If you encounter problems with OpenRocket, please report them
-    so they can be fixed in future versions.  Please follow the
-    instructions below to report a bug:</p>
-
-    <ul>
-      <li>Search the bug repository to see if the bug has already been
-      reported.  If it is, please add extra information to that bug
-      report:
-      <form action="https://sourceforge.net/search/index.php" method="get">
-        <p><input type="hidden" name="group_id" value="260357" />
-       <input type="hidden" name="type_of_search" value="artifact"/>
-<!--    <input type="hidden" name="group_artifact_id" value="1127606" /> -->
-<!--    <input type="hidden" name="artifact_group" value="Bug" /> -->
-        <input type="hidden" name="search_summary" value="1" />
-        <input type="hidden" name="search_details" value="1" />
-        <input type="hidden" name="search_comments" value="1" />
-
-       <input type="text" name="all_words" value="" />
-       <input type="submit" name="form_submit" value="Search" /></p>
-      </form>
-      </li>
-
-      <li>Report the bug using the 
-      <a href="https://sourceforge.net/tracker/?func=add&amp;group_id=260357&amp;atid=1127606">bug
-      tracker</a>.  Follow the instructions provided to fill in the 
-      report.</li>
-
-      <li>If you are unsure about some issue, you can discuss it in
-      the appropriate 
-      <a href="http://apps.sourceforge.net/phpbb/openrocket/">support 
-      forum</a>.</li>
-    </ul>
-
-    <h2>Feature requests</h2>
-
-    <p>Good ideas on how to make OpenRocket better are always welcome!
-    The features will be implemented as there is time.  However, no
-    promises are made of when or whether some feature will be
-    provided.</p>
-
-    <p>If you would like to implement some feature yourself, patches
-    are sincerely welcome.  Please <a href="contact.html#contact">contact
-    me</a> in order to coordinate our efforts.</p>
-
-    <p>When requesting a feature:</p>
-
-    <ul>
-      <li>Check that the feature is not already in the
-       <a href="http://openrocket.svn.sourceforge.net/viewvc/openrocket/trunk/TODO">TODO-file</a> or
-      the <a href="https://sourceforge.net/tracker/?group_id=260357&amp;atid=1127606&amp;artgroup=899287">enhancement requests</a>.</li>
-      <li>Send the request to the <a href="https://sourceforge.net/tracker/?func=add&amp;group_id=260357&amp;atid=1127606">bug tracker</a> as an
-      enhancement request.  Please send multiple enhancements as
-      individual items.</li>
-    </ul>
-
-    <contentbox>
-  </div>
-</block>