expand and gather

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!

diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index 9067247..f4502e5 100755 (executable)
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@ -144,9 +144,9 @@ public class GAlignFrame
   protected JMenuItem reload = new JMenuItem();\r
   JMenuItem newView = new JMenuItem();\r
   JMenuItem textColour = new JMenuItem();\r
-  JMenu jMenu1 = new JMenu();\r
+  JMenu formatMenu = new JMenu();\r
   JCheckBoxMenuItem jCheckBoxMenuItem1 = new JCheckBoxMenuItem();\r
-  JMenu jMenu4 = new JMenu();\r
+  JMenu selectMenu = new JMenu();\r
   protected JCheckBoxMenuItem idRightAlign = new JCheckBoxMenuItem();\r
   protected JMenuItem gatherViews = new JMenuItem();\r
   protected JMenuItem expandViews = new JMenuItem();\r
@@ -1175,9 +1175,9 @@ public class GAlignFrame
         textColour_actionPerformed(e);\r
       }\r
     });\r
-    jMenu1.setText("Format");\r
+    formatMenu.setText("Format");\r
     jCheckBoxMenuItem1.setText("Right Align Ids");\r
-    jMenu4.setText("Select");\r
+    selectMenu.setText("Select");\r
     idRightAlign.setText("Right Align Sequence Id");\r
     idRightAlign.addActionListener(new ActionListener()\r
     {\r
@@ -1188,6 +1188,8 @@ public class GAlignFrame
     });\r
     gatherViews.setEnabled(false);\r
     gatherViews.setText("Gather Views");\r
+    gatherViews.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.\r
+        event.KeyEvent.VK_G, 0, false));\r
     gatherViews.addActionListener(new ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -1197,6 +1199,8 @@ public class GAlignFrame
     });\r
     expandViews.setEnabled(false);\r
     expandViews.setText("Expand Views");\r
+    expandViews.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.\r
+        event.KeyEvent.VK_X, 0, false));\r
     expandViews.addActionListener(new ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -1207,9 +1211,9 @@ public class GAlignFrame
 \r
     alignFrameMenuBar.add(fileMenu);\r
     alignFrameMenuBar.add(editMenu);\r
-    alignFrameMenuBar.add(jMenu4);\r
+    alignFrameMenuBar.add(selectMenu);\r
     alignFrameMenuBar.add(viewMenu);\r
-    alignFrameMenuBar.add(jMenu1);\r
+    alignFrameMenuBar.add(formatMenu);\r
     alignFrameMenuBar.add(colourMenu);\r
     alignFrameMenuBar.add(calculateMenu);\r
     alignFrameMenuBar.add(webService);\r
@@ -1310,26 +1314,26 @@ public class GAlignFrame
     jMenu3.add(showAllSeqs);\r
     hideMenu.add(hideSelColumns);\r
     hideMenu.add(hideSelSequences);\r
-    jMenu1.add(font);\r
-    jMenu1.addSeparator();\r
-    jMenu1.add(wrapMenuItem);\r
-    jMenu1.add(scaleAbove);\r
-    jMenu1.add(scaleLeft);\r
-    jMenu1.add(scaleRight);\r
-    jMenu1.add(seqLimits);\r
-    jMenu1.add(idRightAlign);\r
-    jMenu1.add(hiddenMarkers);\r
-    jMenu1.add(viewBoxesMenuItem);\r
-    jMenu1.add(viewTextMenuItem);\r
-    jMenu1.add(colourTextMenuItem);\r
-    jMenu1.add(renderGapsMenuItem);\r
-    jMenu4.add(findMenuItem);\r
-    jMenu4.addSeparator();\r
-    jMenu4.add(selectAllSequenceMenuItem);\r
-    jMenu4.add(deselectAllSequenceMenuItem);\r
-    jMenu4.add(invertSequenceMenuItem);\r
-    jMenu4.add(invertColSel);\r
-    jMenu4.add(deleteGroups);\r
+    formatMenu.add(font);\r
+    formatMenu.addSeparator();\r
+    formatMenu.add(wrapMenuItem);\r
+    formatMenu.add(scaleAbove);\r
+    formatMenu.add(scaleLeft);\r
+    formatMenu.add(scaleRight);\r
+    formatMenu.add(seqLimits);\r
+    formatMenu.add(idRightAlign);\r
+    formatMenu.add(hiddenMarkers);\r
+    formatMenu.add(viewBoxesMenuItem);\r
+    formatMenu.add(viewTextMenuItem);\r
+    formatMenu.add(colourTextMenuItem);\r
+    formatMenu.add(renderGapsMenuItem);\r
+    selectMenu.add(findMenuItem);\r
+    selectMenu.addSeparator();\r
+    selectMenu.add(selectAllSequenceMenuItem);\r
+    selectMenu.add(deselectAllSequenceMenuItem);\r
+    selectMenu.add(invertSequenceMenuItem);\r
+    selectMenu.add(invertColSel);\r
+    selectMenu.add(deleteGroups);\r
   }\r
 \r
   protected void outputText_actionPerformed(ActionEvent e)\r