X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=5076243ebae7fc2274c3c0a18a4b620624c3bde7;hb=0cd2dfb5cf9067cfa87dc2ac879626070c42f4c2;hp=6baa2bb92f28de8ae59bd47ebb54cac29cb62ad0;hpb=c1fad33365988bdf8e335982df0c3ff84dd0bb8b;p=jalview.git

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