X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplashScreen.java;h=063a11cb24cdfc878700d0d59dd513fd2b1432fa;hb=7f7fc2e5533f7b00c86465f964e37c55bcf12fd7;hp=31b0d31598e0acd9e8dabd38bfd0fe185fad75ce;hpb=f2d10e204281911d5da924b7aa4cdb93102a4e24;p=jalview.git

diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java
index 31b0d31..063a11c 100755
--- a/src/jalview/gui/SplashScreen.java
+++ b/src/jalview/gui/SplashScreen.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -101,7 +101,6 @@ public class SplashScreen extends JPanel implements Runnable
         try
         {
             iframe.setClosed(true);
-            iframe=null;
         }
         catch (Exception ex)
         {
@@ -128,11 +127,13 @@ public class SplashScreen extends JPanel implements Runnable
 
         int y = yoffset;
 
-        g.drawString("JalView 2005 ", 50, y);
+        g.drawString("Jalview "+jalview.bin.Cache.getProperty("VERSION"), 50, y);
+
+        FontMetrics fm = g.getFontMetrics();
+        int vwidth = fm.stringWidth("Jalview "+jalview.bin.Cache.getProperty("VERSION"));
         g.setFont(new Font("Verdana", Font.BOLD, fontSize + 2));
-        g.drawString("Version " + jalview.bin.Cache.getProperty("VERSION") +
-                     "; Last updated: " + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown"),
-                     180, y);
+        g.drawString("Last updated: " + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown"),
+                     50 + vwidth +5, y);
 
         if (jalview.bin.Cache.getDefault("LATEST_VERSION", "Checking").equals("Checking"))
         {
@@ -146,7 +147,7 @@ public class SplashScreen extends JPanel implements Runnable
             jalview.bin.Cache.getProperty("VERSION")))
         {
           // Displayed when code version and jnlp version do not match
-
+          g.setColor(Color.red);
           g.drawString("!! Jalview version " +
                        jalview.bin.Cache.getDefault("LATEST_VERSION", "..Checking..")
                        + " is available for download from http://www.jalview.org !!",
@@ -162,7 +163,7 @@ public class SplashScreen extends JPanel implements Runnable
             50,  y+=fontSize+4);
         g.drawString("If  you use JalView, please cite: Clamp, M., Cuff, J., Searle, S. M. and Barton, G. J. (2004),",
             50, y+=fontSize+4);
-        g.drawString("\"The Jalview Java Alignment Editor\" Bioinformatics,  2004 12; 426-7.",
+        g.drawString("\"The Jalview Java Alignment Editor\" Bioinformatics,  2004 20; 426-7.",
             50, y+=fontSize+4);
     }
 }