From df20ffb3ec484df06f1ae5621e44d2be9dfd005d Mon Sep 17 00:00:00 2001 From: plaa Date: Fri, 10 Jun 2011 16:56:16 +0000 Subject: [PATCH] version 1.1.5 git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@125 180e2498-e6e9-4542-8430-84ac67f01cd8 --- ChangeLog | 12 ++++++++++ LICENSE.TXT | 2 +- ReleaseNotes | 8 +++++++ build.properties | 2 +- .../openrocket/gui/dialogs/AboutDialog.java | 23 ++++++++++++++++++- .../gui/dialogs/PrintSettingsDialog.java | 2 ++ .../TestExceptionSuppressingTranslator.java | 2 +- web/html/actions/updates.php | 7 ++++-- web/html/download.html | 14 +++++++---- web/html/index.html | 10 +++++--- web/htp/htp.def | 2 +- web/htp/news.htp | 6 +++++ 12 files changed, 75 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4bf0362d..78c5cf60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/LICENSE.TXT b/LICENSE.TXT index 4a6a4ce6..61a98f5a 100644 --- a/LICENSE.TXT +++ b/LICENSE.TXT @@ -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 diff --git a/ReleaseNotes b/ReleaseNotes index ec48cb91..c05aa498 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -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): ------------------------------- diff --git a/build.properties b/build.properties index 0941eb1b..75d86c9f 100644 --- a/build.properties +++ b/build.properties @@ -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 diff --git a/src/net/sf/openrocket/gui/dialogs/AboutDialog.java b/src/net/sf/openrocket/gui/dialogs/AboutDialog.java index 69146435..6b8ec1ec 100644 --- a/src/net/sf/openrocket/gui/dialogs/AboutDialog.java +++ b/src/net/sf/openrocket/gui/dialogs/AboutDialog.java @@ -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 = "
" + + "OpenRocket has been developed by:

" + + "Sampo Niskanen (main developer)
" + + "Doug Pedrick (RockSim file format, printing)

" + + "OpenRocket utilizes the following libraries:

" + + "MiG Layout (http://www.miglayout.com/)
" + + "JFreeChart (http://www.jfree.org/jfreechart/)
" + + "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 diff --git a/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java b/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java index 66286ab2..8020bf48 100644 --- a/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java +++ b/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java @@ -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"); diff --git a/test/net/sf/openrocket/l10n/TestExceptionSuppressingTranslator.java b/test/net/sf/openrocket/l10n/TestExceptionSuppressingTranslator.java index 62a1ca7c..719ee39c 100644 --- a/test/net/sf/openrocket/l10n/TestExceptionSuppressingTranslator.java +++ b/test/net/sf/openrocket/l10n/TestExceptionSuppressingTranslator.java @@ -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); } diff --git a/web/html/actions/updates.php b/web/html/actions/updates.php index 0fc0577d..6bede2f4 100644 --- a/web/html/actions/updates.php +++ b/web/html/actions/updates.php @@ -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"; diff --git a/web/html/download.html b/web/html/download.html index c4f1ba9e..e116453c 100644 --- a/web/html/download.html +++ b/web/html/download.html @@ -45,6 +45,10 @@

Recent news:

+

10.6.2011: Version 1.1.5 is + released!

+

This release includes updates to the printing system which fixes + printing on Windows.

5.3.2011: Version 1.1.4 is released!

This release includes initial printing support, thanks to Doug @@ -87,13 +91,13 @@ Support This Project

- + Download now! - OpenRocket-1.1.4.jar + OpenRocket-1.1.5.jar - Release notes | - Source code + Release notes | + Source code

Stable release

@@ -110,7 +114,7 @@ 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.4.jar

+ java -jar OpenRocket-1.1.5.jar

diff --git a/web/html/index.html b/web/html/index.html index 9200573e..5041a2cd 100644 --- a/web/html/index.html +++ b/web/html/index.html @@ -46,12 +46,12 @@

Introduction

- + Download now! - OpenRocket-1.1.4.jar + OpenRocket-1.1.5.jar - Release notes | + Release notes | Other versions
@@ -88,6 +88,10 @@

News

+

10.6.2011: Version 1.1.5 is + released!

+

This release includes updates to the printing system which fixes + printing on Windows.

5.3.2011: Version 1.1.4 is released!

This release includes initial printing support, thanks to Doug diff --git a/web/htp/htp.def b/web/htp/htp.def index 59f4a572..b9bf0f6b 100644 --- a/web/htp/htp.def +++ b/web/htp/htp.def @@ -1,5 +1,5 @@ - + diff --git a/web/htp/news.htp b/web/htp/news.htp index c718b532..093d6bd1 100644 --- a/web/htp/news.htp +++ b/web/htp/news.htp @@ -9,6 +9,12 @@ +

10.6.2011: Version 1.1.5 is + released!

+ +

This release includes updates to the printing system which fixes + printing on Windows.

+

5.3.2011: Version 1.1.4 is released!

-- 2.47.2