X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplashScreen.java;h=9dfd1d5b118b77d9a9b5e144fc56cfc36ea795d8;hb=b6f8ec5c6678d0f363c521b97bda9574d04c6338;hp=b0be2696d2dc34c02b0100516dee1188a035d08d;hpb=1a802c6cf08e703f6b722a91b1e7f58f76356476;p=jalview.git diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java index b0be269..9dfd1d5 100755 --- a/src/jalview/gui/SplashScreen.java +++ b/src/jalview/gui/SplashScreen.java @@ -1,26 +1,46 @@ /* - * 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-Rel$$) + * Copyright (C) $$Year-Rel$$ 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.Component; +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.JInternalFrame; +import javax.swing.JLabel; +import javax.swing.JLayeredPane; +import javax.swing.JPanel; +import javax.swing.JTextPane; +import javax.swing.event.HyperlinkEvent; +import javax.swing.event.HyperlinkListener; -import javax.swing.*; +import jalview.util.ChannelProperties; +import jalview.util.Platform; /** * DOCUMENT ME! @@ -28,64 +48,120 @@ 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; + private static final int SHOW_FOR_SECS = 5; - JPanel iconimg = new JPanel(new BorderLayout()); + private static final int FONT_SIZE = 11; - JTextPane authlist = new JTextPane(); + private boolean visible = true; - JInternalFrame iframe; + private JPanel iconimg = new JPanel(new BorderLayout()); - Image image; + /* + * as JTextPane in Java, JLabel in javascript + */ + private Component splashText; - int fontSize = 11; + private JInternalFrame iframe; - int yoffset = 30; + private Image image; - /** - * Creates a new SplashScreen object. - */ - public SplashScreen() - { - Thread t = new Thread(this); - t.start(); - } + private boolean transientDialog = false; + + private long oldTextLength = -1; - MouseAdapter closer = new MouseAdapter() + /* + * allow click in the initial splash screen to dismiss it + * immediately (not if opened from About menu) + */ + private MouseAdapter closer = new MouseAdapter() { + @Override public void mousePressed(MouseEvent evt) { - try - { - visible = false; - closeSplash(); - } catch (Exception ex) + if (transientDialog) { + try + { + visible = false; + closeSplash(); + } catch (Exception ex) + { + } } } }; /** + * Constructor that displays the splash screen + * + * @param isTransient + * if true the panel removes itself on click or after a few seconds; + * if false it stays up until closed by the user + */ + public SplashScreen(boolean isTransient) + { + this.transientDialog = isTransient; + + if (Platform.isJS()) // BH 2019 + { + splashText = new JLabel(""); + run(); + } + else + { + /** + * Java only + * + * @j2sIgnore + */ + { + splashText = new JTextPane(); + Thread t = new Thread(this); + t.start(); + } + } + } + + /** * 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_v2.jpeg"); - - if (url != null) + if (!Platform.isJS()) { - image = java.awt.Toolkit.getDefaultToolkit().createImage(url); - + image = ChannelProperties.getImage("banner"); + Image logo = ChannelProperties.getImage("logo.48"); MediaTracker mt = new MediaTracker(this); - mt.addImage(image, 0); - mt.waitForID(0); - Desktop.instance.setIconImage(image); + if (image != null) + { + mt.addImage(image, 0); + } + if (logo != null) + { + 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.setIconImages(ChannelProperties.getIconList()); } } catch (Exception ex) { @@ -93,48 +169,82 @@ public class SplashScreen extends JPanel implements Runnable iframe = new JInternalFrame(); iframe.setFrameIcon(null); - iframe.setClosable(false); + iframe.setClosable(true); this.setLayout(new BorderLayout()); iframe.setContentPane(this); iframe.setLayer(JLayeredPane.PALETTE_LAYER); + if (Platform.isJS()) + { + // ignore in JavaScript + } + else + /** + * Java only + * + * @j2sIgnore + */ + { + ((JTextPane) splashText).setEditable(false); + SplashImage splashimg = new SplashImage(image); + iconimg.add(splashimg, BorderLayout.CENTER); + add(iconimg, BorderLayout.NORTH); + } + add(splashText, BorderLayout.CENTER); + splashText.addMouseListener(closer); 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); refreshText(); } - 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()) + String newtext = Desktop.instance.getAboutMessage(); + // System.err.println("Text found: \n"+newtext+"\nEnd of newtext."); + if (oldTextLength != 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); + oldTextLength = newtext.length(); + if (Platform.isJS()) // BH 2019 + { + /* + * SwingJS doesn't have HTMLEditorKit, required for a JTextPane + * to display formatted html, so we use a simple alternative + */ + String text = "


" + + newtext + ""; + JLabel ta = new JLabel(text); + ta.setOpaque(true); + ta.setBackground(Color.white); + splashText = ta; + } + else + /** + * Java only + * + * @j2sIgnore + */ + { + JTextPane jtp = new JTextPane(); + jtp.setEditable(false); + jtp.setContentType("text/html"); + jtp.setText("" + newtext + ""); + jtp.addHyperlinkListener(this); + splashText = jtp; + } + splashText.addMouseListener(closer); + splashText.setVisible(true); + splashText.setSize(new Dimension(750, 375)); + add(splashText, BorderLayout.CENTER); + revalidate(); + iframe.setBounds((Desktop.instance.getWidth() - 750) / 2, + (Desktop.instance.getHeight() - 375) / 2, 750, + splashText.getHeight() + iconimg.getHeight()); + iframe.validate(); + iframe.setVisible(true); return true; } return false; @@ -143,6 +253,7 @@ public class SplashScreen extends JPanel implements Runnable /** * Create splash screen, display it and clear it off again. */ + @Override public void run() { initSplashScreenWindow(); @@ -151,6 +262,7 @@ public class SplashScreen extends JPanel implements Runnable while (visible) { + iframe.repaint(); try { Thread.sleep(500); @@ -158,18 +270,24 @@ public class SplashScreen extends JPanel implements Runnable { } - if (((System.currentTimeMillis() / 1000) - startTime) > 5) + if (transientDialog && ((System.currentTimeMillis() / 1000) + - startTime) > SHOW_FOR_SECS) { visible = false; } if (visible && refreshText()) { - repaint(); + iframe.repaint(); + } + if (!transientDialog) + { + return; } } closeSplash(); + Desktop.instance.startDialogQueue(); } /** @@ -193,62 +311,39 @@ public class SplashScreen extends JPanel implements Runnable public SplashImage(Image todisplay) { image = todisplay; - setPreferredSize(new Dimension(image.getWidth(this) + 8, - image.getHeight(this))); + if (image != null) + { + setPreferredSize(new Dimension(image.getWidth(this) + 8, + image.getHeight(this))); + } } + @Override + public Dimension getPreferredSize() + { + return new Dimension(image.getWidth(this) + 8, image.getHeight(this)); + } + + @Override public void paintComponent(Graphics g) { g.setColor(Color.white); g.fillRect(0, 0, getWidth(), getHeight()); g.setColor(Color.black); - g.setFont(new Font("Verdana", Font.BOLD, fontSize + 6)); + g.setFont(new Font("Verdana", Font.BOLD, FONT_SIZE + 6)); 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); } } - /* - * 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 + + @Override + public void hyperlinkUpdate(HyperlinkEvent e) + { + Desktop.hyperlinkUpdate(e); + + } +}