X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=39c68a0eb2c283a46d6681a6613cbce575762d22;hb=04e2d97b71fad3d9d02abbe292ea1fa9ba6d1438;hp=2482dea62f18a67729c288f0aaee0ba187816d3c;hpb=58f6e2a689afae0b869f28f8874cd735f0cfd129;p=jalview.git

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 2482dea..39c68a0 100644
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -116,6 +116,7 @@ import jalview.project.Jalview2XML;
 import jalview.structure.StructureSelectionManager;
 import jalview.urls.IdOrgSettings;
 import jalview.util.BrowserLauncher;
+import jalview.util.ChannelProperties;
 import jalview.util.ImageMaker.TYPE;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
@@ -136,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)";
 
@@ -368,7 +392,8 @@ public class Desktop extends jalview.jbgui.GDesktop
     instance = this;
 
     doConfigureStructurePrefs();
-    setTitle("Jalview " + Cache.getProperty("VERSION"));
+    setTitle(ChannelProperties.getProperty("app_name") + " "
+            + Cache.getProperty("VERSION"));
     /*
     if (!Platform.isAMac())
     {
@@ -388,6 +413,7 @@ public class Desktop extends jalview.jbgui.GDesktop
       System.out.println("Error setting APQHandlers: " + t.toString());
       // t.printStackTrace();
     }
+    setIconImages(ChannelProperties.getIconList());
 
     addWindowListener(new WindowAdapter()
     {
@@ -407,6 +433,8 @@ public class Desktop extends jalview.jbgui.GDesktop
     showMemusage.setSelected(selmemusage);
     desktop.setBackground(Color.white);
 
+    this.setIconImages(ChannelProperties.getIconList());
+
     getContentPane().setLayout(new BorderLayout());
     // alternate config - have scrollbars - see notes in JAL-153
     // JScrollPane sp = new JScrollPane();
@@ -957,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);
     }
   }
@@ -1169,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);
@@ -1363,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"))
@@ -1392,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)
       {
@@ -1403,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();
   }
 
@@ -1416,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
       /**