X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=300fcc2a1091f0b7bf68625c3f5f7eca7359d5bc;hb=e9aa1cee679000405c5549829ee08e1c08b2ffd5;hp=f4040fac7d2f12ab20ce14a87a2034c1a3661f3a;hpb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;p=jalview.git
diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index f4040fa..300fcc2 100644
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -204,6 +204,10 @@ public class Desktop extends jalview.jbgui.GDesktop implements
public void dragFrame(JComponent f, int newX, int newY)
{
+ if (newY<0)
+ {
+ newY=0;
+ }
delegate.dragFrame(f, newX, newY);
}
@@ -240,6 +244,11 @@ public class Desktop extends jalview.jbgui.GDesktop implements
public void resizeFrame(JComponent f, int newX, int newY, int newWidth,
int newHeight)
{
+ Rectangle b=desktop.getBounds();
+ if (newY<0)
+ {
+ newY=0;
+ }
delegate.resizeFrame(f, newX, newY, newWidth, newHeight);
}
@@ -282,12 +291,14 @@ public class Desktop extends jalview.jbgui.GDesktop implements
//sp.getViewport().setView(desktop);
//getContentPane().add(sp, BorderLayout.CENTER);
getContentPane().add(desktop, BorderLayout.CENTER);
- desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);
+ desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);
+
// This line prevents Windows Look&Feel resizing all new windows to maximum
// if previous window was maximised
desktop.setDesktopManager(new MyDesktopManager(
new DefaultDesktopManager()));
+
Rectangle dims = getLastKnownDimensions("");
if (dims != null)
{
@@ -335,7 +346,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements
}
});
- this.addMouseListener(new MouseAdapter()
+ MouseAdapter ma;
+ this.addMouseListener(ma=new MouseAdapter()
{
public void mousePressed(MouseEvent evt)
{
@@ -345,6 +357,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements
}
}
});
+ desktop.addMouseListener(ma);
+
this.addFocusListener(new FocusListener()
{
@@ -1046,30 +1060,77 @@ public class Desktop extends jalview.jbgui.GDesktop implements
*/
public void aboutMenuItem_actionPerformed(ActionEvent e)
{
- StringBuffer message = new StringBuffer("Jalview version "
- + jalview.bin.Cache.getProperty("VERSION") + "; last updated: "
- + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown"));
+ StringBuffer message = getAboutMessage(false);
+ JOptionPane.showInternalMessageDialog(Desktop.desktop,
- if (!jalview.bin.Cache.getProperty("LATEST_VERSION").equals(
- jalview.bin.Cache.getProperty("VERSION")))
+ message.toString(), "About Jalview", JOptionPane.INFORMATION_MESSAGE);
+ }
+
+ public StringBuffer getAboutMessage(boolean shortv)
+ {
+ StringBuffer message = new StringBuffer();
+ message.append("");
+ if (shortv)
{
- message.append("\n\n!! Jalview version "
- + jalview.bin.Cache.getProperty("LATEST_VERSION")
- + " is available for download from "+jalview.bin.Cache.getDefault("www.jalview.org","http://www.jalview.org")+" !!\n");
+ message.append("Jalview "
+ + jalview.bin.Cache.getProperty("VERSION")
+ + "
");
+ message.append("Last Updated: "
+ + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown")
+ + "");
}
- // TODO: update this text for each release or centrally store it for lite
- // and application
- message.append("\nAuthors: Jim Procter, Jan Engelhardt, Lauren Lui, Andrew Waterhouse, Michele Clamp, James Cuff, Steve Searle,\n David Martin & Geoff Barton."
- + "\nDevelopment managed by The Barton Group, University of Dundee, Scotland, UK.\n"
- + "\nFor help, see the FAQ at www.jalview.org and/or join the jalview-discuss@jalview.org mailing list\n"
- + "\nIf you use Jalview, please cite:"
- + "\nWaterhouse, A.M., Procter, J.B., Martin, D.M.A, Clamp, M. and Barton, G. J. (2009)"
- + "\nJalview Version 2 - a multiple sequence alignment editor and analysis workbench"
- + "\nBioinformatics doi: 10.1093/bioinformatics/btp033");
- JOptionPane.showInternalMessageDialog(Desktop.desktop,
+ else
+ {
- message.toString(), "About Jalview", JOptionPane.INFORMATION_MESSAGE);
+ message.append("Jalview version "
+ + jalview.bin.Cache.getProperty("VERSION")
+ + "; last updated: "
+ + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown"));
+ }
+
+ if (jalview.bin.Cache.getDefault("LATEST_VERSION", "Checking").equals(
+ "Checking"))
+ {
+ message.append("
...Checking latest version...");
+ }
+ else if (!jalview.bin.Cache.getDefault("LATEST_VERSION", "Checking")
+ .equals(jalview.bin.Cache.getProperty("VERSION")))
+ {
+ boolean red = false;
+ if (jalview.bin.Cache.getProperty("VERSION").toLowerCase()
+ .indexOf("automated build") == -1)
+ {
+ red = true;
+ // Displayed when code version and jnlp version do not match and code
+ // version is not a development build
+ message.append("");
+ }
+
+ message.append("
!! 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") + " !!");
+ if (red)
+ {
+ message.append("
");
+ }
+ }
+ message.append("
Authors: "
+ + jalview.bin.Cache
+ .getDefault(
+ "AUTHORNAMES",
+ "Jim Procter, Andrew Waterhouse, Jan Engelhardt, Lauren Lui, Michele Clamp, James Cuff, Steve Searle, David Martin & Geoff Barton")
+ + "
Development managed by The Barton Group, University of Dundee, Scotland, UK.
"
+ + "
For help, see the FAQ at www.jalview.org and/or join the jalview-discuss@jalview.org mailing list"
+ + "
If you use Jalview, please cite:"
+ + "
Waterhouse, A.M., Procter, J.B., Martin, D.M.A, Clamp, M. and Barton, G. J. (2009)"
+ + "
Jalview Version 2 - a multiple sequence alignment editor and analysis workbench"
+ + "
Bioinformatics doi: 10.1093/bioinformatics/btp033"
+ + "");
+ return message;
}
/**
@@ -1578,7 +1639,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
source.viewport.gatherViewsHere = true;
source.viewport.explodedPosition = source.getBounds();
JInternalFrame[] frames = desktop.getAllFrames();
- String viewId = source.viewport.sequenceSetID;
+ String viewId = source.viewport.getSequenceSetId();
for (int t = 0; t < frames.length; t++)
{
@@ -2052,7 +2113,6 @@ public class Desktop extends jalview.jbgui.GDesktop implements
}
}
}
-
}
/**