X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplashScreen.java;h=00801a726b947047448b6722aa5ed0110f9a5a10;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=b0be2696d2dc34c02b0100516dee1188a035d08d;hpb=1a802c6cf08e703f6b722a91b1e7f58f76356476;p=jalview.git diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java index b0be269..00801a7 100755 --- a/src/jalview/gui/SplashScreen.java +++ b/src/jalview/gui/SplashScreen.java @@ -1,26 +1,41 @@ /* - * 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 + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) + * Copyright (C) 2015 The Jalview Authors * * 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. - * + * 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 . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.gui; -import java.awt.*; -import java.awt.event.*; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.Graphics; +import java.awt.Image; +import java.awt.MediaTracker; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; -import javax.swing.*; +import javax.swing.JInternalFrame; +import javax.swing.JLayeredPane; +import javax.swing.JPanel; +import javax.swing.JTextPane; +import javax.swing.event.HyperlinkEvent; +import javax.swing.event.HyperlinkListener; /** * DOCUMENT ME! @@ -28,7 +43,8 @@ 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; @@ -49,6 +65,21 @@ 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(); } @@ -59,8 +90,11 @@ public class SplashScreen extends JPanel implements Runnable { try { - visible = false; - closeSplash(); + if (!interactiveDialog) + { + visible = false; + closeSplash(); + } } catch (Exception ex) { } @@ -76,16 +110,33 @@ public class SplashScreen extends JPanel implements Runnable addMouseListener(closer); try { - java.net.URL url = getClass().getResource("/images/logo_v2.jpeg"); + 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) { @@ -93,18 +144,18 @@ 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); - Desktop.desktop.add(iframe); 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(); } @@ -116,24 +167,26 @@ 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); oldtext = newtext.length(); - authlist=new JTextPane(); + 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, 375)); add(authlist, BorderLayout.CENTER); - iframe.pack(); + revalidate(); + iframe.setBounds((Desktop.instance.getWidth() - 750) / 2, + (Desktop.instance.getHeight() - 375) / 2, 750, + authlist.getHeight() + iconimg.getHeight()); + iframe.validate(); 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; } @@ -151,6 +204,7 @@ public class SplashScreen extends JPanel implements Runnable while (visible) { + iframe.repaint(); try { Thread.sleep(500); @@ -158,18 +212,28 @@ public class SplashScreen extends JPanel implements Runnable { } - if (((System.currentTimeMillis() / 1000) - startTime) > 5) + if (!interactiveDialog + && ((System.currentTimeMillis() / 1000) - startTime) > 5) { visible = false; } if (visible && refreshText()) { - repaint(); + // if (interactiveDialog) { + iframe.repaint(); + // } else { + // iframe.repaint(); + // }; + } + if (interactiveDialog) + { + return; } } closeSplash(); + Desktop.instance.startDialogQueue(); } /** @@ -197,6 +261,12 @@ public class SplashScreen extends JPanel implements Runnable image.getHeight(this))); } + @Override + public Dimension getPreferredSize() + { + return new Dimension(image.getWidth(this) + 8, image.getHeight(this)); + } + public void paintComponent(Graphics g) { g.setColor(Color.white); @@ -206,8 +276,8 @@ public class SplashScreen extends JPanel implements Runnable if (image != null) { - g.drawImage(image, (getWidth() - image.getWidth(this)) / 2, (getHeight() - image.getHeight(this)) / 2, - this); + g.drawImage(image, (getWidth() - image.getWidth(this)) / 2, + (getHeight() - image.getHeight(this)) / 2, this); } } /* @@ -251,4 +321,11 @@ public class SplashScreen extends JPanel implements Runnable * += fontSize + 4); } */ } -} \ No newline at end of file + + @Override + public void hyperlinkUpdate(HyperlinkEvent e) + { + Desktop.hyperlinkUpdate(e); + + } +}