public static JDesktopPane desktop;\r
static int openFrameCount = 0;\r
static final int xOffset = 30, yOffset = 30;\r
- static boolean splashScreenVisible = false;\r
\r
public Desktop()\r
{\r
desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);\r
\r
Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();\r
- setBounds( (int)(screenSize.getWidth()-1200)/2,\r
- (int)(screenSize.getHeight()-800)/2,\r
- 1200 ,\r
- 800);\r
+ int width = 1200, height = 800;\r
+ if(screenSize.getWidth()<width)\r
+ width = screenSize.width;\r
+ if(screenSize.getHeight()<height)\r
+ height = screenSize.height;\r
+\r
+ setBounds( (int)(screenSize.width-width)/2,\r
+ (int)(screenSize.height-height)/2,\r
+ width ,\r
+ height);\r
\r
\r
/////////Add a splashscreen on startup\r
\r
SplashScreen splash = new SplashScreen(frame, image);\r
frame.setContentPane(splash);\r
- addInternalFrame(frame, "",845,200);\r
- splashScreenVisible = true;\r
-\r
+ desktop.add(frame);\r
+ frame.setVisible(true);\r
+ openFrameCount++;\r
+ try\r
+ {\r
+ frame.setSelected(true);\r
+ }\r
+ catch (java.beans.PropertyVetoException e)\r
+ {}\r
+ frame.setResizable(true);\r
+ frame.setSize(845, 200);\r
frame.setLocation( (int)((getWidth()-845) /2), (int)((getHeight()-240) /2));\r
frame.setClosable(false);\r
frame.setIconifiable(false);\r
frame.setMaximizable(false);\r
frame.setFrameIcon(null);\r
- splashScreenVisible = false;\r
\r
}\r
\r
public static void addInternalFrame(final JInternalFrame frame, String title, int w, int h)\r
{\r
- if(!splashScreenVisible)\r
- frame.setVisible(true); //necessary as of 1.3\r
desktop.add(frame);\r
+ frame.setVisible(true);\r
openFrameCount++;\r
try {\r
frame.setSelected(true);\r
\r
}\r
else\r
- JOptionPane.showInternalMessageDialog(this, "Couldn't open file.\n"\r
+ JOptionPane.showInternalMessageDialog(Desktop.desktop, "Couldn't open file.\n"\r
+ "Formats currently supported are\n"\r
+ "Fasta, MSF, Clustal, BLC, PIR, MSP or PFAM"\r
,"Error loading file",\r
\r
public void inputURLMenuItem_actionPerformed(ActionEvent e)\r
{\r
- String url = JOptionPane.showInternalInputDialog(this,"Enter url of input file",\r
+ String url = JOptionPane.showInternalInputDialog(Desktop.desktop,"Enter url of input file",\r
"Input alignment from URL",\r
JOptionPane.QUESTION_MESSAGE);\r
if (url == null)\r
System.out.println(format +" format");\r
if (format.equals("URL NOT FOUND"))\r
{\r
- JOptionPane.showInternalMessageDialog(this,"Couldn't locate " + url,\r
+ JOptionPane.showInternalMessageDialog(Desktop.desktop,"Couldn't locate " + url,\r
"URL not found",\r
JOptionPane.WARNING_MESSAGE);\r
return;\r
public void inputTextboxMenuItem_actionPerformed(ActionEvent e)\r
{\r
CutAndPasteTransfer cap = new CutAndPasteTransfer(true);\r
- int accept = JOptionPane.showInternalOptionDialog(desktop, cap, "Cut & paste Alignment File",\r
+ int accept = JOptionPane.showInternalOptionDialog(Desktop.desktop, cap, "Cut & paste Alignment File",\r
JOptionPane.YES_NO_CANCEL_OPTION,\r
JOptionPane.PLAIN_MESSAGE,\r
null,\r
af.statusBar.setText("Successfully pasted alignment file");\r
}\r
else\r
- JOptionPane.showInternalMessageDialog(this, "Couldn't read the pasted text.\n"\r
+ JOptionPane.showInternalMessageDialog(Desktop.desktop, "Couldn't read the pasted text.\n"\r
+"Formats currently supported are\n"\r
+"Fasta, MSF, Clustal, BLC, PIR, MSP or PFAM",\r
"Error parsing text", JOptionPane.WARNING_MESSAGE);\r
\r
public void aboutMenuItem_actionPerformed(ActionEvent e)\r
{\r
- JOptionPane.showInternalMessageDialog(desktop,\r
+ JOptionPane.showInternalMessageDialog(Desktop.desktop,\r
"JalView 2005"\r
- +"\nAuthors: Michele Clamp, James Cuff, Steve Searle, Andrew Waterhouse and Geoff Barton."\r
+ +"\nAuthors: Michele Clamp, James Cuff, Steve Searle, Andrew Waterhouse, Jim Procter & Geoff Barton."\r
+"\nCurrent development managed by Andrew Waterhouse; Barton Group, University of Dundee."\r
+"\nIf you use JalView, please cite: \"Clamp, M., Cuff, J., Searle, S. M. and Barton, G. J. (2004), The Jalview Java Alignment Editor\"",\r
"About Jalview",\r
public void documentationMenuItem_actionPerformed(ActionEvent e)\r
{\r
try{\r
- jalview.util.BrowserLauncher.openURL("http://jalview.org/documentation.html");\r
+ jalview.util.BrowserLauncher.openURL("http://www.jalview.org/documentation.html");\r
}catch(Exception ex){}\r
}\r
\r