From: jprocter Date: Wed, 4 Jul 2012 16:20:18 +0000 (+0100) Subject: JAL-1130 trial view of new logo on splashscreen. X-Git-Tag: Jalview_2_9~307^2~12 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=1a802c6cf08e703f6b722a91b1e7f58f76356476;p=jalview.git JAL-1130 trial view of new logo on splashscreen. --- diff --git a/resources/images/logo_v2.jpeg b/resources/images/logo_v2.jpeg new file mode 100644 index 0000000..a37600c Binary files /dev/null and b/resources/images/logo_v2.jpeg differ diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index 5388605..6018b28 100644 --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -1072,7 +1072,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements message.append(""); if (shortv) { - message.append("

Jalview " + message.append("

Version: " + jalview.bin.Cache.getProperty("VERSION") + "


"); message.append("Last Updated: " @@ -1083,7 +1083,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements else { - message.append("Jalview version " + message.append("Version " + jalview.bin.Cache.getProperty("VERSION") + "; last updated: " + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown")); @@ -1107,7 +1107,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements message.append("
"); } - message.append("
!! Jalview version " + message.append("
!! Version " + jalview.bin.Cache.getDefault("LATEST_VERSION", "..Checking..") + " is available for download from " @@ -1124,7 +1124,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements "AUTHORNAMES", "Jim Procter, Andrew Waterhouse, Jan Engelhardt, Lauren Lui, Michele Clamp, James Cuff, Steve Searle, David Martin & Geoff Barton") + "
Development managed by The Barton Group, University of Dundee, Scotland, UK.
" - + "
For help, see the FAQ at www.jalview.org and/or join the jalview-discuss@jalview.org mailing list" + + "
For help, see the FAQ at www.jalview.org and/or join the jalview-discuss@jalview.org mailing list" + "
If you use Jalview, please cite:" + "
Waterhouse, A.M., Procter, J.B., Martin, D.M.A, Clamp, M. and Barton, G. J. (2009)" + "
Jalview Version 2 - a multiple sequence alignment editor and analysis workbench" diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java index 32c6aac..b0be269 100755 --- a/src/jalview/gui/SplashScreen.java +++ b/src/jalview/gui/SplashScreen.java @@ -76,7 +76,7 @@ public class SplashScreen extends JPanel implements Runnable addMouseListener(closer); try { - java.net.URL url = getClass().getResource("/images/logo.gif"); + java.net.URL url = getClass().getResource("/images/logo_v2.jpeg"); if (url != null) { @@ -101,7 +101,7 @@ public class SplashScreen extends JPanel implements Runnable Desktop.desktop.add(iframe); SplashImage splashimg = new SplashImage(image); iconimg.add(splashimg, BorderLayout.CENTER); - add(iconimg, BorderLayout.WEST); + add(iconimg, BorderLayout.NORTH); add(authlist, BorderLayout.CENTER); authlist.setEditable(false); authlist.addMouseListener(closer); @@ -116,7 +116,7 @@ public class SplashScreen extends JPanel implements Runnable protected boolean refreshText() { String newtext = Desktop.instance.getAboutMessage(true).toString(); - System.err.println("Text found: \n"+newtext+"\nEnd of newtext."); + //System.err.println("Text found: \n"+newtext+"\nEnd of newtext."); if (oldtext != newtext.length()) { iframe.setVisible(false); @@ -133,7 +133,7 @@ public class SplashScreen extends JPanel implements Runnable iframe.setBounds((int) ((Desktop.instance.getWidth() - 750) / 2), (int) ((Desktop.instance.getHeight() - 160) / 2), 750, iframe.getPreferredSize().height); - System.err.println("New preferred size: "+iframe.getPreferredSize().height); + //System.err.println("New preferred size: "+iframe.getPreferredSize().height); return true; } @@ -206,7 +206,7 @@ public class SplashScreen extends JPanel implements Runnable if (image != null) { - g.drawImage(image, 4, (getHeight() - image.getHeight(this)) / 2, + g.drawImage(image, (getWidth() - image.getWidth(this)) / 2, (getHeight() - image.getHeight(this)) / 2, this); } }