JAL-3594 Images for splash screen

[jalview.git] / src / jalview / gui / Desktop.java

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 0f5a931..39c68a0 100644 (file)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -137,12 +137,35 @@ public class Desktop extends jalview.jbgui.GDesktop
         implements DropTargetListener, ClipboardOwner, IProgressIndicator,
         jalview.api.StructureSelectionManagerProvider
 {
-  private static final String CITATION = "<br><br>Development managed by The Barton Group, University of Dundee, Scotland, UK.<br>"
-          + "<br><br>For help, see the FAQ at <a href=\"http://www.jalview.org/faq\">www.jalview.org/faq</a> and/or join the jalview-discuss@jalview.org mailing list"
-          + "<br><br>If  you use Jalview, please cite:"
-          + "<br>Waterhouse, A.M., Procter, J.B., Martin, D.M.A, Clamp, M. and Barton, G. J. (2009)"
-          + "<br>Jalview Version 2 - a multiple sequence alignment editor and analysis workbench"
-          + "<br>Bioinformatics doi: 10.1093/bioinformatics/btp033";
+  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));
+    boolean logo = (bg_logo_url != null || uod_logo_url != null);
+    StringBuilder sb = new StringBuilder();
+    sb.append(
+            "<br><br>Development managed by The Barton Group, University of Dundee, Scotland, UK.");
+    if (logo)
+    {
+      sb.append("<br>");
+    }
+    sb.append(bg_logo_url == null ? ""
+            : "<img alt=\"Barton Group logo\" src=\""
+                    + bg_logo_url.toString() + "\">");
+    sb.append(uod_logo_url == null ? ""
+            : "&nbsp;<img alt=\"University of Dundee shield\" src=\""
+                    + uod_logo_url.toString() + "\">");
+    sb.append(
+            "<br><br>For help, see the FAQ at <a href=\"https://www.jalview.org/faq\">www.jalview.org/faq</a> and/or join the jalview-discuss@jalview.org mailing list");
+    sb.append("<br><br>If  you use Jalview, please cite:"
+            + "<br>Waterhouse, A.M., Procter, J.B., Martin, D.M.A, Clamp, M. and Barton, G. J. (2009)"
+            + "<br>Jalview Version 2 - a multiple sequence alignment editor and analysis workbench"
+            + "<br>Bioinformatics doi: 10.1093/bioinformatics/btp033");
+    CITATION = sb.toString();
+  }
 
   private static final String DEFAULT_AUTHORS = "The Jalview Authors (See AUTHORS file for current list)";
 
@@ -962,7 +985,7 @@ public class Desktop extends jalview.jbgui.GDesktop
     } catch (java.lang.ClassCastException cex)
     {
       Cache.log.warn(
-              "Squashed a possible GUI implementation error. If you can recreate this, please look at http://issues.jalview.org/browse/JAL-869",
+              "Squashed a possible GUI implementation error. If you can recreate this, please look at https://issues.jalview.org/browse/JAL-869",
               cex);
     }
   }
@@ -1174,7 +1197,7 @@ public class Desktop extends jalview.jbgui.GDesktop
      * JS: (pending JAL-3038) a plain text field
      */
     JComponent history;
-    String urlBase = "http://www.";
+    String urlBase = "https://www.";
     if (Platform.isJS())
     {
       history = new JTextField(urlBase, 35);
@@ -1368,7 +1391,8 @@ public class Desktop extends jalview.jbgui.GDesktop
   public String getAboutMessage()
   {
     StringBuilder message = new StringBuilder(1024);
-    message.append("<h1><strong>Version: ")
+    message.append("<div style=\"font-family: sans-serif;\">")
+            .append("<h1><strong>Version: ")
             .append(Cache.getProperty("VERSION")).append("</strong></h1>")
             .append("<strong>Built: <em>")
             .append(Cache.getDefault("BUILD_DATE", "unknown"))
@@ -1397,7 +1421,7 @@ public class Desktop extends jalview.jbgui.GDesktop
               .append(Cache.getDefault("LATEST_VERSION", "..Checking.."))
               .append(" is available for download from ")
               .append(Cache.getDefault("www.jalview.org",
-                      "http://www.jalview.org"))
+                      "https://www.jalview.org"))
               .append(" !!");
       if (red)
       {
@@ -1408,6 +1432,8 @@ public class Desktop extends jalview.jbgui.GDesktop
     message.append(Cache.getDefault("AUTHORFNAMES", DEFAULT_AUTHORS));
     message.append(CITATION);
 
+    message.append("</div>");
+
     return message.toString();
   }
 
@@ -1421,7 +1447,7 @@ public class Desktop extends jalview.jbgui.GDesktop
     {
       if (Platform.isJS())
       {
-        BrowserLauncher.openURL("http://www.jalview.org/help.html");
+        BrowserLauncher.openURL("https://www.jalview.org/help.html");
       }
       else
       /**