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

Update Copyright information and Contributors

Browse Source 
Add a build.copyright property to build.properties to use in the about
dialog for the copyright year. Update splashscreen image to copyright
year 2021. Update contributor list and point to URL for all
contributors.

Fixes #814

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
This commit is contained in:
Billy Olsen 2020-12-19 19:29:24 -07:00 committed by Billy Olsen
parent 837014c7a0
commit 5fef01a2e0
5 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/resources-src/pix/splashscreen-1.3.xcf.gz Normal file
View File

Binary file not shown.

5
core/resources/build.properties
View File

@ -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

BIN
core/resources/pix/splashscreen.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 185 KiB

After

Width:  |  Height:  |  Size: 185 KiB

7
core/src/net/sf/openrocket/util/BuildProperties.java
View File

@ -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",

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

@ -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 = "<html><center>" +
@ -35,15 +35,21 @@ public class AboutDialog extends JDialog {
"Bill Kuker (3D visualization)<br>" +
"Boris du Reau (internationalization, translation lead)<br>" +
"Richard Graham (geodetic computations)<br>" +
"Jason Blood (finset import)<br><br>" +
"Jason Blood (finset import)<br>" +
"Daniel Williams (pod support, maintainer)<br>" +
"Joe Pfeiffer (maintainer)<br>" +
"Billy Olsen (maintainer)<br>" +
"Neil Weinstock (tester, forum support)<br>" +
"H. Craig Miller (tester)<br><br>" +
"<b>Translations by:</b><br><br>" +
"Tripoli France (French)<br>" +
"Stefan Lobas / ERIG e.V. (German)<br>" +
"Tripoli Spain (Spanish)<br>" +
"Sky Dart Team (Russian)<br>" +
"Mauro Biasutti (Italian)<br><br>" +
"Vladimir Beran (Czech)<br><br>" +
"Polish Rocketry Society / \u0141ukasz & Alex kazanski (Polish)<br><br>" +
"Mauro Biasutti (Italian)<br>" +
"Vladimir Beran (Czech)<br>" +
"Polish Rocketry Society / \u0141ukasz & Alex Kazanski (Polish)<br><br>" +
"See all contributors at <br>https://github.com/openrocket/openrocket/graphs/contributors<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>" +
@ -51,11 +57,11 @@ public class AboutDialog extends JDialog {
"exp4j (http://projects.congrace.de/exp4j/index.html)<br>" +
"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);
}
}