git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Save features and pdbids
[jalview.git]
/
src
/
jalview
/
gui
/
SplashScreen.java
diff --git
a/src/jalview/gui/SplashScreen.java
b/src/jalview/gui/SplashScreen.java
index
31b0d31
..
05f412f
100755
(executable)
--- a/
src/jalview/gui/SplashScreen.java
+++ b/
src/jalview/gui/SplashScreen.java
@@
-101,7
+101,6
@@
public class SplashScreen extends JPanel implements Runnable
try
\r
{
\r
iframe.setClosed(true);
\r
try
\r
{
\r
iframe.setClosed(true);
\r
- iframe=null;
\r
}
\r
catch (Exception ex)
\r
{
\r
}
\r
catch (Exception ex)
\r
{
\r
@@
-128,11
+127,13
@@
public class SplashScreen extends JPanel implements Runnable
\r
int y = yoffset;
\r
\r
\r
int y = yoffset;
\r
\r
- g.drawString("JalView 2005 ", 50, y);
\r
+ g.drawString("Jalview "+jalview.bin.Cache.getProperty("VERSION"), 50, y);
\r
+
\r
+ FontMetrics fm = g.getFontMetrics();
\r
+ int vwidth = fm.stringWidth("Jalview "+jalview.bin.Cache.getProperty("VERSION"));
\r
g.setFont(new Font("Verdana", Font.BOLD, fontSize + 2));
\r
g.setFont(new Font("Verdana", Font.BOLD, fontSize + 2));
\r
- g.drawString("Version " + jalview.bin.Cache.getProperty("VERSION") +
\r
- "; Last updated: " + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown"),
\r
- 180, y);
\r
+ g.drawString("Last updated: " + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown"),
\r
+ 50 + vwidth +5, y);
\r
\r
if (jalview.bin.Cache.getDefault("LATEST_VERSION", "Checking").equals("Checking"))
\r
{
\r
\r
if (jalview.bin.Cache.getDefault("LATEST_VERSION", "Checking").equals("Checking"))
\r
{
\r
@@
-146,7
+147,7
@@
public class SplashScreen extends JPanel implements Runnable
jalview.bin.Cache.getProperty("VERSION")))
\r
{
\r
// Displayed when code version and jnlp version do not match
\r
jalview.bin.Cache.getProperty("VERSION")))
\r
{
\r
// Displayed when code version and jnlp version do not match
\r
-
\r
+ g.setColor(Color.red);
\r
g.drawString("!! Jalview version " +
\r
jalview.bin.Cache.getDefault("LATEST_VERSION", "..Checking..")
\r
+ " is available for download from http://www.jalview.org !!",
\r
g.drawString("!! Jalview version " +
\r
jalview.bin.Cache.getDefault("LATEST_VERSION", "..Checking..")
\r
+ " is available for download from http://www.jalview.org !!",
\r