X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=b47ca4b043a8af06665a93a54e17a679a53a1b7a;hb=5f7d80cd8b01e051a6175b0ce8db0ad94d73df2f;hp=4156fa2b3de8acfcfd0bbe6e6be1b2b5f925b63c;hpb=f0c4c7517ae29233a1afbfefdb1a104917f996ee;p=jalview.git

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 4156fa2..b47ca4b 100755
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -12,6 +12,7 @@ package jalview.gui;
 import jalview.gui.*;
 import jalview.io.*;
 import jalview.datamodel.*;
+import jalview.schemes.*;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
@@ -22,7 +23,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 +48,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,23 +65,29 @@ public class Desktop extends jalview.jbgui.GDesktop
 
     SplashScreen splash = new SplashScreen(frame, image);
     frame.setContentPane(splash);
-    addInternalFrame(frame, "",845,200);
-    splashScreenVisible = true;
-
+    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);
-    splashScreenVisible = false;
 
   }
 
   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);
@@ -113,14 +125,14 @@ public class Desktop extends jalview.jbgui.GDesktop
 
  public void inputLocalFileMenuItem_actionPerformed(ActionEvent e)
  {
-   JFileChooser chooser = new JFileChooser(jalview.bin.Cache.LAST_DIRECTORY);
+   JFileChooser chooser = new JFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
    chooser.setDialogTitle("Open local file");
    chooser.setToolTipText("Open");
    int value = chooser.showOpenDialog(this);
    if(value == JFileChooser.APPROVE_OPTION)
    {
      String choice =  chooser.getSelectedFile().getPath();
-     jalview.bin.Cache.LAST_DIRECTORY = choice;
+     jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice);
      String format = IdentifyFile.Identify(choice, "File");
      LoadFile(choice, "File", format);
    }
@@ -142,7 +154,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",
@@ -152,7 +164,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)
@@ -163,7 +175,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;
@@ -175,7 +187,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,
@@ -198,12 +210,11 @@ 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);
 
-
    }
  }
 
@@ -212,23 +223,19 @@ 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);
  }
 
 
- protected void colourIndexMenuItem_actionPerformed(ActionEvent e)
- {
-   ColourKey colourKey = new ColourKey(null);
-   addInternalFrame(colourKey, "Colour scheme key", 400, 320);
- }
-
 
  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",
@@ -237,10 +244,104 @@ public class Desktop extends jalview.jbgui.GDesktop
 
  public void documentationMenuItem_actionPerformed(ActionEvent e)
  {
+   try
+   {
+      ClassLoader cl = jalview.gui.Desktop.class.getClassLoader();
+      java.net.URL url = javax.help.HelpSet.findHelpSet(cl,"help/help");
+      javax.help.HelpSet hs = new javax.help.HelpSet(cl,url);
+
+      javax.help.HelpBroker hb = hs.createHelpBroker();
+      hb.setLocation(new Point(200, 50));
+      hb.setSize(new Dimension(800,700));
+      hb.setCurrentID("home");
+      hb.setDisplayed(true);
+   }
+   catch (Exception ex)
+   {
+     ex.printStackTrace();
+   }
+ }
+
+ static JInternalFrame conservationSlider;
+ static JInternalFrame PIDSlider;
+ public static int setConservationSliderSource(AlignmentPanel ap, ColourSchemeI cs, String source)
+ {
+   SliderPanel sp = null;
+
+   if(conservationSlider == null)
+   {
+     sp = new SliderPanel(ap, 30, true, cs);
+     conservationSlider = new JInternalFrame();
+     conservationSlider.setContentPane(sp);
+     conservationSlider.setResizable(false);
+     addInternalFrame(conservationSlider, "Conservation Colour Increment  ("+source+")", 420, 90);
+     conservationSlider.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter()
+                  {
+                    public void internalFrameClosed(javax.swing.event.InternalFrameEvent e)
+                    {
+                      conservationSlider = null;
+                    }
+                  });
+   }
+   else
+   {
+       conservationSlider.setTitle("Conservation Colour Increment  ("+source+")");
+       sp = (SliderPanel)conservationSlider.getContentPane();
+       sp.cs = cs;
+   }
+
+   if(ap.av.alignment.getGroups()!=null)
+     sp.setAllGroupsCheckEnabled( true );
+   else
+     sp.setAllGroupsCheckEnabled( false);
+
+   return sp.getValue();
+
+ }
+
+ public static void hideConservationSlider()
+ {
+  try{
+    conservationSlider.setClosed(true);
+    conservationSlider = null;
+  }catch(Exception ex){}
+}
+
+
+ public static void hidePIDSlider()
+ {
    try{
-     jalview.util.BrowserLauncher.openURL("http://jalview.org/documentation.html");
+     PIDSlider.setClosed(true);
+     PIDSlider = null;
    }catch(Exception ex){}
  }
 
+ public static int setPIDSliderSource(AlignmentPanel ap, ColourSchemeI cs, String source)
+ {
+   SliderPanel pid = null;
+   if(PIDSlider == null)
+   {
+     pid = new SliderPanel(ap, 50, false, cs);
+     PIDSlider = new JInternalFrame();
+     PIDSlider.setContentPane(pid);
+     PIDSlider.setResizable(false);
+     addInternalFrame(PIDSlider, "Percentage Identity Threshold ("+source+")", 420, 90);
+   }
+   else
+   {
+       PIDSlider.setTitle("Percentage Identity Threshold ("+source+")");
+       pid = (SliderPanel)PIDSlider.getContentPane();
+       pid.cs = cs;
+   }
+
+   if (ap.av.alignment.getGroups() != null)
+     pid.setAllGroupsCheckEnabled(true);
+   else
+     pid.setAllGroupsCheckEnabled(false);
+
+
+   return pid.getValue();
+
+ }
 
 }