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

version 1.1.5

Browse Source
This commit is contained in:
Sampo Niskanen 2011-06-10 16:56:16 +00:00
parent a61f50113a
commit 69619e3d15
12 changed files with 75 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2011-06-10 Sampo Niskanen
* Released version 1.1.5
2011-05-16 Sampo Niskanen
* Updated about dialog
2011-04-15 Sampo Niskanen
* Removed native printing support
2011-03-05 Sampo Niskanen
* Released version 1.1.4

2
LICENSE.TXT
View File

@ -1,6 +1,6 @@
OpenRocket - A model rocket simulator
Copyright (C) 2007-2010 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

8
ReleaseNotes
View File

@ -1,3 +1,11 @@
OpenRocket 1.1.5 (2011-06-10):
-------------------------------
Removed native printing support. Printing is now handled via PDF
viewer, which should make printing much more reliable and less
bug-prone.
OpenRocket 1.1.4 (2011-03-05):
-------------------------------

2
build.properties
View File

@ -1,7 +1,7 @@
# The OpenRocket build version
build.version=1.1.5pre
build.version=1.1.5
# The source of the package. When building a package for a specific

23
src/net/sf/openrocket/gui/dialogs/AboutDialog.java
View File

@ -10,6 +10,7 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import net.miginfocom.swing.MigLayout;
import net.sf.openrocket.gui.components.DescriptionArea;
import net.sf.openrocket.gui.components.StyledLabel;
import net.sf.openrocket.gui.components.URLLabel;
import net.sf.openrocket.util.Chars;
@ -21,6 +22,15 @@ public class AboutDialog extends JDialog {
public static final String OPENROCKET_URL = "http://openrocket.sourceforge.net/";
private static final String CREDITS = "<html><center>" +
"<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><br>" +
"<b>OpenRocket utilizes the following libraries:</b><br><br>" +
"MiG Layout (http://www.miglayout.com/)<br>" +
"JFreeChart (http://www.jfree.org/jfreechart/)<br>" +
"iText (http://www.itextpdf.com/)";
public AboutDialog(JFrame parent) {
super(parent, true);
@ -30,7 +40,7 @@ public class AboutDialog extends JDialog {
JPanel panel = new JPanel(new MigLayout("fill"));
panel.add(new JLabel(Icons.loadImageIcon("pix/icon/icon-about.png", "OpenRocket")),
"spany 5, top");
"spany 4, top");
panel.add(new StyledLabel("OpenRocket", 20), "ax 50%, growy, wrap para");
panel.add(new StyledLabel("Version " + version, 3), "ax 50%, growy, wrap rel");
@ -49,6 +59,17 @@ public class AboutDialog extends JDialog {
panel.add(new URLLabel(OPENROCKET_URL), "ax 50%, growy, wrap para");
DescriptionArea info = new DescriptionArea(5);
info.setText(CREDITS);
panel.add(info, "width 10px, height 100lp, grow, spanx, wrap para");
// JTextArea area = new JTextArea(CREATORS);
// area.setEditable(false);
// area.setLineWrap(true);
// area.setWrapStyleWord(true);
// panel.add(new JScrollPane(area), "width 10px, height 100lp, grow, spanx, wrap para");
JButton close = new JButton("Close");
close.addActionListener(new ActionListener() {
@Override

2
src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java
View File

@ -89,6 +89,8 @@ public class PrintSettingsDialog extends JDialog {
log.user("Resetting print setting values to defaults");
PrintSettings defaults = new PrintSettings();
settings.loadFrom(defaults);
fillColorButton.setSelectedColor(settings.getTemplateFillColor());
borderColorButton.setSelectedColor(settings.getTemplateBorderColor());
}
});
panel.add(button, "spanx, split, right");

2
test/net/sf/openrocket/l10n/TestExceptionSuppressingTranslator.java
View File

@ -56,7 +56,7 @@ public class TestExceptionSuppressingTranslator {
assertEquals(1, ExceptionSuppressingTranslator.failures);
// Test failure with other key
assertEquals("fake.key2", est.get("fake.key"));
assertEquals("fake.key2", est.get("fake.key2"));
assertEquals(2, ExceptionSuppressingTranslator.failures);
}

7
web/html/actions/updates.php
View File

@ -80,10 +80,13 @@ header("Content-type: text/plain");
$version = $_GET["version"];
$updates = "";
$unstable = "1.1.4";
$unstable = "1.1.5";
$stable = "1.0.0";
if (preg_match("/^1\.1\.3/", $version)) {
if (preg_match("/^1\.1\.4/", $version)) {
$updates = "Version: " . $unstable . "\n" .
"5: Fixes to printing system";
} else if (preg_match("/^1\.1\.3/", $version)) {
$updates = "Version: " . $unstable . "\n" .
"5: Initial printing support\n" .
"4: Bug fixes\n";

14
web/html/download.html
View File

@ -45,6 +45,10 @@
<div class="content">
<div class="news">
<h2>Recent news:</h2>
<p><span class="date">10.6.2011:</span> Version 1.1.5 is
<a href="download.html">released</a>!</p>
<p>This release includes updates to the printing system which fixes
printing on Windows.</p>
<p><span class="date">5.3.2011:</span> Version 1.1.4 is
<a href="download.html">released</a>!</p>
<p>This release includes initial printing support, thanks to Doug
@ -87,13 +91,13 @@
<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.4/OpenRocket-1.1.4.jar/download">
<a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.5/OpenRocket-1.1.5.jar/download">
<strong>Download now!</strong>
<span>OpenRocket-1.1.4.jar</span>
<span>OpenRocket-1.1.5.jar</span>
</a>
<span class="alternative">
<a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.4/ReleaseNotes/view">Release notes</a> |
<a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.4/OpenRocket-1.1.4-src.zip/download">Source code</a>
<a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.5/ReleaseNotes/view">Release notes</a> |
<a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.5/OpenRocket-1.1.5-src.zip/download">Source code</a>
</span>
</div>
<h3>Stable release</h3>
@ -110,7 +114,7 @@
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.4.jar</span></p>
<span class="command">java -jar OpenRocket-1.1.5.jar</span></p>
</div>
<div class="clear"></div>

10
web/html/index.html
View File

@ -46,12 +46,12 @@
<h2>Introduction</h2>
<div class="rightpane">
<div class="downloadbox">
<a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.4/OpenRocket-1.1.4.jar/download">
<a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.5/OpenRocket-1.1.5.jar/download">
<strong>Download now!</strong>
<span>OpenRocket-1.1.4.jar</span>
<span>OpenRocket-1.1.5.jar</span>
</a>
<span class="alternative">
<a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.4/ReleaseNotes/view">Release notes</a> |
<a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.5/ReleaseNotes/view">Release notes</a> |
<a href="download.html">Other versions</a>
</span>
</div>
@ -88,6 +88,10 @@
<div class="clear"></div>
<div class="news">
<h2>News</h2>
<p><span class="date">10.6.2011:</span> Version 1.1.5 is
<a href="download.html">released</a>!</p>
<p>This release includes updates to the printing system which fixes
printing on Windows.</p>
<p><span class="date">5.3.2011:</span> Version 1.1.4 is
<a href="download.html">released</a>!</p>
<p>This release includes initial printing support, thanks to Doug

2
web/htp/htp.def
View File

@ -1,5 +1,5 @@
<set stableversion="1.0.0">
<set developmentversion="1.1.4">
<set developmentversion="1.1.5">
<set version="${developmentversion}">
<def name="downloadbox">

6
web/htp/news.htp
View File

@ -9,6 +9,12 @@
<!--- Remember to move the position of "onlyrecent" below! --->
<p><span class="date">10.6.2011:</span> Version 1.1.5 is
<a href="download.html">released</a>!</p>
<p>This release includes updates to the printing system which fixes
printing on Windows.</p>
<p><span class="date">5.3.2011:</span> Version 1.1.4 is
<a href="download.html">released</a>!</p>