From 1a802c6cf08e703f6b722a91b1e7f58f76356476 Mon Sep 17 00:00:00 2001 From: jprocter Date: Wed, 4 Jul 2012 17:20:18 +0100 Subject: [PATCH] JAL-1130 trial view of new logo on splashscreen. --- resources/images/logo_v2.jpeg | Bin 0 -> 6261 bytes src/jalview/gui/Desktop.java | 8 ++++---- src/jalview/gui/SplashScreen.java | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 resources/images/logo_v2.jpeg diff --git a/resources/images/logo_v2.jpeg b/resources/images/logo_v2.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..a37600c41d6e8febd64f8f0bad67f880a649dfe5 GIT binary patch literal 6261 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"); 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); } } -- 1.7.10.2