]> git.gag.com Git - debian/openrocket/commitdiff
version 1.1.5
authorplaa <plaa@180e2498-e6e9-4542-8430-84ac67f01cd8>
Fri, 10 Jun 2011 16:56:16 +0000 (16:56 +0000)
committerplaa <plaa@180e2498-e6e9-4542-8430-84ac67f01cd8>
Fri, 10 Jun 2011 16:56:16 +0000 (16:56 +0000)
git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@125 180e2498-e6e9-4542-8430-84ac67f01cd8

12 files changed:
ChangeLog
LICENSE.TXT
ReleaseNotes
build.properties
src/net/sf/openrocket/gui/dialogs/AboutDialog.java
src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java
test/net/sf/openrocket/l10n/TestExceptionSuppressingTranslator.java
web/html/actions/updates.php
web/html/download.html
web/html/index.html
web/htp/htp.def
web/htp/news.htp

index 4bf0362ddf7ed564b7888df7e7a103e3aa9b0e72..78c5cf604971a1b68470f0c086d5c07be3b0931b 100644 (file)
--- 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
index 4a6a4ce628af7f55de068e44db346604564d5455..61a98f5aaafb6fb70792b78c3233674d3400b374 100644 (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
index ec48cb9184448cbfb4ac094eb7183f08a6eea0cf..c05aa498c905e8f9d6b8d2bd682ca81d248cd0b1 100644 (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):
 -------------------------------
 
index 0941eb1bb6c8b3e1d8eae60921f250522b414a00..75d86c9faa3cbe91b63280d0b31870a9bba78415 100644 (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
index 69146435eb9a94ef5f40d66d786ad7e5ce31d43f..6b8ec1ececf856c71442238a89e63d6f39c53b9b 100644 (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
index 66286ab2b14ce4b85f43d13cbd045c9756596b35..8020bf488e347d018ec2c4c77938fd9b2eae8d96 100644 (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");
index 62a1ca7c999a9da888761590e5ef72634f5b05d2..719ee39c8ef7fcf6cd72351b3351cfea844c299e 100644 (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);
        }
        
index 0fc0577d24e052fe0db766686f9d26ddec832960..6bede2f422ef7c58428442a1fe91731b75020f85 100644 (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";
index c4f1ba9ed461bebb154e43b69fbaaded427d304d..e116453c7e5d77ca270ad28412246e4af44baa42 100644 (file)
   <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
         <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>
        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>
index 9200573e91ec77ff9b47f895e6ce5c19c9421ef1..5041a2cdc4d5311591903bef96f94663704dbef9 100644 (file)
     <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>
     <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
index 59f4a572c3d428edfa737a89458ecaba2237b807..b9bf0f6bc12b0bd48fe3db876806424807133c6d 100644 (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">
index c718b532ee5290a5dc6a721d8585b5f00764eca9..093d6bd10d85e8e092b009a86f282ea7604a9f24 100644 (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>