From 1ae6a845d5d93bcfb2747b5e419d057d6e1c0ae3 Mon Sep 17 00:00:00 2001 From: JoePfeiffer Date: Fri, 4 Feb 2022 10:50:49 -0700 Subject: [PATCH] Add CommonMark library, and components and thrustcurve databases, to About dialog Convert all URLs in About dialog to hyperlinks --- .../openrocket/gui/dialogs/AboutDialog.java | 89 +++++++++++-------- 1 file changed, 51 insertions(+), 38 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java index 8fcdd4767..eec03049b 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java @@ -25,45 +25,58 @@ import net.sf.openrocket.gui.widgets.SelectColorButton; @SuppressWarnings("serial") public class AboutDialog extends JDialog { - public static final String OPENROCKET_URL = "http://openrocket.info/"; - private static final Translator trans = Application.getTranslator(); + public final String OPENROCKET_URL = "http://openrocket.info/"; + + private final Translator trans = Application.getTranslator(); - private static final String CREDITS = "
" + - "OpenRocket has been developed by:

" + - "Sampo Niskanen (main developer)
" + - "Doug Pedrick (RockSim file format, printing)
" + - "Kevin Ruland (Android version)
" + - "Bill Kuker (3D visualization)
" + - "Boris du Reau (internationalization, translation lead)
" + - "Richard Graham (geodetic computations)
" + - "Jason Blood (finset import)
" + - "Daniel Williams (pod support, maintainer)
" + - "Joe Pfeiffer (maintainer)
" + - "Billy Olsen (maintainer)
" + - "Neil Weinstock (tester, icons, 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)
" + - "Sibo Van Gool (Dutch)

" + - "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/)
" + - "iText (http://www.itextpdf.com/)
" + - "exp4j (http://projects.congrace.de/exp4j/index.html)
" + - "JOGL (http://jogamp.org/jogl/www/)
" + - "Guava (https://github.com/google/guava)
" + - "Opencsv (http://opencsv.sourceforge.net/)
" + - "Simple Logging Facade for Java (http://www.slf4j.org/)

" + - "OpenRocket gratefully acknowledges our use of the following databases:

" + - "Rocket Motor Data (https://www.thrustcurve.org/)
" + - "Enhanced components database for OpenRocket (https://github.com/dbcook/openrocket-database/"; + private final String CREDITS = "
" + + "OpenRocket has been developed by:
" + + "
" + + "Sampo Niskanen (main developer)
" + + "Doug Pedrick (RockSim file format, printing)
" + + "Kevin Ruland (Android version)
" + + "Bill Kuker (3D visualization)
" + + "Boris du Reau (internationalization, translation lead)
" + + "Richard Graham (geodetic computations)
" + + "Jason Blood (finset import)
" + + "Daniel Williams (pod support, maintainer)
" + + "Joe Pfeiffer (maintainer)
" + + "Billy Olsen (maintainer)
" + + "Neil Weinstock (tester, icons, 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)
" + + "Sibo Van Gool (Dutch)
" + + "
" + + "See all contributors at
" + + href("https://github.com/openrocket/openrocket/graphs/contributors") + "
" + + "
" + + "OpenRocket utilizes the following libraries:
" + + "
" + + "MiG Layout (" + href("http://www.miglayout.com/") + ")
" + + "JFreeChart (" + href("http://www.jfree.org/jfreechart/") + ")
" + + "iText (" + href("http://www.itextpdf.com/") + ")
" + + "exp4j (" + href("http://projects.congrace.de/exp4j/index.html") + ")
" + + "JOGL (" + href("http://jogamp.org/jogl/www/") + ")
" + + "Guava (" + href("https://github.com/google/guava") + ")
" + + "Opencsv (" + href("http://opencsv.sourceforge.net/") + ")
" + + "Simple Logging Facade for Java (" + href("http://www.slf4j.org/") + ")
" + + "Java library for parsing and rendering CommonMark (" + href("https://github.com/commonmark/commonmark-java") + ")
" + + "
" + + "OpenRocket gratefully acknowledges our use of the following databases:
" + + "
" + + "Rocket Motor Data (" + href("https://www.thrustcurve.org/") + ")
" + + "Enhanced components database for OpenRocket" + href("https://github.com/dbcook/openrocket-database/") + ")
"; + + private String href(String url) { + return "" + url + ""; + } public AboutDialog(JFrame parent) { super(parent, true);