X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=889227f99df0c7848699de2a80c0c2cd89651ae2;hb=d9b5411f1f2cd0acf62eab94188428a754094926;hp=aafd8c0f676307bac0c3b4ed77f774c74a4d2245;hpb=b1bc2a997b0620a85818ed5f6813326c1faae9d3;p=jalview.git

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index aafd8c0..889227f 100755
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -22,14 +22,16 @@ 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()
   {
+    Image image =null;
     try{
       java.net.URL url = getClass().getResource("/BartonGroupBanner.gif");
       if(url!=null)
       {
-        Image image = java.awt.Toolkit.getDefaultToolkit().createImage(url);
+        image = java.awt.Toolkit.getDefaultToolkit().createImage(url);
         MediaTracker mt = new MediaTracker(this);
         mt.addImage(image, 0);
         mt.waitForID(0);
@@ -44,16 +46,41 @@ public class Desktop extends jalview.jbgui.GDesktop
     desktop = new JDesktopPane();
     setContentPane(desktop);
     desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);
-    int inset = 150;
+
     Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-    setBounds(inset, inset,
-              screenSize.width  - inset*2,
-              screenSize.height - inset*2);
+    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
+    JInternalFrame frame = new JInternalFrame();
+
+    SplashScreen splash = new SplashScreen(frame, image);
+    frame.setContentPane(splash);
+    addInternalFrame(frame, "",845,200);
+    splashScreenVisible = true;
+
+    frame.setLocation( (int)((getWidth()-845) /2), (int)((getHeight()-240) /2));
+    frame.setClosable(false);
+    frame.setIconifiable(false);
+    frame.setMaximizable(false);
+    frame.setFrameIcon(null);
+    splashScreenVisible = false;
+
   }
 
   public static void addInternalFrame(final JInternalFrame frame, String title, int w, int h)
   {
-   frame.setVisible(true); //necessary as of 1.3
+   if(!splashScreenVisible)
+      frame.setVisible(true); //necessary as of 1.3
    desktop.add(frame);
    openFrameCount++;
    try {
@@ -109,7 +136,6 @@ public class Desktop extends jalview.jbgui.GDesktop
  {
    SequenceI [] sequences = null;
 
-
    if (FormatProperties.contains(format))
        sequences = FormatAdapter.read(file, protocol, format);
 
@@ -122,7 +148,7 @@ public class Desktop extends jalview.jbgui.GDesktop
 
    }
    else
-     JOptionPane.showMessageDialog(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",
@@ -132,7 +158,7 @@ public class Desktop extends jalview.jbgui.GDesktop
 
  public void inputURLMenuItem_actionPerformed(ActionEvent e)
  {
-   String url = JOptionPane.showInputDialog(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)
@@ -143,7 +169,7 @@ public class Desktop extends jalview.jbgui.GDesktop
    System.out.println(format +" format");
    if (format.equals("URL NOT FOUND"))
    {
-     JOptionPane.showMessageDialog(this,"Couldn't locate " + url,
+     JOptionPane.showInternalMessageDialog(Desktop.desktop,"Couldn't locate " + url,
                                    "URL not found",
                                    JOptionPane.WARNING_MESSAGE);
      return;
@@ -155,7 +181,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,
@@ -178,7 +204,7 @@ public class Desktop extends jalview.jbgui.GDesktop
         af.statusBar.setText("Successfully pasted alignment file");
       }
       else
-        JOptionPane.showMessageDialog(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);
@@ -206,7 +232,7 @@ 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."
                                        +"\nCurrent development managed by Andrew Waterhouse; Barton Group, University of Dundee."