diff --git a/ChangeLog b/ChangeLog index b1435b8bb..3c2287c90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/pix-src/icon/flag-icon.png b/pix-src/icon/flag-icon.png new file mode 100644 index 000000000..cd34128c8 Binary files /dev/null and b/pix-src/icon/flag-icon.png differ diff --git a/pix-src/icon/flag-icon.xcf.gz b/pix-src/icon/flag-icon.xcf.gz new file mode 100644 index 000000000..7a92c1d15 Binary files /dev/null and b/pix-src/icon/flag-icon.xcf.gz differ diff --git a/src/net/sf/openrocket/util/GUIUtil.java b/src/net/sf/openrocket/util/GUIUtil.java index 831f2381a..d8aec3b0a 100644 --- a/src/net/sf/openrocket/util/GUIUtil.java +++ b/src/net/sf/openrocket/util/GUIUtil.java @@ -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) { diff --git a/web/html/contact.html b/web/html/contact.html index d8569532b..bd981e305 100644 --- a/web/html/contact.html +++ b/web/html/contact.html @@ -26,14 +26,17 @@
  • Download
  • Documentation
  • Wiki pages
    • +
  • Translations
  • Get involved!
  • Mailing lists
    Support forums
    Contact info
    • +
  • License

    • Valid XHTML 1.0! diff --git a/web/html/documentation.html b/web/html/documentation.html index 2ddaba523..ba061b5dc 100644 --- a/web/html/documentation.html +++ b/web/html/documentation.html @@ -26,14 +26,17 @@

  • Download
  • Documentation
  • Wiki pages
    • +
  • Translations
  • Get involved!
  • Mailing lists
    Support forums
    Contact info
    • +
  • License

    • Valid XHTML 1.0! diff --git a/web/html/download.html b/web/html/download.html index 1a4d8e149..5b7061504 100644 --- a/web/html/download.html +++ b/web/html/download.html @@ -26,14 +26,17 @@

  • Download
  • Documentation
  • Wiki pages
    • +
  • Translations
  • Get involved!
  • Mailing lists
    Support forums
    Contact info
    • +
  • License

    • Valid XHTML 1.0! diff --git a/web/html/features.html b/web/html/features.html index f8d4227f5..f774c0635 100644 --- a/web/html/features.html +++ b/web/html/features.html @@ -26,14 +26,17 @@

  • Download
  • Documentation
  • Wiki pages
    • +
  • Translations
  • Get involved!
  • Mailing lists
    Support forums
    Contact info
    • +
  • License

    • Valid XHTML 1.0! diff --git a/web/html/getinvolved.html b/web/html/getinvolved.html index 5cd8658ce..91023aed8 100644 --- a/web/html/getinvolved.html +++ b/web/html/getinvolved.html @@ -26,14 +26,17 @@

  • Download
  • Documentation
  • Wiki pages
    • +
  • Translations
  • Get involved!
  • Mailing lists
    Support forums
    Contact info
    • +
  • License

    • Valid XHTML 1.0! diff --git a/web/html/greenbox.png b/web/html/greenbox.png deleted file mode 100644 index d6c7d77cd..000000000 Binary files a/web/html/greenbox.png and /dev/null differ diff --git a/web/html/index.html b/web/html/index.html index 3aae0c83e..1d55d6509 100644 --- a/web/html/index.html +++ b/web/html/index.html @@ -26,14 +26,17 @@

  • Download
  • Documentation
  • Wiki pages
    • +
  • Translations
  • Get involved!
  • Mailing lists
    Support forums
    Contact info
    • +
  • License
    • -
    -
    -
    -
    -
    -
    -
    -

    Valid XHTML 1.0! diff --git a/web/html/layout.css b/web/html/layout.css index 9cf1d3796..356bdecc8 100644 --- a/web/html/layout.css +++ b/web/html/layout.css @@ -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 { diff --git a/web/html/license.html b/web/html/license.html index 73d9313af..daefe3da6 100644 --- a/web/html/license.html +++ b/web/html/license.html @@ -26,14 +26,17 @@

  • Download
  • Documentation
  • Wiki pages
    • +
  • Translations
  • Get involved!
  • Mailing lists
    Support forums
    Contact info
    • +
  • License

    • Valid XHTML 1.0! diff --git a/web/html/report.html b/web/html/report.html index c589ac06b..c9a12703b 100644 --- a/web/html/report.html +++ b/web/html/report.html @@ -26,14 +26,17 @@

  • Download
  • Documentation
  • Wiki pages
    • +
  • Translations
  • Get involved!
  • Mailing lists
    Support forums
    Contact info
    • +
  • License

    • Valid XHTML 1.0! diff --git a/web/htp/body.htt b/web/htp/body.htt index a5e186208..00649d575 100644 --- a/web/htp/body.htt +++ b/web/htp/body.htt @@ -27,14 +27,17 @@

  • Download
  • Documentation
  • Wiki pages
    • +
  • Translations
  • Get involved!
  • Mailing lists
    Support forums
    Contact info
    • +
  • License
    • -

    OpenRocket is an free, fully featured model rocket simulator that allows you to design and simulate your rockets before actually building and flying them.

    -

    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 The main features include:

    + +
      +
    • Six-degree-of-freedom flight simulation
      • +
    • Automatic design optimization
      • +
    • Realtime simulated altitude, velocity and acceleration display
      • +
    • Staging and clustering support
      • +
    • Cross-platform (Java-based)
      • +
    + +

    Read more about its features and see screenshots.

    OpenRocket is an Open Source project licensed under the diff --git a/web/htp/license.htp b/web/htp/license.htp index b9dc9f1e8..a2743f656 100644 --- a/web/htp/license.htp +++ b/web/htp/license.htp @@ -16,7 +16,7 @@ 

     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