From 553a3df552d02cd08328c3e4044c5f686c012776 Mon Sep 17 00:00:00 2001
From: amwaterhouse <Andrew Waterhouse>
Date: Mon, 20 Nov 2006 18:16:13 +0000
Subject: [PATCH] expand and gather

---
 src/jalview/gui/AlignFrame.java    |   25 ++++++++--------
 src/jalview/jbgui/GAlignFrame.java |   56 +++++++++++++++++++-----------------
 2 files changed, 43 insertions(+), 38 deletions(-)

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