X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplashScreen.java;h=6edab5da5d6310d4353b11b531c522ec520c6475;hb=dc1ac2540d464c799ad67102cbddc77cf60c72be;hp=a5199ab913865f3f1dc1c4990051d8c7db45f337;hpb=f0c4c7517ae29233a1afbfefdb1a104917f996ee;p=jalview.git

diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java
index a5199ab..6edab5d 100755
--- a/src/jalview/gui/SplashScreen.java
+++ b/src/jalview/gui/SplashScreen.java
@@ -1,51 +1,79 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2005 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
 package jalview.gui;
 
-import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
+import javax.swing.*;
 
-public class SplashScreen extends JPanel implements Runnable
+public class SplashScreen
+    extends JPanel implements Runnable
 {
   boolean visible = true;
   JInternalFrame iframe;
   Image image;
+  int fontSize = 11;
+  int yoffset = 30;
 
   public SplashScreen(JInternalFrame iframe, Image i)
   {
     this.iframe = iframe;
     image = i;
+
     Thread t = new Thread(this);
     t.start();
     addMouseListener(new MouseAdapter()
-    { public void mousePressed(MouseEvent evt)
+    {
+      public void mousePressed(MouseEvent evt)
       {
         try
-        {   closeSplash();  }
+        {
+          closeSplash();
+        }
         catch (Exception ex)
-        {}
+        {
+        }
       }
-      });
+    });
   }
 
-
   public void run()
   {
-    long startTime =  System.currentTimeMillis()/1000;
+    long startTime = System.currentTimeMillis() / 1000;
 
-    while( visible )
+    while (visible)
     {
-      if( System.currentTimeMillis()/1000 - startTime > 8)
+      if ( ( (System.currentTimeMillis() / 1000) - startTime) > 5)
+      {
         visible = false;
+      }
 
-      try{
-        Thread.sleep(400);
-        iframe.setSelected(true);
+      try
+      {
+        Thread.sleep(1000);
+      }
+      catch (Exception ex)
+      {
       }
-      catch(Exception ex){}
     }
 
     closeSplash();
-
   }
 
   public void closeSplash()
@@ -55,26 +83,36 @@ public class SplashScreen extends JPanel implements Runnable
       iframe.setClosed(true);
     }
     catch (Exception ex)
-    {}
-
+    {
+    }
   }
 
-
   public void paintComponent(Graphics g)
   {
     g.setColor(Color.white);
-    g.fillRect(0,0,getWidth(),getHeight());
+    g.fillRect(0, 0, getWidth(), getHeight());
     g.setColor(Color.black);
-    g.setFont( new Font("Verdana", Font.BOLD, 18));
-    if(image!=null)
-    g.drawImage(image, 5,60,this);
-    g.drawString("JalView 2005", 50,50);
-    g.setFont( new Font("Verdana", Font.BOLD, 14));
-    g.drawString("Authors: Michele Clamp, James Cuff, Steve Searle, Andrew Waterhouse, Jim Procter & Geoff Barton.",50,70);
-    g.drawString("Current development managed by Andrew Waterhouse; Barton Group, University of Dundee.",50,90);
-    g.drawString("If  you use JalView, please cite:",50,110);
-    g.drawString("\"Clamp, M., Cuff, J., Searle, S. M. and Barton, G. J. (2004), The Jalview Java Alignment Editor\"",50,130);
+    g.setFont(new Font("Verdana", Font.BOLD, fontSize + 6));
 
-  }
+    if (image != null)
+    {
+      g.drawImage(image, 5, yoffset + 12, this);
+    }
 
+    g.drawString("JalView 2005 ", 50, yoffset);
+    g.setFont(new Font("Verdana", Font.BOLD, fontSize + 2));
+    g.drawString("Version " + jalview.bin.Cache.VERSION +
+                 "; Last updated: " + jalview.bin.Cache.BUILD_DATE, 180,
+                 yoffset);
+    g.setFont(new Font("Verdana", Font.BOLD, fontSize));
+    g.drawString("Authors: Michele Clamp, James Cuff, Steve Searle, Andrew Waterhouse, Jim Procter & Geoff Barton.",
+                 50, yoffset + 20);
+    g.drawString("Current development managed by Andrew Waterhouse; Barton Group, University of Dundee.",
+                 50, yoffset + 24 + fontSize);
+    g.drawString("If  you use JalView, please cite: Clamp, M., Cuff, J., Searle, S. M. and Barton, G. J. (2004),",
+                 50, yoffset + 28 + (fontSize * 2));
+    g.drawString(
+        "\"The Jalview Java Alignment Editor\" Bioinformatics,  2004 12;426-7.",
+        50, yoffset + 32 + (fontSize * 3));
+  }
 }