X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplashScreen.java;h=32c6aac2f5ca77769c58f1b47e0616368be440b1;hb=e015538903c8cabb2b90dd030e3e0c419a730db9;hp=30cfa63ef1ad4d7d4651a275f06c03485a440daa;hpb=bcfc087d75da78963a3bba83ee2a206035297ee7;p=jalview.git diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java index 30cfa63..32c6aac 100755 --- a/src/jalview/gui/SplashScreen.java +++ b/src/jalview/gui/SplashScreen.java @@ -1,40 +1,47 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2007 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 - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * 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. + * + * Jalview is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + * + * Jalview is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with Jalview. If not, see . */ package jalview.gui; import java.awt.*; import java.awt.event.*; + import javax.swing.*; /** * DOCUMENT ME! - * + * * @author $author$ * @version $Revision$ */ -public class SplashScreen - extends JPanel implements Runnable +public class SplashScreen extends JPanel implements Runnable { boolean visible = true; + + JPanel iconimg = new JPanel(new BorderLayout()); + + JTextPane authlist = new JTextPane(); + JInternalFrame iframe; + Image image; + int fontSize = 11; + int yoffset = 30; /** @@ -45,25 +52,28 @@ public class SplashScreen Thread t = new Thread(this); t.start(); } - /** - * ping the jalview version page then create and display the jalview splashscreen window. - */ - void initSplashScreenWindow() { - addMouseListener(new MouseAdapter() + + MouseAdapter closer = new MouseAdapter() + { + public void mousePressed(MouseEvent evt) { - public void mousePressed(MouseEvent evt) + try + { + visible = false; + closeSplash(); + } catch (Exception ex) { - try - { - visible=false; - closeSplash(); - } - 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"); @@ -77,24 +87,57 @@ public class SplashScreen mt.waitForID(0); Desktop.instance.setIconImage(image); } - } - catch (Exception ex) + } catch (Exception ex) { } - iframe = new JInternalFrame(); iframe.setFrameIcon(null); iframe.setClosable(false); + this.setLayout(new BorderLayout()); iframe.setContentPane(this); iframe.setLayer(JLayeredPane.PALETTE_LAYER); Desktop.desktop.add(iframe); + SplashImage splashimg = new SplashImage(image); + iconimg.add(splashimg, BorderLayout.CENTER); + add(iconimg, BorderLayout.WEST); + add(authlist, BorderLayout.CENTER); + authlist.setEditable(false); + authlist.addMouseListener(closer); + refreshText(); + } - iframe.setVisible(true); - iframe.setBounds( (int) ( (Desktop.instance.getWidth() - 750) / 2), - (int) ( (Desktop.instance.getHeight() - 160) / 2), - 750, 160); + 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.setContentType("text/html"); + authlist.setText(newtext); + authlist.setVisible(true); + add(authlist, BorderLayout.CENTER); + iframe.pack(); + iframe.setVisible(true); + 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); + + return true; + } + return false; } /** @@ -103,24 +146,27 @@ public class SplashScreen public void run() { initSplashScreenWindow(); + long startTime = System.currentTimeMillis() / 1000; - + while (visible) { try { - Thread.sleep(1000); - } - catch (Exception ex) + Thread.sleep(500); + } catch (Exception ex) { } - if ( ( (System.currentTimeMillis() / 1000) - startTime) > 5) + if (((System.currentTimeMillis() / 1000) - startTime) > 5) { visible = false; } - else - repaint(); + + if (visible && refreshText()) + { + repaint(); + } } closeSplash(); @@ -135,73 +181,74 @@ public class SplashScreen { iframe.setClosed(true); + } catch (Exception ex) + { } - catch (Exception ex) - { } } - /** - * 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")) + public void paintComponent(Graphics g) { - // Displayed when code version and jnlp version do not match - g.drawString("...Checking latest version...", - 50, y += fontSize + 10); - y += 5; + g.setColor(Color.white); + g.fillRect(0, 0, getWidth(), getHeight()); g.setColor(Color.black); - } - else if (!jalview.bin.Cache.getDefault("LATEST_VERSION", "Checking").equals( - 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 !!", - 50, y += fontSize + 10); - y += 5; - g.setColor(Color.black); - } + g.setFont(new Font("Verdana", Font.BOLD, fontSize + 6)); - g.setFont(new Font("Verdana", Font.BOLD, fontSize)); - g.drawString("Authors: Michele Clamp, James Cuff, Steve Searle, Andrew Waterhouse, Jim Procter & Geoff Barton.", - 50, y += fontSize + 4); - g.drawString("Current development managed by Andrew Waterhouse; Barton Group, University of Dundee.", - 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 20; 426-7.", - 50, y += fontSize + 4); + if (image != null) + { + g.drawImage(image, 4, (getHeight() - image.getHeight(this)) / 2, + 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")) { // 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); } + */ } -} +} \ No newline at end of file