From: plaa Date: Sat, 10 Mar 2012 14:29:32 +0000 (+0000) Subject: Copyright + web page update X-Git-Tag: upstream/12.03~1^2~19 X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=da5c7f2d2d2dc8ed516cb5ce90770cacf2ef4ca2;p=debian%2Fopenrocket 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 61a98f5a..ced6952b 100644 --- a/core/LICENSE.TXT +++ b/core/LICENSE.TXT @@ -1,6 +1,6 @@ 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 diff --git a/core/README.TXT b/core/README.TXT index c3c68458..86467aa5 100644 --- a/core/README.TXT +++ b/core/README.TXT @@ -2,7 +2,7 @@ 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. @@ -25,8 +25,15 @@ Contributions have been made by: -------------------------------- 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 -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 5af7cfb9..c2767aa5 100644 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 063de3e5..19a3e4f2 100644 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 5af7cfb9..c2767aa5 100644 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 7aaadd24..74600503 100644 --- 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 { "OpenRocket has been developed by:

" + "Sampo Niskanen (main developer)
" + "Doug Pedrick (RockSim file format, printing)
" + + "Kevin Ruland (Android version)
" + "Boris du Reau (internationalization, translation lead)
" + "Richard Graham (geodetic computations)

" + "Translations by:

" + "Tripoli France (French)
" + "Stefan Lobas / ERIG e.V. (German)
" + - "Tripoli Spain (Spanish)

" + + "Tripoli Spain (Spanish)
" + + "Sky Dart Team (Russian)
" + + "Mauro Biasutti (Italian)

" + "OpenRocket utilizes the following libraries:

" + "MiG Layout (http://www.miglayout.com/)
" + "JFreeChart (http://www.jfree.org/jfreechart/)
" + @@ -50,22 +53,22 @@ public class AboutDialog extends JDialog { 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 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"); - + // 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); } - + 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); @@ -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"); - + //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 646e402e..8e6fe5d6 100644 --- 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(); - classificationLabel.setEnabled(false); // Gray - // classificationLabel.setForeground(Color.GRAY); + classificationLabel.setEnabled(false); // Gray out 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 85f3d529..4d9b68a5 100644 --- 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; - 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; @@ -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); @@ -69,7 +69,7 @@ public class Splash { 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 index 00000000..198f79c9 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 bd981e30..a878d4bf 100644 --- 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 - support + support forums instead!

Unsubscribing from the lists can be performed in the above links as well. Please do not send unsubscription requests to the list.

Support forums

-

The main support channel for the usage of OpenRocket is the - support forums. This way everybody can benefit from the answers - provided.

-

Go - to the support forums →

+

The official support forum for OpenRocket is the + Rocketry + Electronics and Software forum at + The Rocketry Forum.

+

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

Contact information

-

OpenRocket is primarily developed by Sampo Niskanen. His contact +

The main developer of OpenRocket is Sampo Niskanen. His contact information can be found below.

-

If you would like to contribute something to OpenRocket, please - contact me!

Support requests should be sent to - the support + the support forums.
diff --git a/core/web/html/download.html b/core/web/html/download.html index 86ca9fa1..4284bbdb 100644 --- a/core/web/html/download.html +++ b/core/web/html/download.html @@ -48,6 +48,21 @@

Recent news:

+

10.3.2012: Version 12.03 for desktop + and Android is released!

+

In this release the version numbering scheme has been changed. + From now on the version number is YY.MM indicating the + year and month of the release. Bug fix releases are indicated by + an added ".1".

+

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.

+

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.

24.11.2011: Version 1.1.9 is released!

For this version Richard Graham has implemented geodetic @@ -68,16 +83,6 @@

The web pages have also been somewhat updated and Boris du Reau has created a separate site for coordinating the localization efforts for OpenRocket.

-

12.8.2011: Version 1.1.7 is - released!

-

This release includes automatic rocket design optimization - support (Analyze → Rocket optimization). - You can optimize any amount of rocket parameters for apogee - altitude, maximum velocity or a number of different values.

-

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.

Ready packages

@@ -87,40 +92,49 @@ thrustcurve.org.

OpenRocket requires Java version 6 or later. The Sun Java Runtime is recommended.

-

Development release

-

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.

+

Desktop version

+

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.

+
+ +
Support This Project
- + Download now! - OpenRocket-1.1.9.jar + OpenRocket-12.03.jar - Release notes | - Source code + Release notes | + Source code
-

Stable release

-

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.

-

The current stable release is - OpenRocket-1.0.0.jar

-

Running OpenRocket

OpenRocket can be started in most graphical environments (including Windows) by double-clicking the package icon. No installation is required.

From the command line OpenRocket can be started by - java -jar OpenRocket-1.1.9.jar

- + java -jar OpenRocket-12.03.jar

+

Android version

+

The Android version allows opening OpenRocket files, viewing + simulations and motors. Later versions will allow running + simulations as well.

+

The Android version is thanks to the fantastic work by Kevin + Ruland.

+
+ +
+
+

Installation:

+
    +
  1. Go to Settings → Applications and + check Unknown sources.
    2. +
  2. Download OpenRocket-Android-12.03.apk + on your device and accept installation.
    3. +
+

Source code and older versions

diff --git a/core/web/html/index.html b/core/web/html/index.html index 10a6cc20..0489dd60 100644 --- a/core/web/html/index.html +++ b/core/web/html/index.html @@ -49,12 +49,12 @@

Introduction

- + Download now! - OpenRocket-1.1.9.jar + OpenRocket-12.03.jar - Release notes | + Release notes | Other versions
@@ -96,6 +96,21 @@

News

+

10.3.2012: Version 12.03 for desktop + and Android is released!

+

In this release the version numbering scheme has been changed. + From now on the version number is YY.MM indicating the + year and month of the release. Bug fix releases are indicated by + an added ".1".

+

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.

+

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.

24.11.2011: Version 1.1.9 is released!

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 index 00000000..1666deb5 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 e0f5bf57..34954ee4 100644 --- a/core/web/html/layout.css +++ b/core/web/html/layout.css @@ -301,6 +301,11 @@ hr { margin: 2em 0em; } +.left { + float: left; + margin: 0; +} + .right { float: right; margin: 0; @@ -580,3 +585,7 @@ span.licenseimage { 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 daefe3da..3bb00857 100644 --- a/core/web/html/license.html +++ b/core/web/html/license.html @@ -53,7 +53,7 @@ 

 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
diff --git a/core/web/html/report.html b/core/web/html/report.html
deleted file mode 100644
index c9a12703..00000000
--- a/core/web/html/report.html
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
-
-  OpenRocket — Bug reports and feature requests
-  
-  
-  
-
-
-
-  
-  

-    

-      

-      
-      
-    

-  

-    
Bug reports and feature requests for OpenRocket

-  

-    
Bug reports

-    
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:

-    
    
-      
  • Search the bug repository to see if the bug has already been
-      reported.  If it is, please add extra information to that bug
-      report:
-      
    
-        
    
-	
-
-
-        
-        
-        
-	
-	
    
-      
    
-      
    • 
-      
  • Report the bug using the
-      bug
-      tracker.  Follow the instructions provided to fill in the
-      report.
    • 
-      
  • If you are unsure about some issue, you can discuss it in
-      the appropriate
-      support
-      forum.
    • 
-    

-    
Feature requests

-    
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.

-    
If you would like to implement some feature yourself, patches
-    are sincerely welcome.  Please contact
-    me in order to coordinate our efforts.

-    
When requesting a feature:

-    
    
-      
  • Check that the feature is not already in the
-	TODO-file or
-      the enhancement requests.
    • 
-      
  • Send the request to the bug tracker as an
-      enhancement request.  Please send multiple enhancements as
-      individual items.
    • 
-    

-  

-  

-    
Valid XHTML 1.0!
-    

-  

-
-
-
-
-
-
diff --git a/core/web/htp/contact.htp b/core/web/htp/contact.htp
index b7367991..cea23f88 100644
--- 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 
-      support
+      support
       forums instead!

 
     
Unsubscribing from the lists can be performed
@@ -44,24 +44,22 @@
 
     
Support forums

 
-    
The main support channel for the usage of OpenRocket is the
-    support forums.  This way everybody can benefit from the answers
-    provided.

-
-    
Go
-    to the support forums →

+    
The official support forum for OpenRocket is the
+      Rocketry
+      Electronics and Software forum at
+      The Rocketry Forum.

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

 
     
Contact information

 
-    
OpenRocket is primarily developed by Sampo Niskanen.  His contact
+    
The main developer of OpenRocket is Sampo Niskanen.  His contact
     information can be found below.

 
-    
If you would like to contribute something to OpenRocket, please
-    contact me!

-
     
Support requests should be sent to
-    the support 
+    the support 
     forums.

 
diff --git a/core/web/htp/download.htp b/core/web/htp/download.htp
index d4931e4e..336b8b5f 100644
--- a/core/web/htp/download.htp
+++ b/core/web/htp/download.htp
@@ -22,13 +22,15 @@
       
OpenRocket requires Java version 6 or
 	  later.  The Sun Java Runtime is recommended.

       
-      
Development release

+      
Desktop version

 
-      
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.

+      
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.

       
+      

+        
+      

       

         Support This Project
       

@@ -36,28 +38,36 @@
       
       
 
-      
Stable release

-
-      
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.

-
-      
The current stable release is
-	OpenRocket-.jar

-      
-
-      
Running OpenRocket

-      
       
OpenRocket can be started in most graphical environments (including
 	Windows) by double-clicking the package icon.  No installation is
 	required.

 
       
From the command line OpenRocket can be started by
       java -jar OpenRocket-.jar

-	
+
+      
Android version

+
+      
The Android version allows opening OpenRocket files, viewing
+        simulations and motors.  Later versions will allow running
+        simulations as well.

+
+      
The Android version is thanks to the fantastic work by Kevin
+        Ruland.

+
+      

+        
+      

+      

+        
Installation:

+        
    
+          
  1. Go to Settings → Applications and
+            check Unknown sources.
    2. 
+  	  
  2. Download OpenRocket-Android-.apk
+	    on your device and accept installation.
    3. 
+
+        

+      

+
diff --git a/core/web/htp/htp.def b/core/web/htp/htp.def index be65ee30..d2aedaa1 100644 --- a/core/web/htp/htp.def +++ b/core/web/htp/htp.def @@ -1,6 +1,4 @@ - - - +
diff --git a/core/web/htp/license.htp b/core/web/htp/license.htp index a2743f65..3835cbb0 100644 --- a/core/web/htp/license.htp +++ b/core/web/htp/license.htp @@ -16,7 +16,7 @@ 
 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
diff --git a/core/web/htp/news.htp b/core/web/htp/news.htp
index ae125a8c..675482b3 100644
--- a/core/web/htp/news.htp
+++ b/core/web/htp/news.htp
@@ -9,6 +9,25 @@
 
   
 
+  
10.3.2012: Version 12.03 for desktop
+    and Android is released!

+
+  
In this release the version numbering scheme has been changed.
+    From now on the version number is YY.MM indicating the
+    year and month of the release.  Bug fix releases are indicated by
+    an added ".1".

+
+  
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.

+
+  
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.

+
   
24.11.2011: Version 1.1.9 is 
     released!

 
@@ -35,6 +54,10 @@
     created a separate site
     for coordinating the localization efforts for OpenRocket.

   
+
+  
+
+
   
12.8.2011: Version 1.1.7 is 
     released!

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

 
-
-  
-
-
   
22.7.2011: Version 1.1.6 is 
     released!

 
diff --git a/core/web/htp/report.htp b/core/web/htp/report.htp
deleted file mode 100644
index 0f4f51d6..00000000
--- a/core/web/htp/report.htp
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
-
-
-  
Bug reports and feature requests for OpenRocket

-  

-
-    
Bug reports

-
-    
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:

-
-    
    
-      
  • Search the bug repository to see if the bug has already been
-      reported.  If it is, please add extra information to that bug
-      report:
-      
    
-        
    
-	
-
-
-        
-        
-        
-
-	
-	
    
-      
    
-      
    • 
-
-      
  • Report the bug using the 
-      bug
-      tracker.  Follow the instructions provided to fill in the 
-      report.
    • 
-
-      
  • If you are unsure about some issue, you can discuss it in
-      the appropriate 
-      support 
-      forum.
    • 
-    

-
-    
Feature requests

-
-    
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.

-
-    
If you would like to implement some feature yourself, patches
-    are sincerely welcome.  Please contact
-    me in order to coordinate our efforts.

-
-    
When requesting a feature:

-
-    
    
-      
  • Check that the feature is not already in the
-	TODO-file or
-      the enhancement requests.
    • 
-      
  • Send the request to the bug tracker as an
-      enhancement request.  Please send multiple enhancements as
-      individual items.
    • 
-    

-
-    
-  

-