expand and gather

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

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 6aceffc..6899626 100755 (executable)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -159,7 +159,6 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
 
   void addKeyListener()
   {
-      final AlignFrame af = this;
       addKeyListener(new KeyAdapter()
       {
         public void keyPressed(KeyEvent evt)
@@ -173,17 +172,6 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
 
           switch (evt.getKeyCode())
           {
-            case KeyEvent.VK_G:
-              Desktop.instance.gatherViews(af);
-              break;
-
-            case KeyEvent.VK_X:
-              if (!evt.isControlDown())
-              {
-                Desktop.instance.explodeViews(af);
-              }
-              break;
-
 
             case 27: // escape key
               deselectAllSequenceMenuItem_actionPerformed(null);
@@ -394,6 +382,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
         this.getContentPane().add(tabbedPane, BorderLayout.CENTER);
       }
 
+      expandViews.setEnabled(true);
+      gatherViews.setEnabled(true);
       tabbedPane.addTab(ap.av.viewName==null?"Original":ap.av.viewName, ap);
 
       ap.setVisible(false);
@@ -1733,6 +1723,17 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     tabbedPane.setSelectedIndex(tabbedPane.getTabCount() - 1);
   }
 
+  public void expandViews_actionPerformed(ActionEvent e)
+  {
+        Desktop.instance.explodeViews(this);
+  }
+
+  public void gatherViews_actionPerformed(ActionEvent e)
+  {
+    Desktop.instance.gatherViews(this);
+  }
+
+
 
   /**
    * DOCUMENT ME!