X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=abe1fadaeb8c9c6c3b1959a9ae706791e1d4c159;hb=02e5c6fb4edb3ae638e45cff1aad056682083c36;hp=b38a5a2c9d293762b96428bda5a5b23b53f2c40d;hpb=132fa48b35a4821ca0d8e241ba27989e573e61e5;p=jalview.git

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index b38a5a2..abe1fad 100644
--- 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)";
 
@@ -390,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()
     {
@@ -409,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();
@@ -959,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);
     }
   }
@@ -1166,12 +1192,12 @@ public class Desktop extends jalview.jbgui.GDesktop
     panel.add(label);
 
     /*
-     * the URL to fetch is
+     * the URL to fetch is input in
      * Java: an editable combobox with history
      * 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);
@@ -1209,8 +1235,8 @@ public class Desktop extends jalview.jbgui.GDesktop
         @SuppressWarnings("unchecked")
         String url = (history instanceof JTextField
                 ? ((JTextField) history).getText()
-                : ((JComboBox<String>) history).getSelectedItem()
-                        .toString());
+                : ((JComboBox<String>) history).getEditor().getItem()
+                        .toString().trim());
 
         if (url.toLowerCase().endsWith(".jar"))
         {
@@ -1365,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"))
@@ -1394,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)
       {
@@ -1405,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();
   }
 
@@ -1418,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
       /**