X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=e6200d937b9cc3dd6992550e7df1d3dd785fc3f1;hb=e5f2de91dc41062d8cee8a2a900710f63cf5ae42;hp=eb62972e6dbefa8f5e2e7e81a99e632cb4371855;hpb=e61219eaa31557203fa518aa03cba2cc651e1b84;p=jalview.git

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index eb62972..e6200d9 100755
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -136,7 +136,7 @@ public class Desktop extends jalview.jbgui.GDesktop
         VamsasMenu.setVisible(true);
         vamsasLoad.setVisible(true);
       }
-      
+
     }
 
     /**
@@ -551,6 +551,68 @@ public class Desktop extends jalview.jbgui.GDesktop
         }
     }
 
+    public void closeAll_actionPerformed(ActionEvent e)
+    {
+      JInternalFrame [] frames = desktop.getAllFrames();
+      for(int i=0; i<frames.length; i++)
+      {
+        try{
+        frames[i].setClosed(true);
+      }catch(java.beans.PropertyVetoException ex){}
+      }
+    }
+
+    public void raiseRelated_actionPerformed(ActionEvent e)
+    {
+      reorderAssociatedWindows(false);
+    }
+
+    public void minimizeAssociated_actionPerformed(ActionEvent e)
+    {
+      reorderAssociatedWindows(true);
+    }
+
+    void reorderAssociatedWindows(boolean minimize)
+    {
+      JInternalFrame[] frames = desktop.getAllFrames();
+      if (frames == null)
+        return;
+
+      AlignViewport source = null, target = null;
+      if (frames[0] instanceof AlignFrame)
+        source = ( (AlignFrame) frames[0]).getCurrentView();
+      else if (frames[0] instanceof TreePanel)
+        source = ( (TreePanel) frames[0]).getViewPort();
+      else if (frames[0] instanceof PCAPanel)
+        source = ( (PCAPanel) frames[0]).av;
+
+      if (source != null)
+        for (int i = 0; i < frames.length; i++)
+        {
+          target = null;
+          if (frames[i] instanceof AlignFrame)
+            target = ( (AlignFrame) frames[i]).getCurrentView();
+          else if (frames[i] instanceof TreePanel)
+            target = ( (TreePanel) frames[i]).getViewPort();
+          else if (frames[i] instanceof PCAPanel)
+            target = ( (PCAPanel) frames[i]).av;
+
+          if (source == target)
+          {
+            if(!minimize)
+              frames[i].toFront();
+            try
+            {
+              frames[i].setIcon(minimize);
+            }
+            catch (java.beans.PropertyVetoException ex)
+            {}
+          }
+        }
+    }
+
+
+
     /**
      * DOCUMENT ME!
      *
@@ -699,7 +761,6 @@ public class Desktop extends jalview.jbgui.GDesktop
       int size = af.alignPanels.size();
       if(size<2)
         return;
-      af.closeMenuItem_actionPerformed(null);
 
       for(int i=0; i<size; i++)
       {
@@ -710,24 +771,21 @@ public class Desktop extends jalview.jbgui.GDesktop
 
         ap.av.gatherViewsHere = false;
 
-        PaintRefresher.Register(ap.seqPanel.seqCanvas, ap.av.getSequenceSetId());
-        PaintRefresher.Register(ap.idPanel.idCanvas, ap.av.getSequenceSetId());
-        PaintRefresher.Register(ap, ap.av.getSequenceSetId());
-
-
-        newaf.viewport = ap.av;
         addInternalFrame(newaf, af.getTitle(),
                          AlignFrame.DEFAULT_WIDTH,
                          AlignFrame.DEFAULT_HEIGHT);
       }
 
+      af.alignPanels.clear();
+      af.closeMenuItem_actionPerformed(true);
+
     }
 
     public void gatherViews(AlignFrame source)
     {
       source.viewport.gatherViewsHere = true;
       source.viewport.explodedPosition = source.getBounds();
-      JInternalFrame[] frames = Desktop.desktop.getAllFrames();
+      JInternalFrame[] frames = desktop.getAllFrames();
       String viewId = source.viewport.sequenceSetID;
 
       for (int t = 0; t < frames.length; t++)
@@ -744,11 +802,15 @@ public class Desktop extends jalview.jbgui.GDesktop
               gatherThis = true;
               ap.av.gatherViewsHere = false;
               ap.av.explodedPosition = af.getBounds();
-              source.addAlignmentPanel(ap);
+              source.addAlignmentPanel(ap, false);
             }
           }
+
           if (gatherThis)
-            af.closeMenuItem_actionPerformed(null);
+          {
+            af.alignPanels.clear();
+            af.closeMenuItem_actionPerformed(true);
+          }
         }
       }
 
@@ -796,9 +858,9 @@ public class Desktop extends jalview.jbgui.GDesktop
      */
     public void setVamsasUpdate(boolean b) {
       jalview.bin.Cache.log.debug("Setting gui for Vamsas update "+(b ? "in progress" : "finished"));
-      vamsasLoad.setVisible(!b); 
+      vamsasLoad.setVisible(!b);
       vamsasStop.setVisible(!b);
-      
+
     }
 }