hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

web updates

Browse Source
This commit is contained in:
Sampo Niskanen 2011-08-15 17:11:14 +00:00
parent f6a1d3590a
commit df779589c0
20 changed files with 145 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2011-08-13 Sampo Niskanen
* [BUG] JDK7 returns null font for TitledBorder
2011-08-12 Sampo Niskanen
* Released version 1.1.7

BIN
pix-src/icon/flag-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 168 KiB

BIN
pix-src/icon/flag-icon.xcf.gz Normal file
View File

Binary file not shown.

15
src/net/sf/openrocket/util/GUIUtil.java
View File

@ -39,6 +39,7 @@ import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JComponent;
import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JRootPane;
import javax.swing.JSlider;
import javax.swing.JSpinner;
@ -274,14 +275,18 @@ public class GUIUtil {
*/
public static void changeFontStyle(TitledBorder border, int style) {
/*
* There's been an NPE caused by the font changing, this is debug for it.
* The fix of JRE bug #4129681 causes a TitledBorder occasionally to
* return a null font. We try to work around the issue by detecting it
* and reverting to the font of a JLabel instead.
*/
if (border == null) {
throw new BugException("border is null");
}
Font font = border.getTitleFont();
if (font == null) {
throw new BugException("Border font is null");
log.error("Border font is null, reverting to JLabel font");
font = new JLabel().getFont();
if (font == null) {
log.error("JLabel font is null, not modifying font");
return;
}
}
font = font.deriveFont(style);
if (font == null) {

15
web/html/contact.html
View File

@ -26,14 +26,17 @@
<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">
@ -85,21 +88,13 @@
<p><strong><em>Support requests</em></strong> should be sent to
the <a href="http://apps.sourceforge.net/phpbb/openrocket/">support
forums</a>.<br/>
<strong><em>Bug reports and feature requests</em></strong> should
be <a href="report.html">reported separately</a>.</p>
<!-- <strong><em>Bug reports and feature requests</em></strong> should
be <a href="report.html">reported separately</a>.</p> -->
<p><strong>Email:</strong> &nbsp;&nbsp;
<em>sam<span>po</span>.<span>niskanen</span><span>@i</span>ki.fi</em></p>
<p><strong>WWW:</strong> &nbsp;&nbsp;
<a href="http://www.iki.fi/sampo.niskanen/"
title="Home page of Sampo Niskanen"><em>http://www.iki.fi/sampo.niskanen/</em></a></p>
<div class="t"></div>
<div class="r"></div>
<div class="b"></div>
<div class="l"></div>
<div class="tr"></div>
<div class="tl"></div>
<div class="br"></div>
<div class="bl"></div>
</div>
<div class="valid">
<p><a href="http://validator.w3.org/check/referer"><img src="valid-xhtml10.png" alt="Valid XHTML 1.0!" /></a>

11
web/html/documentation.html
View File

@ -26,14 +26,17 @@
<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">
@ -98,14 +101,6 @@
wiki page</a>, including links to Barrowman's original report and
thesis, extensions for the Barrowman method, experimental rocket
data etc.</p>
<div class="t"></div>
<div class="r"></div>
<div class="b"></div>
<div class="l"></div>
<div class="tr"></div>
<div class="tl"></div>
<div class="br"></div>
<div class="bl"></div>
</div>
<div class="valid">
<p><a href="http://validator.w3.org/check/referer"><img src="valid-xhtml10.png" alt="Valid XHTML 1.0!" /></a>

11
web/html/download.html
View File

@ -26,14 +26,17 @@
<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">
@ -125,14 +128,6 @@
<pre class="quote">$ svn co https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk OpenRocket</pre>
<p>The above URL may be used to connect to the repository with
other Subversion clients as well.</p>
<div class="t"></div>
<div class="r"></div>
<div class="b"></div>
<div class="l"></div>
<div class="tr"></div>
<div class="tl"></div>
<div class="br"></div>
<div class="bl"></div>
</div>
<div class="valid">
<p><a href="http://validator.w3.org/check/referer"><img src="valid-xhtml10.png" alt="Valid XHTML 1.0!" /></a>

11
web/html/features.html
View File

@ -26,14 +26,17 @@
<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">
@ -158,14 +161,6 @@
<p>If you want to help make OpenRocket the best rocket simulator,
don't hesitate to <a href="getinvolved.html">Get involved!</a></p>
<div class="clear"></div>
<div class="t"></div>
<div class="r"></div>
<div class="b"></div>
<div class="l"></div>
<div class="tr"></div>
<div class="tl"></div>
<div class="br"></div>
<div class="bl"></div>
</div>
<div class="valid">
<p><a href="http://validator.w3.org/check/referer"><img src="valid-xhtml10.png" alt="Valid XHTML 1.0!" /></a>

12
web/html/getinvolved.html
View File

@ -26,14 +26,17 @@
<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">
@ -106,6 +109,7 @@
</ul>
<h3 id="other">Other</h3>
<ul>
<li><a href="http://openrocket.trans.free.fr/">Translating OpenRocket</a> to your language</li>
<li>Creating good and interesting example designs that
demonstrate some OpenRocket features.</li>
<li>Hosting a place to share rocket designs with other
@ -113,14 +117,6 @@
<li>Giving input and suggestions on how to make OpenRocket
better.</li>
</ul>
<div class="t"></div>
<div class="r"></div>
<div class="b"></div>
<div class="l"></div>
<div class="tr"></div>
<div class="tl"></div>
<div class="br"></div>
<div class="bl"></div>
</div>
<div class="valid">
<p><a href="http://validator.w3.org/check/referer"><img src="valid-xhtml10.png" alt="Valid XHTML 1.0!" /></a>

BIN
web/html/greenbox.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.1 KiB

24
web/html/index.html
View File

@ -26,14 +26,17 @@
<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">
@ -68,10 +71,15 @@
<p><strong>OpenRocket</strong> is an free, fully featured model
rocket simulator that allows you to design and simulate your
rockets before actually building and flying them.</p>
<p>OpenRocket features a full six-degree-of-freedom simulation,
realistic wind modeling, a multitude of different components
including free-form fins and canted fins, automatic design
optimization, clustering and staging. Read more about its <a
<p>The main features include:</p>
<ul>
<li>Six-degree-of-freedom flight simulation</li>
<li>Automatic design optimization</li>
<li>Realtime simulated altitude, velocity and acceleration display</li>
<li>Staging and clustering support</li>
<li>Cross-platform (Java-based)</li>
</ul>
<p>Read more about its <a
href="features.html">features and see screenshots</a>.
</p>
<p>OpenRocket is an Open Source project licensed under the
@ -184,14 +192,6 @@
<p><span class="date">24.5.2009:</span> First version 0.9.0
<a href="download.html">released</a>!</p>
</div>
<div class="t"></div>
<div class="r"></div>
<div class="b"></div>
<div class="l"></div>
<div class="tr"></div>
<div class="tl"></div>
<div class="br"></div>
<div class="bl"></div>
</div>
<div class="valid">
<p><a href="http://validator.w3.org/check/referer"><img src="valid-xhtml10.png" alt="Valid XHTML 1.0!" /></a>

135
web/html/layout.css
View File

@ -84,13 +84,18 @@ div.menu {
width: 170px;
margin: 0;
padding: 0 0;
background: #c1d0db url(menubg.png) repeat-x;
background: url("menubg.png") repeat-x scroll 0 -35px #C1D0DB;
z-index: 200;
border: solid 1px black;
-moz-border-radius: 12px;
-webkit-border-radius: 12px;
-khtml-border-radius: 12px;
border-radius: 12px;
-moz-box-shadow: 0px 1px 10px 0px rgba(0,0,0,0.5);
-webkit-box-shadow: 0px 1px 10px 0px rgba(0,0,0,0.5);
box-shadow: 0px 1px 10px 0px rgba(0,0,0,0.5);
}
div.menu ul {
position: relative;
@ -194,70 +199,54 @@ div.menu div.logo img {
.content {
margin: 0em 2em 1em 130px;
padding: 2em 2em 2em 80px;
padding: 2em 2em 2em 95px;
min-height: 27em;
background-color: white;
position: relative;
border: 2px solid #666;
*border: 2px solid #666;
min-height: 530px;
-moz-border-radius: 7px;
-webkit-border-radius: 7px;
border-radius: 7px;
-moz-box-shadow: 0px 0px 8px 5px white;
-webkit-box-shadow: 0px 0px 8px 5px white;
box-shadow: 0px 0px 8px 5px white;
}
.content div.tl, .content div.tr, .content div.bl, .content div.br {
position: absolute;
width: 10px;
height: 10px;
background: url('whitebox.png') no-repeat;
}
.content div.tl {
top: -10px;
left: -10px;
background-position: 0px 0px;
}
.content div.tr {
top: -10px;
right: -10px;
background-position: -50px 0px;
}
.content div.bl {
bottom: -10px;
left: -10px;
background-position: 0px -50px;
}
.content div.br {
bottom: -10px;
right: -10px;
background-position: -50px -50px;
}
.gradientbutton {
display: inline-block;
width: 200px;
height: 100px;
.content div.t, .content div.b {
position: absolute;
height: 10px;
left: 0px;
right: 0px;
background: url('whitebox-vertical.png') repeat-x;
}
.content div.t {
top: -10px;
}
.content div.b {
bottom: -10px;
background-position: 0px -50px;
}
border-top: 2px solid #6f2;
border-left: 1px solid #4c1;
border-right: 1px solid #380;
border-bottom: 2px solid #360;
.content div.l, .content div.r {
position: absolute;
width: 10px;
top: 0px;
bottom: 0px;
background: url('whitebox-horizontal.png') repeat-y;
}
.content div.l {
left: -10px;
}
.content div.r {
right: -10px;
background-position: -50px 0px;
background-color: #5c2;
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
border-radius: 10px;
background-image: -webkit-gradient(
linear,
left bottom,
left top,
color-stop(0.08, rgb(55,146,14)),
color-stop(0.9, rgb(102,221,17))
);
background-image: -moz-linear-gradient(
center bottom,
rgb(55,146,14) 8%,
rgb(102,221,17) 90%
);
/*
background: -moz-linear-gradient(center bottom , #0B5CE2 30%, #2678FF 65%) repeat scroll 0 0;
/** */
}
@ -363,10 +352,38 @@ dd {
div.downloadbox {
position: relative;
width: 175px;
width: 180px;
height: 80px;
background: transparent url('greenbox.png') no-repeat;
text-align: left;
border-top: 2px solid #6e2;
border-left: 1px solid #4c1;
border-right: 1px solid #380;
border-bottom: 2px solid #360;
-moz-box-shadow: 1px 1px 4px 0px #333;
-webkit-box-shadow: 1px 1px 4px 0px #333;
box-shadow: 1px 1px 4px 0px #333;
background-color: #5c2;
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
border-radius: 10px;
background-image: -webkit-gradient(
linear,
left bottom,
left top,
color-stop(0.08, rgb(55,156,14)),
color-stop(0.9, rgb(102,221,17))
);
background-image: -moz-linear-gradient(
center bottom,
rgb(55,156,14) 8%,
rgb(102,221,17) 90%
);
}
div.downloadbox a.main {
@ -379,7 +396,7 @@ div.downloadbox a.main {
color: #a0ff4b;
font-family: Arial, sans-serif;
padding: 10px 12px;
padding: 8px 12px;
text-shadow: #666 1px 1px 1px;
}
div.downloadbox a.main span {

13
web/html/license.html
View File

@ -26,14 +26,17 @@
<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">
@ -50,7 +53,7 @@
<pre class="license">
OpenRocket - A model rocket simulator
Copyright (C) 2007-2009 Sampo Niskanen
Copyright (C) 2007-2011 Sampo Niskanen
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
@ -749,14 +752,6 @@ Public License instead of this License. But first, please read
&lt;http://www.gnu.org/philosophy/why-not-lgpl.html&gt;.
</pre>
<hr/>
<div class="t"></div>
<div class="r"></div>
<div class="b"></div>
<div class="l"></div>
<div class="tr"></div>
<div class="tl"></div>
<div class="br"></div>
<div class="bl"></div>
</div>
<div class="valid">
<p><a href="http://validator.w3.org/check/referer"><img src="valid-xhtml10.png" alt="Valid XHTML 1.0!" /></a>

11
web/html/report.html
View File

@ -26,14 +26,17 @@
<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">
@ -89,14 +92,6 @@
enhancement request. Please send multiple enhancements as
individual items.</li>
</ul>
<div class="t"></div>
<div class="r"></div>
<div class="b"></div>
<div class="l"></div>
<div class="tr"></div>
<div class="tl"></div>
<div class="br"></div>
<div class="bl"></div>
</div>
<div class="valid">
<p><a href="http://validator.w3.org/check/referer"><img src="valid-xhtml10.png" alt="Valid XHTML 1.0!" /></a>

3
web/htp/body.htt
View File

@ -27,14 +27,17 @@
<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">

4
web/htp/contact.htp
View File

@ -63,8 +63,8 @@
<p><strong><em>Support requests</em></strong> should be sent to
the <a href="http://apps.sourceforge.net/phpbb/openrocket/">support
forums</a>.<br/>
<strong><em>Bug reports and feature requests</em></strong> should
be <a href="report.html">reported separately</a>.</p>
<!-- <strong><em>Bug reports and feature requests</em></strong> should
be <a href="report.html">reported separately</a>.</p> -->
<p><strong>Email:</strong> &nbsp;&nbsp;
<em>sam<span>po</span>.<span>niskanen</span><span>@i</span>ki.fi</em></p>

1
web/htp/getinvolved.htp
View File

@ -88,6 +88,7 @@
<h3 id="other">Other</h3>
<ul>
<li><a href="http://openrocket.trans.free.fr/">Translating OpenRocket</a> to your language</li>
<li>Creating good and interesting example designs that
demonstrate some OpenRocket features.</li>
<li>Hosting a place to share rocket designs with other

8
web/htp/htp.def
View File

@ -20,14 +20,6 @@
</def>
<def name="contentbox">
<div class="t"></div>
<div class="r"></div>
<div class="b"></div>
<div class="l"></div>
<div class="tr"></div>
<div class="tl"></div>
<div class="br"></div>
<div class="bl"></div>
</def>

16
web/htp/index.htp
View File

@ -25,15 +25,21 @@
</div>
<p><strong>OpenRocket</strong> is an free, fully featured model
rocket simulator that allows you to design and simulate your
rockets before actually building and flying them.</p>
<p>OpenRocket features a full six-degree-of-freedom simulation,
realistic wind modeling, a multitude of different components
including free-form fins and canted fins, automatic design
optimization, clustering and staging. Read more about its <a
<p>The main features include:</p>
<ul>
<li>Six-degree-of-freedom flight simulation</li>
<li>Automatic design optimization</li>
<li>Realtime simulated altitude, velocity and acceleration display</li>
<li>Staging and clustering support</li>
<li>Cross-platform (Java-based)</li>
</ul>
<p>Read more about its <a
href="features.html">features and see screenshots</a>.
</p>
<p>OpenRocket is an Open Source project licensed under the

2
web/htp/license.htp
View File

@ -16,7 +16,7 @@
<pre class="license">
OpenRocket - A model rocket simulator
Copyright (C) 2007-2009 Sampo Niskanen
Copyright (C) 2007-2011 Sampo Niskanen
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