git://source.jalview.org / jalview.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
system.exit or destroy if applet or app
[jalview.git] / src / jalview / gui / Desktop.java
diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index cd01cf8..b0f000e 100755 (executable)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -22,7 +22,6 @@ public class Desktop extends jalview.jbgui.GDesktop
   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
@@ -48,10 +47,16 @@ public class Desktop extends jalview.jbgui.GDesktop
     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
@@ -59,33 +64,29 @@ public class Desktop extends jalview.jbgui.GDesktop
 \r
     SplashScreen splash = new SplashScreen(frame, image);\r
     frame.setContentPane(splash);\r
-    addInternalFrame(frame, "",820,200);\r
-    splashScreenVisible = true;\r
-\r
-    frame.setLocation( (int)((getWidth()-820) /2), (int)((getHeight()-240) /2));\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
-  }\r
 \r
-  public static void splashScreenClosing()\r
-  {\r
-    splashScreenVisible = false;\r
-    JInternalFrame [] frames  = desktop.getAllFrames();\r
-    for(int i=0; i<frames.length; i++)\r
-    {\r
-      frames[i].invalidate();\r
-      frames[i].setVisible(true);\r
-      frames[i].validate();\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
@@ -152,7 +153,7 @@ public class Desktop extends jalview.jbgui.GDesktop
 \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
@@ -162,7 +163,7 @@ public class Desktop extends jalview.jbgui.GDesktop
 \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
@@ -173,7 +174,7 @@ public class Desktop extends jalview.jbgui.GDesktop
    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
@@ -185,7 +186,7 @@ public class Desktop extends jalview.jbgui.GDesktop
  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
@@ -208,7 +209,7 @@ public class Desktop extends jalview.jbgui.GDesktop
         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
@@ -222,8 +223,10 @@ public class Desktop extends jalview.jbgui.GDesktop
 */\r
  public void quit_actionPerformed(ActionEvent e)\r
  {\r
-   this.setVisible(false);\r
-   System.exit(0);\r
+   if(jalview.bin.Jalview.applet!=null)\r
+     jalview.bin.Jalview.applet.destroy();\r
+    else\r
+      System.exit(0);\r
  }\r
 \r
 \r
@@ -236,9 +239,9 @@ public class Desktop extends jalview.jbgui.GDesktop
 \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
@@ -248,7 +251,7 @@ public class Desktop extends jalview.jbgui.GDesktop
  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