X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=b0f000e75bc9cfd248d819f400b0cf0aaeb0ce9b;hb=028bc343135a72515c6b109eb0deb8d6034ca520;hp=cd01cf80992dba82770b88848738feee7c53f789;hpb=79ec9639d12e785ebcb2299663da267d328f0f32;p=jalview.git

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index cd01cf8..b0f000e 100755
--- 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;
   static int openFrameCount = 0;
   static final int xOffset = 30, yOffset = 30;
-  static boolean splashScreenVisible = false;
 
   public Desktop()
   {
@@ -48,10 +47,16 @@ public class Desktop extends jalview.jbgui.GDesktop
     desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);
 
     Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-    setBounds( (int)(screenSize.getWidth()-1200)/2,
-               (int)(screenSize.getHeight()-800)/2,
-              1200 ,
-              800);
+    int width = 1200, height = 800;
+    if(screenSize.getWidth()<width)
+      width = screenSize.width;
+    if(screenSize.getHeight()<height)
+      height = screenSize.height;
+
+    setBounds( (int)(screenSize.width-width)/2,
+               (int)(screenSize.height-height)/2,
+              width ,
+              height);
 
 
    /////////Add a splashscreen on startup
@@ -59,33 +64,29 @@ public class Desktop extends jalview.jbgui.GDesktop
 
     SplashScreen splash = new SplashScreen(frame, image);
     frame.setContentPane(splash);
-    addInternalFrame(frame, "",820,200);
-    splashScreenVisible = true;
-
-    frame.setLocation( (int)((getWidth()-820) /2), (int)((getHeight()-240) /2));
+    desktop.add(frame);
+    frame.setVisible(true);
+    openFrameCount++;
+    try
+    {
+      frame.setSelected(true);
+    }
+    catch (java.beans.PropertyVetoException e)
+    {}
+    frame.setResizable(true);
+    frame.setSize(845, 200);
+    frame.setLocation( (int)((getWidth()-845) /2), (int)((getHeight()-240) /2));
     frame.setClosable(false);
     frame.setIconifiable(false);
     frame.setMaximizable(false);
     frame.setFrameIcon(null);
-  }
 
-  public static void splashScreenClosing()
-  {
-    splashScreenVisible = false;
-    JInternalFrame [] frames  = desktop.getAllFrames();
-    for(int i=0; i<frames.length; i++)
-    {
-      frames[i].invalidate();
-      frames[i].setVisible(true);
-      frames[i].validate();
-    }
   }
 
   public static void addInternalFrame(final JInternalFrame frame, String title, int w, int h)
   {
-   if(!splashScreenVisible)
-      frame.setVisible(true); //necessary as of 1.3
    desktop.add(frame);
+   frame.setVisible(true);
    openFrameCount++;
    try {
        frame.setSelected(true);
@@ -152,7 +153,7 @@ public class Desktop extends jalview.jbgui.GDesktop
 
    }
    else
-     JOptionPane.showInternalMessageDialog(this,  "Couldn't open file.\n"
+     JOptionPane.showInternalMessageDialog(Desktop.desktop,  "Couldn't open file.\n"
                           + "Formats currently supported are\n"
                           + "Fasta, MSF, Clustal, BLC, PIR, MSP or PFAM"
                           ,"Error loading file",
@@ -162,7 +163,7 @@ public class Desktop extends jalview.jbgui.GDesktop
 
  public void inputURLMenuItem_actionPerformed(ActionEvent e)
  {
-   String url = JOptionPane.showInternalInputDialog(this,"Enter url of input file",
+   String url = JOptionPane.showInternalInputDialog(Desktop.desktop,"Enter url of input file",
                                             "Input alignment from URL",
                                             JOptionPane.QUESTION_MESSAGE);
    if (url == null)
@@ -173,7 +174,7 @@ public class Desktop extends jalview.jbgui.GDesktop
    System.out.println(format +" format");
    if (format.equals("URL NOT FOUND"))
    {
-     JOptionPane.showInternalMessageDialog(this,"Couldn't locate " + url,
+     JOptionPane.showInternalMessageDialog(Desktop.desktop,"Couldn't locate " + url,
                                    "URL not found",
                                    JOptionPane.WARNING_MESSAGE);
      return;
@@ -185,7 +186,7 @@ public class Desktop extends jalview.jbgui.GDesktop
  public void inputTextboxMenuItem_actionPerformed(ActionEvent e)
  {
    CutAndPasteTransfer cap = new CutAndPasteTransfer(true);
-   int accept =  JOptionPane.showInternalOptionDialog(desktop, cap, "Cut & paste Alignment File",
+   int accept =  JOptionPane.showInternalOptionDialog(Desktop.desktop, cap, "Cut & paste Alignment File",
                                        JOptionPane.YES_NO_CANCEL_OPTION,
                                        JOptionPane.PLAIN_MESSAGE,
                                        null,
@@ -208,7 +209,7 @@ public class Desktop extends jalview.jbgui.GDesktop
         af.statusBar.setText("Successfully pasted alignment file");
       }
       else
-        JOptionPane.showInternalMessageDialog(this, "Couldn't read the pasted text.\n"
+        JOptionPane.showInternalMessageDialog(Desktop.desktop, "Couldn't read the pasted text.\n"
                                       +"Formats currently supported are\n"
                                       +"Fasta, MSF, Clustal, BLC, PIR, MSP or PFAM",
                                       "Error parsing text", JOptionPane.WARNING_MESSAGE);
@@ -222,8 +223,10 @@ public class Desktop extends jalview.jbgui.GDesktop
 */
  public void quit_actionPerformed(ActionEvent e)
  {
-   this.setVisible(false);
-   System.exit(0);
+   if(jalview.bin.Jalview.applet!=null)
+     jalview.bin.Jalview.applet.destroy();
+    else
+      System.exit(0);
  }
 
 
@@ -236,9 +239,9 @@ public class Desktop extends jalview.jbgui.GDesktop
 
  public void aboutMenuItem_actionPerformed(ActionEvent e)
  {
-   JOptionPane.showInternalMessageDialog(desktop,
+   JOptionPane.showInternalMessageDialog(Desktop.desktop,
                                          "JalView 2005"
-                                       +"\nAuthors:  Michele Clamp, James Cuff, Steve Searle, Andrew Waterhouse and Geoff Barton."
+                                       +"\nAuthors:  Michele Clamp, James Cuff, Steve Searle, Andrew Waterhouse, Jim Procter & Geoff Barton."
                                        +"\nCurrent development managed by Andrew Waterhouse; Barton Group, University of Dundee."
                                        +"\nIf  you use JalView, please cite:  \"Clamp, M., Cuff, J., Searle, S. M. and Barton, G. J. (2004), The Jalview Java Alignment Editor\"",
                                          "About Jalview",
@@ -248,7 +251,7 @@ public class Desktop extends jalview.jbgui.GDesktop
  public void documentationMenuItem_actionPerformed(ActionEvent e)
  {
    try{
-     jalview.util.BrowserLauncher.openURL("http://jalview.org/documentation.html");
+     jalview.util.BrowserLauncher.openURL("http://www.jalview.org/documentation.html");
    }catch(Exception ex){}
  }