X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplashScreen.java;h=063a11cb24cdfc878700d0d59dd513fd2b1432fa;hb=df9eac352d5fc1252e6377fec7cfc29fd841c932;hp=b73b99699260c65c573f144343159fc0a96774ad;hpb=309f2ebc93eb5aab5478279a3c40914f216f01a4;p=jalview.git diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java index b73b996..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 @@ -104,6 +104,7 @@ public class SplashScreen extends JPanel implements Runnable } catch (Exception ex) { + ex.printStackTrace(); } } @@ -126,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")) { @@ -145,7 +148,6 @@ public class SplashScreen extends JPanel implements Runnable { // 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 !!", @@ -161,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); } }