pid and conservation changes

[jalview.git] / src / jalview / gui / Desktop.java

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 6baa2bb..5076243 100755 (executable)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -47,11 +47,16 @@ public class Desktop extends jalview.jbgui.GDesktop implements DropTargetListene
     setTitle("Jalview 2005");\r
     setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);\r
     desktop = new JDesktopPane();\r
-    desktop.setBackground(new Color(220,220,230));\r
+ //   desktop.setBackground(Color.white);\r
     setContentPane(desktop);\r
     desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);\r
+\r
+\r
+    // This line prevents Windows Look&Feel resizing all new windows to maximum\r
+    // if previous window was maximised\r
     desktop.setDesktopManager( new DefaultDesktopManager() );\r
 \r
+\r
     Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();\r
     String x = jalview.bin.Cache.getProperty("SCREEN_X");\r
     String y = jalview.bin.Cache.getProperty("SCREEN_Y");\r
@@ -110,20 +115,27 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
     frame.setVisible(true);\r
 \r
   }\r
-\r
   public static void addInternalFrame(final JInternalFrame frame, String title, int w, int h)\r
   {\r
+    addInternalFrame(frame, title, w, h, true);\r
+  }\r
+\r
+  public static void addInternalFrame(final JInternalFrame frame, String title,\r
+                                      int w,\r
+                                      int h,\r
+                                      boolean resizable )\r
+  {\r
    desktop.add(frame);\r
    openFrameCount++;\r
    try {\r
        frame.setSelected(true);\r
    } catch (java.beans.PropertyVetoException e) {}\r
    frame.setTitle(title);\r
-   frame.setResizable(true);\r
    frame.setSize(w,h);\r
    frame.setClosable(true);\r
-   frame.setMaximizable(true);\r
-   frame.setIconifiable(true);\r
+   frame.setResizable(resizable);\r
+   frame.setMaximizable(resizable);\r
+   frame.setIconifiable(resizable);\r
    frame.setFrameIcon(null);\r
    frame.setLocation(xOffset*openFrameCount, yOffset*openFrameCount);\r
    frame.toFront();\r
@@ -201,7 +213,7 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
    if (sequences != null && sequences.length>0)\r
    {\r
      AlignFrame af = new AlignFrame(new Alignment(sequences));\r
-     addInternalFrame(af, file, 700, 500);\r
+     addInternalFrame(af, file, AlignFrame.NEW_WINDOW_WIDTH, AlignFrame.NEW_WINDOW_HEIGHT);\r
      af.statusBar.setText("Successfully loaded file " + file);\r
 \r
    }\r
@@ -257,7 +269,9 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
       if(sequences!=null)\r
       {\r
         AlignFrame af = new AlignFrame(new Alignment(sequences));\r
-        addInternalFrame(af, "Cut & Paste input - "+format, 700, 500);\r
+        addInternalFrame(af, "Cut & Paste input - "+format,\r
+                         AlignFrame.NEW_WINDOW_WIDTH,\r
+                         AlignFrame.NEW_WINDOW_HEIGHT);\r
         af.statusBar.setText("Successfully pasted alignment file");\r
       }\r
       else\r
@@ -313,93 +327,4 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
      ex.printStackTrace();\r
    }\r
  }\r
-\r
- static JInternalFrame conservationSlider;\r
- static JInternalFrame PIDSlider;\r
- public static int setConservationSliderSource(AlignmentPanel ap, ColourSchemeI cs, String source)\r
- {\r
-   SliderPanel sp = null;\r
-   ConservationColourScheme ccs = (ConservationColourScheme)cs;\r
-   int value = ccs.inc;\r
-\r
-   if(conservationSlider == null)\r
-   {\r
-     sp = new SliderPanel(ap, value, true, cs);\r
-     conservationSlider = new JInternalFrame();\r
-     conservationSlider.setContentPane(sp);\r
-     addInternalFrame(conservationSlider, "Conservation Colour Increment  ("+source+")", 420, 90);\r
-     conservationSlider.setResizable(false);\r
-     conservationSlider.setMaximizable(false);\r
-     conservationSlider.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter()\r
-                  {\r
-                    public void internalFrameClosed(javax.swing.event.InternalFrameEvent e)\r
-                    {\r
-                      conservationSlider = null;\r
-                    }\r
-                  });\r
-   }\r
-   else\r
-   {\r
-\r
-       conservationSlider.setTitle("Conservation Colour Increment  ("+source+")");\r
-       sp = (SliderPanel)conservationSlider.getContentPane();\r
-       sp.cs = cs;\r
-       sp.setValue(value);\r
-   }\r
-\r
-   if(ap.av.alignment.getGroups()!=null)\r
-     sp.setAllGroupsCheckEnabled( true );\r
-   else\r
-     sp.setAllGroupsCheckEnabled( false);\r
-\r
-   return sp.getValue();\r
-\r
- }\r
-\r
- public static void hideConservationSlider()\r
- {\r
-  try{\r
-    conservationSlider.setClosed(true);\r
-    conservationSlider = null;\r
-  }catch(Exception ex){}\r
-}\r
-\r
-\r
- public static void hidePIDSlider()\r
- {\r
-   try{\r
-     PIDSlider.setClosed(true);\r
-     PIDSlider = null;\r
-   }catch(Exception ex){}\r
- }\r
-\r
- public static int setPIDSliderSource(AlignmentPanel ap, ColourSchemeI cs, String source)\r
- {\r
-   SliderPanel pid = null;\r
-   if(PIDSlider == null)\r
-   {\r
-     pid = new SliderPanel(ap, 50, false, cs);\r
-     PIDSlider = new JInternalFrame();\r
-     PIDSlider.setContentPane(pid);\r
-     addInternalFrame(PIDSlider, "Percentage Identity Threshold ("+source+")", 420, 90);\r
-     PIDSlider.setResizable(false);\r
-     PIDSlider.setMaximizable(false);\r
-   }\r
-   else\r
-   {\r
-       PIDSlider.setTitle("Percentage Identity Threshold ("+source+")");\r
-       pid = (SliderPanel)PIDSlider.getContentPane();\r
-       pid.cs = cs;\r
-   }\r
-\r
-   if (ap.av.alignment.getGroups() != null)\r
-     pid.setAllGroupsCheckEnabled(true);\r
-   else\r
-     pid.setAllGroupsCheckEnabled(false);\r
-\r
-\r
-   return pid.getValue();\r
-\r
- }\r
-\r
 }\r