From: Jim Procter Date: Wed, 16 Feb 2022 16:34:56 +0000 (+0000) Subject: JAL-3837 GPL license on splashscreen (finally !) and added link to discourse.jalview... X-Git-Tag: Release_2_11_2_1~43^2~6 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ed971f2399ab7a032e29617387955fc907c5f1f5;p=jalview.git JAL-3837 GPL license on splashscreen (finally !) and added link to discourse.jalview.org to replace mailing list --- diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index ad36492..c713a94 100644 --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -140,24 +140,32 @@ import jalview.ws.utils.UrlDownloadClient; public class Desktop extends jalview.jbgui.GDesktop implements DropTargetListener, ClipboardOwner, IProgressIndicator, jalview.api.StructureSelectionManagerProvider { private static final String CITATION; - static { - URL bg_logo_url = ChannelProperties.getImageURL("bg_logo." + String.valueOf(SplashScreen.logoSize)); - URL uod_logo_url = ChannelProperties.getImageURL("uod_banner." + String.valueOf(SplashScreen.logoSize)); + static + { + URL bg_logo_url = ChannelProperties.getImageURL( + "bg_logo." + String.valueOf(SplashScreen.logoSize)); + URL uod_logo_url = ChannelProperties.getImageURL( + "uod_banner." + String.valueOf(SplashScreen.logoSize)); boolean logo = (bg_logo_url != null || uod_logo_url != null); StringBuilder sb = new StringBuilder(); - sb.append("

Development managed by The Barton Group, University of Dundee, Scotland, UK."); - if (logo) { + sb.append( + "

Jalview is free software released under GPLv3.

Development is managed by The Barton Group, University of Dundee, Scotland, UK."); + if (logo) + { sb.append("
"); } - sb.append(bg_logo_url == null ? "" : "\"Barton"); + sb.append(bg_logo_url == null ? "" + : "\"Barton"); sb.append(uod_logo_url == null ? "" - : " \"University"); + : " \"University"); sb.append( - "

For help, see the FAQ at www.jalview.org/faq and/or join the jalview-discuss@jalview.org mailing list"); + "

For help, see www.jalview.org/faq and join discourse.jalview.org"); sb.append("

If you use Jalview, please cite:" - + "
Waterhouse, A.M., Procter, J.B., Martin, D.M.A, Clamp, M. and Barton, G. J. (2009)" - + "
Jalview Version 2 - a multiple sequence alignment editor and analysis workbench" - + "
Bioinformatics doi: 10.1093/bioinformatics/btp033"); + + "
Waterhouse, A.M., Procter, J.B., Martin, D.M.A, Clamp, M. and Barton, G. J. (2009)" + + "
Jalview Version 2 - a multiple sequence alignment editor and analysis workbench" + + "
Bioinformatics doi: 10.1093/bioinformatics/btp033"); CITATION = sb.toString(); } diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java index 97de08a..61273c7 100755 --- a/src/jalview/gui/SplashScreen.java +++ b/src/jalview/gui/SplashScreen.java @@ -267,7 +267,7 @@ public class SplashScreen extends JPanel splashText.setVisible(true); splashText.setSize(new Dimension(750, - 375 + logoSize + (Platform.isJS() ? 40 : 0))); + 425 + logoSize + (Platform.isJS() ? 40 : 0))); splashText.setBackground(bg); splashText.setForeground(fg); splashText.setFont(font);