diff --git a/core/resources-src/pix/splashscreen-1.3.xcf.gz b/core/resources-src/pix/splashscreen-1.3.xcf.gz new file mode 100644 index 000000000..a8f627907 Binary files /dev/null and b/core/resources-src/pix/splashscreen-1.3.xcf.gz differ diff --git a/core/resources/build.properties b/core/resources/build.properties index c60093916..e5ad7f254 100644 --- a/core/resources/build.properties +++ b/core/resources/build.properties @@ -2,6 +2,9 @@ # The OpenRocket build version build.version=20-11-alpha-16 +# The copyright year for the build. Displayed in the about dialog. +# Will show as Copyright 2013-${build.copyright} +build.copyright=2021 # The source of the package. When building a package for a specific # distribution (Debian, Fedora etc.), this should be changed appropriately! @@ -12,4 +15,4 @@ build.source=default # Whether checking for updates is enabled by default. -build.checkupdates=true +build.checkupdates=false diff --git a/core/resources/pix/splashscreen.png b/core/resources/pix/splashscreen.png index a13c545b5..0909a8758 100644 Binary files a/core/resources/pix/splashscreen.png and b/core/resources/pix/splashscreen.png differ diff --git a/core/src/net/sf/openrocket/util/BuildProperties.java b/core/src/net/sf/openrocket/util/BuildProperties.java index 9e88e93ea..870d9001c 100644 --- a/core/src/net/sf/openrocket/util/BuildProperties.java +++ b/core/src/net/sf/openrocket/util/BuildProperties.java @@ -9,6 +9,7 @@ public class BuildProperties { private static final Properties PROPERTIES; private static final String BUILD_VERSION; + private static final String BUILD_COPYRIGHT; private static final String BUILD_SOURCE; private static final boolean DEFAULT_CHECK_UPDATES; @@ -30,6 +31,10 @@ public class BuildProperties { return DEFAULT_CHECK_UPDATES; } + public static String getCopyrightYear() { + return BUILD_COPYRIGHT; + } + static { try { InputStream is = BuildProperties.class.getClassLoader().getResourceAsStream("build.properties"); @@ -65,6 +70,8 @@ public class BuildProperties { else DEFAULT_CHECK_UPDATES = true; + BUILD_COPYRIGHT = PROPERTIES.getProperty("build.copyright", "2021"); + } catch (IOException e) { throw new MissingResourceException( "Error reading build.properties", diff --git a/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java index 536ac9ad0..76db28f22 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java @@ -24,7 +24,7 @@ import net.sf.openrocket.util.Chars; @SuppressWarnings("serial") public class AboutDialog extends JDialog { - public static final String OPENROCKET_URL = "http://openrocket.sourceforge.net/"; + public static final String OPENROCKET_URL = "http://openrocket.info/"; private static final Translator trans = Application.getTranslator(); private static final String CREDITS = "
" + @@ -35,15 +35,21 @@ public class AboutDialog extends JDialog { "Bill Kuker (3D visualization)
" + "Boris du Reau (internationalization, translation lead)
" + "Richard Graham (geodetic computations)
" + - "Jason Blood (finset import)

" + + "Jason Blood (finset import)
" + + "Daniel Williams (pod support, maintainer)
" + + "Joe Pfeiffer (maintainer)
" + + "Billy Olsen (maintainer)
" + + "Neil Weinstock (tester, forum support)
" + + "H. Craig Miller (tester)

" + "Translations by:

" + "Tripoli France (French)
" + "Stefan Lobas / ERIG e.V. (German)
" + "Tripoli Spain (Spanish)
" + "Sky Dart Team (Russian)
" + - "Mauro Biasutti (Italian)

" + - "Vladimir Beran (Czech)

" + - "Polish Rocketry Society / \u0141ukasz & Alex kazanski (Polish)

" + + "Mauro Biasutti (Italian)
" + + "Vladimir Beran (Czech)
" + + "Polish Rocketry Society / \u0141ukasz & Alex Kazanski (Polish)

" + + "See all contributors at
https://github.com/openrocket/openrocket/graphs/contributors

" + "OpenRocket utilizes the following libraries:

" + "MiG Layout (http://www.miglayout.com/)
" + "JFreeChart (http://www.jfree.org/jfreechart/)
" + @@ -51,11 +57,11 @@ public class AboutDialog extends JDialog { "exp4j (http://projects.congrace.de/exp4j/index.html)
" + "JOGL (http://jogamp.org/jogl/www/)"; - public AboutDialog(JFrame parent) { super(parent, true); final String version = BuildProperties.getVersion(); + final String copyrightYear = BuildProperties.getCopyrightYear(); JPanel panel = new JPanel(new MigLayout("fill")); JPanel sub; @@ -70,7 +76,8 @@ public class AboutDialog extends JDialog { sub.add(new StyledLabel("OpenRocket", 20), "ax 50%, growy, wrap para"); sub.add(new StyledLabel(trans.get("lbl.version").trim() + " " + version, 3), "ax 50%, growy, wrap rel"); - sub.add(new StyledLabel("Copyright " + Chars.COPY + " 2007-2013 Sampo Niskanen and others"), "ax 50%, growy, wrap para"); + String copyright = String.format("Copyright %c 2007-%s Sampo Niskanen and others", Chars.COPY, copyrightYear); + sub.add(new StyledLabel(copyright), "ax 50%, growy, wrap para"); sub.add(new URLLabel(OPENROCKET_URL), "ax 50%, growy, wrap para"); panel.add(sub, "grow"); @@ -131,5 +138,4 @@ public class AboutDialog extends JDialog { GUIUtil.setDisposableDialogOptions(this, close); } - }