X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FSplashScreen.java;h=875272a6aa131c060d86a4d99d66a71ddffb3283;hb=d720fe0edcdcebfdb26e696b74a86d871a89767e;hp=48010517009b065321bbc57ccc1a6f60a2d193f7;hpb=8a6fa9ea9900d0f106529c3f6283e7f9d76dd2cb;p=jalview.git diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java index 4801051..875272a 100755 --- a/src/jalview/gui/SplashScreen.java +++ b/src/jalview/gui/SplashScreen.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6) - * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) + * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle * * This file is part of Jalview. * @@ -19,7 +19,10 @@ package jalview.gui; import java.awt.*; import java.awt.event.*; + import javax.swing.*; +import javax.swing.event.HyperlinkEvent; +import javax.swing.event.HyperlinkListener; /** * DOCUMENT ME! @@ -27,10 +30,14 @@ import javax.swing.*; * @author $author$ * @version $Revision$ */ -public class SplashScreen extends JPanel implements Runnable +public class SplashScreen extends JPanel implements Runnable, HyperlinkListener { boolean visible = true; + JPanel iconimg = new JPanel(new BorderLayout()); + + JTextPane authlist = new JTextPane(); + JInternalFrame iframe; Image image; @@ -44,42 +51,66 @@ public class SplashScreen extends JPanel implements Runnable */ public SplashScreen() { + this(false); + } + private boolean interactiveDialog=false; + /** + * + * @param interactive if true - an internal dialog is opened rather than a free-floating splash screen + */ + public SplashScreen(boolean interactive) + { + this.interactiveDialog=interactive; + // show a splashscreen that will disapper Thread t = new Thread(this); t.start(); } - /** - * ping the jalview version page then create and display the jalview - * splashscreen window. - */ - void initSplashScreenWindow() + + MouseAdapter closer = new MouseAdapter() { - addMouseListener(new MouseAdapter() + public void mousePressed(MouseEvent evt) { - public void mousePressed(MouseEvent evt) + try { - try + if (!interactiveDialog) { visible = false; closeSplash(); - } catch (Exception ex) - { } + } catch (Exception ex) + { } - }); + } + }; + /** + * ping the jalview version page then create and display the jalview + * splashscreen window. + */ + void initSplashScreenWindow() + { + addMouseListener(closer); try { - java.net.URL url = getClass().getResource("/images/logo.gif"); + java.net.URL url = getClass().getResource("/images/Jalview_Logo.png"); + java.net.URL urllogo = getClass().getResource("/images/Jalview_Logo_small.png"); if (url != null) { image = java.awt.Toolkit.getDefaultToolkit().createImage(url); - + Image logo=java.awt.Toolkit.getDefaultToolkit().createImage(urllogo); MediaTracker mt = new MediaTracker(this); mt.addImage(image, 0); - mt.waitForID(0); - Desktop.instance.setIconImage(image); + mt.addImage(logo, 1); + do { try { + mt.waitForAll(); } catch (InterruptedException x) {}; + if (mt.isErrorAny()) + { + System.err.println("Error when loading images!"); + } + } while (!mt.checkAll()); + Desktop.instance.setIconImage(logo); } } catch (Exception ex) { @@ -87,15 +118,53 @@ public class SplashScreen extends JPanel implements Runnable iframe = new JInternalFrame(); iframe.setFrameIcon(null); - iframe.setClosable(false); + iframe.setClosable(interactiveDialog); + this.setLayout(new BorderLayout()); iframe.setContentPane(this); iframe.setLayer(JLayeredPane.PALETTE_LAYER); + SplashImage splashimg = new SplashImage(image); + iconimg.add(splashimg, BorderLayout.CENTER); + add(iconimg, BorderLayout.NORTH); + add(authlist, BorderLayout.CENTER); + authlist.setEditable(false); + authlist.addMouseListener(closer); Desktop.desktop.add(iframe); + refreshText(); + } - iframe.setVisible(true); - iframe.setBounds((int) ((Desktop.instance.getWidth() - 750) / 2), - (int) ((Desktop.instance.getHeight() - 160) / 2), 750, 190); + long oldtext = -1; + + /** + * update text in author text panel reflecting current version information + */ + protected boolean refreshText() + { + String newtext = Desktop.instance.getAboutMessage(true).toString(); + //System.err.println("Text found: \n"+newtext+"\nEnd of newtext."); + if (oldtext != newtext.length()) + { + iframe.setVisible(false); + oldtext = newtext.length(); + authlist=new JTextPane(); + authlist.setEditable(false); + authlist.addMouseListener(closer); + authlist.addHyperlinkListener(this); + authlist.setContentType("text/html"); + authlist.setText(newtext); + authlist.setVisible(true); + authlist.setSize(new Dimension(750, 275)); + add(authlist, BorderLayout.CENTER); + revalidate(); + iframe.setBounds((int) ((Desktop.instance.getWidth() - 750) / 2), + (int) ((Desktop.instance.getHeight() - 140) / 2), 750, + authlist.getHeight()+iconimg.getHeight()); + iframe.validate(); + iframe.setVisible(true); + + return true; + } + return false; } /** @@ -104,26 +173,40 @@ public class SplashScreen extends JPanel implements Runnable public void run() { initSplashScreenWindow(); + long startTime = System.currentTimeMillis() / 1000; while (visible) { + iframe.repaint(); try { - Thread.sleep(1000); + Thread.sleep(500); } catch (Exception ex) { } - - if (((System.currentTimeMillis() / 1000) - startTime) > 5) + + if (!interactiveDialog && ((System.currentTimeMillis() / 1000) - startTime) > 5) { visible = false; } - else - repaint(); + + if (visible && refreshText()) + { +// if (interactiveDialog) { + iframe.repaint(); +// } else { +// iframe.repaint(); +// }; + } + if (interactiveDialog) + { + return; + } } closeSplash(); + Desktop.instance.startDialogQueue(); } /** @@ -140,82 +223,80 @@ public class SplashScreen extends JPanel implements Runnable } } - /** - * DOCUMENT ME! - * - * @param g - * DOCUMENT ME! - */ - public void paintComponent(Graphics g) + public class SplashImage extends JPanel { - g.setColor(Color.white); - g.fillRect(0, 0, getWidth(), getHeight()); - g.setColor(Color.black); - g.setFont(new Font("Verdana", Font.BOLD, fontSize + 6)); + Image image; - if (image != null) + public SplashImage(Image todisplay) { - g.drawImage(image, 5, yoffset + 12, this); + image = todisplay; + setPreferredSize(new Dimension(image.getWidth(this) + 8, + image.getHeight(this))); } - - int y = yoffset; - - 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( - "Last updated: " - + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown"), - 50 + vwidth + 5, y); - if (jalview.bin.Cache.getDefault("LATEST_VERSION", "Checking").equals( - "Checking")) + @Override + public Dimension getPreferredSize() { - // Displayed when code version and jnlp version do not match - g.drawString("...Checking latest version...", 50, y += fontSize + 10); - y += 5; - g.setColor(Color.black); + return new Dimension(image.getWidth(this) + 8, + image.getHeight(this)); } - else if (!jalview.bin.Cache.getDefault("LATEST_VERSION", "Checking") - .equals(jalview.bin.Cache.getProperty("VERSION"))) + public void paintComponent(Graphics g) { - if (jalview.bin.Cache.getProperty("VERSION").toLowerCase() - .indexOf("automated build") == -1) + g.setColor(Color.white); + g.fillRect(0, 0, getWidth(), getHeight()); + g.setColor(Color.black); + g.setFont(new Font("Verdana", Font.BOLD, fontSize + 6)); + + if (image != null) { - // Displayed when code version and jnlp version do not match and code - // version is not a development build - g.setColor(Color.red); + g.drawImage(image, (getWidth() - image.getWidth(this)) / 2, (getHeight() - image.getHeight(this)) / 2, + this); } - g.drawString( - "!! Jalview version " - + jalview.bin.Cache.getDefault("LATEST_VERSION", - "..Checking..") - + " is available for download from http://www.jalview.org !!", - 50, y += fontSize + 10); - y += 5; - g.setColor(Color.black); } - - g.setFont(new Font("Verdana", Font.BOLD, fontSize)); - g.drawString( - "Authors: Andrew Waterhouse, Jim Procter, Michele Clamp, James Cuff, Steve Searle,", - 50, y += fontSize + 4); - g.drawString("David Martin & Geoff Barton.", 60, y += fontSize + 4); - g.drawString( - "Development managed by The Barton Group, University of Dundee.", - 50, y += fontSize + 4); - g.drawString("If you use Jalview, please cite: ", 50, - y += fontSize + 4); - g.drawString( - "Waterhouse, A.M., Procter, J.B., Martin, D.M.A, Clamp, M. and Barton, G. J. (2009)", - 50, y += fontSize + 4); - g.drawString( - "Jalview Version 2 - a multiple sequence alignment editor and analysis workbench", - 50, y += fontSize + 4); - g.drawString("Bioinformatics doi: 10.1093/bioinformatics/btp033", 50, - y += fontSize + 4); + /* + * int y = yoffset; + * + * 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( + * "Last updated: " + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown"), + * 50 + vwidth + 5, y); if (jalview.bin.Cache.getDefault("LATEST_VERSION", + * "Checking").equals( "Checking")) { // Displayed when code version and + * jnlp version do not match g.drawString("...Checking latest version...", + * 50, y += fontSize + 10); y += 5; g.setColor(Color.black); } else if + * (!jalview.bin.Cache.getDefault("LATEST_VERSION", "Checking") + * .equals(jalview.bin.Cache.getProperty("VERSION"))) { if + * (jalview.bin.Cache.getProperty("VERSION").toLowerCase() + * .indexOf("automated build") == -1) { // Displayed when code version and + * jnlp version do not match and code // version is not a development build + * g.setColor(Color.red); } g.drawString( "!! Jalview version " + + * jalview.bin.Cache.getDefault("LATEST_VERSION", "..Checking..") + + * " is available for download from " + * +jalview.bin.Cache.getDefault("www.jalview.org" + * ,"http://www.jalview.org")+" !!", 50, y += fontSize + 10); y += 5; + * g.setColor(Color.black); } + * + * g.setFont(new Font("Verdana", Font.BOLD, fontSize)); g.drawString( + * "Authors: Jim Procter, Andrew Waterhouse, Michele Clamp, James Cuff, Steve Searle," + * , 50, y += fontSize + 4); g.drawString("David Martin & Geoff Barton.", + * 60, y += fontSize + 4); g.drawString( + * "Development managed by The Barton Group, University of Dundee.", 50, y + * += fontSize + 4); g.drawString("If you use Jalview, please cite: ", 50, + * y += fontSize + 4); g.drawString( + * "Waterhouse, A.M., Procter, J.B., Martin, D.M.A, Clamp, M. and Barton, G. J. (2009)" + * , 50, y += fontSize + 4); g.drawString( + * "Jalview Version 2 - a multiple sequence alignment editor and analysis workbench" + * , 50, y += fontSize + 4); + * g.drawString("Bioinformatics doi: 10.1093/bioinformatics/btp033", 50, y + * += fontSize + 4); } + */ + } + @Override + public void hyperlinkUpdate(HyperlinkEvent e) + { + Desktop.hyperlinkUpdate(e); + } -} +} \ No newline at end of file