/*
- * 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 <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see <http://www.gnu.org/licenses/>.
+ * 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;
* @author $author$
* @version $Revision$
*/
-public class SplashScreen extends JPanel implements Runnable, HyperlinkListener
+public class SplashScreen extends JPanel implements Runnable,
+ HyperlinkListener
{
boolean visible = true;
{
this(false);
}
- private boolean interactiveDialog=false;
+
+ private boolean interactiveDialog = false;
+
/**
*
- * @param interactive if true - an internal dialog is opened rather than a free-floating splash screen
+ * @param interactive
+ * if true - an internal dialog is opened rather than a free-floating
+ * splash screen
*/
public SplashScreen(boolean interactive)
{
- this.interactiveDialog=interactive;
+ this.interactiveDialog = interactive;
// show a splashscreen that will disapper
Thread t = new Thread(this);
t.start();
}
-
MouseAdapter closer = new MouseAdapter()
{
public void mousePressed(MouseEvent evt)
addMouseListener(closer);
try
{
- java.net.URL url = getClass().getResource("/images/Jalviewlogo.png");
+ 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)
{
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();
}
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.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);
+ revalidate();
+ iframe.setBounds((Desktop.instance.getWidth() - 750) / 2,
+ (Desktop.instance.getHeight() - 375) / 2, 750,
+ authlist.getHeight() + iconimg.getHeight());
iframe.validate();
iframe.setVisible(true);
} catch (Exception ex)
{
}
-
- if (!interactiveDialog && ((System.currentTimeMillis() / 1000) - startTime) > 5)
+
+ if (!interactiveDialog
+ && ((System.currentTimeMillis() / 1000) - startTime) > 5)
{
visible = false;
}
if (visible && refreshText())
{
-// if (interactiveDialog) {
- iframe.repaint();
-// } else {
-// iframe.repaint();
-// };
+ // if (interactiveDialog) {
+ iframe.repaint();
+ // } else {
+ // iframe.repaint();
+ // };
}
if (interactiveDialog)
{
}
closeSplash();
+ Desktop.instance.startDialogQueue();
}
/**
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);
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);
}
}
/*
* += fontSize + 4); }
*/
}
+
@Override
public void hyperlinkUpdate(HyperlinkEvent e)
{
Desktop.hyperlinkUpdate(e);
-
+
}
-}
\ No newline at end of file
+}
git://source.jalview.org / jalview.git / blobdiff