X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FSplashScreen.java;h=05f412f0b5781db6e37a381fb2bbc2c189bb57e4;hb=bc3a0b87ed9289352dc0f9c81d9c041522ebebe0;hp=31b0d31598e0acd9e8dabd38bfd0fe185fad75ce;hpb=f2d10e204281911d5da924b7aa4cdb93102a4e24;p=jalview.git diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java index 31b0d31..05f412f 100755 --- a/src/jalview/gui/SplashScreen.java +++ b/src/jalview/gui/SplashScreen.java @@ -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 !!",