X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplashScreen.java;h=1060d8accd8d43dad2b2dd45848d53abd25cf13a;hb=1140532d01b32b648e7e5b17ea717ae790625f8f;hp=2b87e1063a63484fe224628f2005c800d03cb16a;hpb=577b0bf651763fe609eb6d6343754662023b3eac;p=jalview.git
diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java
index 2b87e10..1060d8a 100755
--- a/src/jalview/gui/SplashScreen.java
+++ b/src/jalview/gui/SplashScreen.java
@@ -20,8 +20,6 @@
*/
package jalview.gui;
-import jalview.util.Platform;
-
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
@@ -41,6 +39,9 @@ import javax.swing.JTextPane;
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
+import jalview.util.ChannelProperties;
+import jalview.util.Platform;
+
/**
* DOCUMENT ME!
*
@@ -50,82 +51,97 @@ import javax.swing.event.HyperlinkListener;
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;
- /**
- * either text area in javascript or in java text pane
+ private boolean visible = true;
+
+ private JPanel iconimg = new JPanel(new BorderLayout());
+
+ // could change fg, bg, font later to use ChannelProperties (these are not
+ // actually being used!)
+ private static Color bg = Color.WHITE;
+
+ private static Color fg = Color.BLACK;
+
+ private static Font font = new Font("SansSerif", Font.PLAIN, FONT_SIZE);
+
+ /*
+ * as JTextPane in Java, JLabel in javascript
*/
- Component authlist;
+ private Component splashText;
- JInternalFrame iframe;
+ private JInternalFrame iframe;
- Image image;
+ private Image image;
- int fontSize = 11;
+ private boolean transientDialog = false;
- int yoffset = 30;
+ private long oldTextLength = -1;
- /**
- * Creates a new SplashScreen object.
+ public static int logoSize = 32;
+
+ /*
+ * allow click in the initial splash screen to dismiss it
+ * immediately (not if opened from About menu)
*/
- public SplashScreen()
+ private MouseAdapter closer = new MouseAdapter()
{
- this(false);
- }
-
- private boolean interactiveDialog = false;
+ @Override
+ public void mousePressed(MouseEvent evt)
+ {
+ if (transientDialog)
+ {
+ try
+ {
+ visible = false;
+ closeSplash();
+ } catch (Exception ex)
+ {
+ }
+ }
+ }
+ };
/**
+ * Constructor that displays the splash screen
*
- * @param interactive
- * if true - an internal dialog is opened rather than a free-floating
- * 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 interactive)
+ public SplashScreen(boolean isTransient)
{
- this.interactiveDialog = interactive;
- // show a splashscreen that will disapper
+ this.transientDialog = isTransient;
+ if (this.transientDialog)
+ {
+ Desktop.instance.acquireDialogQueue();
+ }
+
if (Platform.isJS()) // BH 2019
{
- authlist = new JLabel("");
+ splashText = new JLabel("");
run();
}
else
{
/**
* Java only
- *
+ *
* @j2sIgnore
*/
{
- authlist = new JTextPane();
+ splashText = new JTextPane();
+ splashText.setBackground(bg);
+ splashText.setForeground(fg);
+ splashText.setFont(font);
Thread t = new Thread(this);
t.start();
}
}
-
}
- MouseAdapter closer = new MouseAdapter()
- {
- @Override
- public void mousePressed(MouseEvent evt)
- {
- try
- {
- if (!interactiveDialog)
- {
- visible = false;
- closeSplash();
- }
- } catch (Exception ex)
- {
- }
- }
- };
-
/**
* ping the jalview version page then create and display the jalview
* splashscreen window.
@@ -133,20 +149,22 @@ public class SplashScreen extends JPanel
void initSplashScreenWindow()
{
addMouseListener(closer);
+
try
{
- java.net.URL url = getClass().getResource("/images/Jalview_Logo.png");
- java.net.URL urllogo = getClass()
- .getResource("/images/Jalview_Logo_small.png");
-
- if (!Platform.isJS() && url != null)
+ if (!Platform.isJS())
{
- image = java.awt.Toolkit.getDefaultToolkit().createImage(url);
- Image logo = java.awt.Toolkit.getDefaultToolkit()
- .createImage(urllogo);
+ image = ChannelProperties.getImage("banner");
+ Image logo = ChannelProperties.getImage("logo.48");
MediaTracker mt = new MediaTracker(this);
- mt.addImage(image, 0);
- mt.addImage(logo, 1);
+ if (image != null)
+ {
+ mt.addImage(image, 0);
+ }
+ if (logo != null)
+ {
+ mt.addImage(logo, 1);
+ }
do
{
try
@@ -157,21 +175,29 @@ public class SplashScreen extends JPanel
}
if (mt.isErrorAny())
{
- System.err.println("Error when loading images!");
+ jalview.bin.Console.errPrintln("Error when loading images!");
}
} while (!mt.checkAll());
- Desktop.instance.setIconImage(logo);
+ Desktop.instance.setIconImages(ChannelProperties.getIconList());
}
} catch (Exception ex)
{
}
+ this.setBackground(bg);
+ this.setForeground(fg);
+ this.setFont(font);
+
iframe = new JInternalFrame();
iframe.setFrameIcon(null);
- iframe.setClosable(interactiveDialog);
+ iframe.setClosable(true);
this.setLayout(new BorderLayout());
iframe.setContentPane(this);
iframe.setLayer(JLayeredPane.PALETTE_LAYER);
+ iframe.setBackground(bg);
+ iframe.setForeground(fg);
+ iframe.setFont(font);
+
if (Platform.isJS())
{
// ignore in JavaScript
@@ -183,62 +209,81 @@ public class SplashScreen extends JPanel
* @j2sIgnore
*/
{
- ((JTextPane) authlist).setEditable(false);
+ ((JTextPane) splashText).setEditable(false);
+ splashText.setBackground(bg);
+ splashText.setForeground(fg);
+ splashText.setFont(font);
SplashImage splashimg = new SplashImage(image);
- iconimg.add(splashimg, BorderLayout.CENTER);
+ iconimg.add(splashimg, BorderLayout.LINE_START);
+ iconimg.setBackground(bg);
add(iconimg, BorderLayout.NORTH);
}
- add(authlist, BorderLayout.CENTER);
- authlist.addMouseListener(closer);
+ add(splashText, BorderLayout.CENTER);
+ splashText.addMouseListener(closer);
Desktop.desktop.add(iframe);
refreshText();
}
- long oldtext = -1;
-
/**
* update text in author text panel reflecting current version information
*/
- @SuppressWarnings("unused")
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();
+ // jalview.bin.Console.errPrintln("Text found: \n"+newtext+"\nEnd of
+ // newtext.");
+ if (oldTextLength != newtext.length())
{
iframe.setVisible(false);
- oldtext = newtext.length();
+ oldTextLength = newtext.length();
if (Platform.isJS()) // BH 2019
{
- authlist = new JLabel(
- "
![](\"swingjs/j2s/images/Jalview_Logo.png\"/)
"
- + newtext);
- ((JLabel) authlist).setOpaque(true);
- ((JLabel) authlist).setBackground(Color.white);
+ /*
+ * 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
*/
{
- authlist = new JTextPane();
- ((JTextPane) authlist).setEditable(false);
- ((JTextPane) authlist).setContentType("text/html");
- ((JTextPane) authlist).setText(newtext);
- ((JTextPane) authlist).addHyperlinkListener(this);
+ JTextPane jtp = new JTextPane();
+ jtp.setEditable(false);
+ jtp.setBackground(bg);
+ jtp.setForeground(fg);
+ jtp.setFont(font);
+ jtp.setContentType("text/html");
+ jtp.setText("" + newtext + "");
+ jtp.addHyperlinkListener(this);
+ splashText = jtp;
}
- authlist.addMouseListener(closer);
-
- authlist.setVisible(true);
- authlist.setSize(new Dimension(750, 375));
- add(authlist, BorderLayout.CENTER);
+ splashText.addMouseListener(closer);
+
+ splashText.setVisible(true);
+ splashText.setSize(new Dimension(750,
+ 425 + logoSize + (Platform.isJS() ? 40 : 0)));
+ splashText.setBackground(bg);
+ splashText.setForeground(fg);
+ splashText.setFont(font);
+ add(splashText, BorderLayout.CENTER);
revalidate();
- iframe.setBounds((Desktop.instance.getWidth() - 750) / 2,
- (Desktop.instance.getHeight() - 375) / 2, 750,
- authlist.getHeight() + iconimg.getHeight());
+ int width = Math.max(splashText.getWidth(), iconimg.getWidth());
+ int height = splashText.getHeight() + iconimg.getHeight();
+ iframe.setBounds(
+ Math.max(0, (Desktop.instance.getWidth() - width) / 2),
+ Math.max(0, (Desktop.instance.getHeight() - height) / 2),
+ width, height);
iframe.validate();
iframe.setVisible(true);
return true;
@@ -266,28 +311,23 @@ public class SplashScreen extends JPanel
{
}
- if (!interactiveDialog
- && ((System.currentTimeMillis() / 1000) - startTime) > 5)
+ if (transientDialog && ((System.currentTimeMillis() / 1000)
+ - startTime) > SHOW_FOR_SECS)
{
visible = false;
}
if (visible && refreshText())
{
- // if (interactiveDialog) {
iframe.repaint();
- // } else {
- // iframe.repaint();
- // };
}
- if (interactiveDialog)
+ if (!transientDialog)
{
return;
}
}
closeSplash();
- Desktop.instance.startDialogQueue();
}
/**
@@ -295,10 +335,14 @@ public class SplashScreen extends JPanel
*/
public void closeSplash()
{
+ if (this.transientDialog)
+ {
+ Desktop.instance.releaseDialogQueue();
+ }
try
{
- iframe.setClosed(true);
+ iframe.setClosed(true); // ##### implicated BLOCKED
} catch (Exception ex)
{
}
@@ -327,10 +371,10 @@ public class SplashScreen extends JPanel
@Override
public void paintComponent(Graphics g)
{
- g.setColor(Color.white);
+ g.setColor(bg);
g.fillRect(0, 0, getWidth(), getHeight());
- g.setColor(Color.black);
- g.setFont(new Font("Verdana", Font.BOLD, fontSize + 6));
+ g.setColor(fg);
+ g.setFont(new Font(font.getFontName(), Font.BOLD, FONT_SIZE + 6));
if (image != null)
{
@@ -338,46 +382,6 @@ public class SplashScreen extends JPanel
(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); }
- */
}
@Override