X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAlignFrame.java;h=64423b0ddbdeb2f5faeadfbd1936df01960c79b3;hb=6bfaf3d3a82e4eece77dc1c2d83aede7c4dbb690;hp=d72c665d133a587203c012623269f48a1d8cf816;hpb=8c1d1e78607436d66bb90bbf4299e97854967d9c;p=jalview.git

diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java
index d72c665..64423b0 100755
--- a/src/jalview/appletgui/AlignFrame.java
+++ b/src/jalview/appletgui/AlignFrame.java
@@ -110,6 +110,8 @@ public class AlignFrame extends Frame implements ActionListener,
    this.addKeyListener(this);
    alignPanel.seqPanel.seqCanvas.addKeyListener(this);
    alignPanel.idPanel.idCanvas.addKeyListener(this);
+   alignPanel.scalePanel.addKeyListener(this);
+   alignPanel.annotationPanel.addKeyListener(this);
 
     viewport.addPropertyChangeListener(new java.beans.PropertyChangeListener()
     {
@@ -327,6 +329,27 @@ public class AlignFrame extends Frame implements ActionListener,
           findMenuItem_actionPerformed();
         }
         break;
+      case KeyEvent.VK_H:
+      {
+        SequenceGroup sg = viewport.getSelectionGroup();
+        boolean hide = false;
+        if (sg != null && sg.getSize(false) != viewport.alignment.getHeight())
+        {
+          hide = true;
+          viewport.hideAllSelectedSeqs();
+        }
+        else if (viewport.colSel.getSelected().size() < 1)
+          viewport.showAllHiddenSeqs();
+
+        if (viewport.colSel.getSelected().size() > 0)
+          viewport.hideSelectedColumns();
+        else if (!hide)
+          viewport.showAllHiddenColumns();
+
+        alignPanel.repaint();
+        break;
+      }
+
     }
   }
   public void keyReleased(KeyEvent evt)
@@ -415,7 +438,7 @@ public void itemStateChanged(ItemEvent evt)
     else if(source==invertSequenceMenuItem)
             invertSequenceMenuItem_actionPerformed();
     else if(source==invertColSel)
-    { viewport.invertColumnSelection(); repaint(); }
+    { viewport.invertColumnSelection(); alignPanel.repaint(); }
     else if(source==remove2LeftMenuItem)
             remove2LeftMenuItem_actionPerformed();
     else if(source==remove2RightMenuItem)
@@ -430,28 +453,19 @@ public void itemStateChanged(ItemEvent evt)
             font_actionPerformed();
     else if(source==showColumns)
     {
-      viewport.showAllHiddenColumns(); repaint();
+      viewport.showAllHiddenColumns(); alignPanel.repaint();
     }
     else if(source==showSeqs)
     {
-      viewport.showAllHiddenSeqs(); repaint();
+      viewport.showAllHiddenSeqs();
     }
     else if(source == hideColumns)
     {
-      viewport.hideSelectedColumns(); repaint();
+      viewport.hideSelectedColumns(); alignPanel.repaint();
     }
     else if(source == hideSequences && viewport.getSelectionGroup()!=null)
     {
-      SequenceI[] seqs = viewport.getSelectionGroup().getSequencesInOrder(
-          viewport.alignment
-          );
-
-      for (int i = 0; i < seqs.length; i++)
-      {
-        viewport.hideSequence(seqs[i]);
-      }
-
-      alignPanel.repaint();
+      viewport.hideAllSelectedSeqs();
     }
     else if(source==featureSettings)
             featureSettings_actionPerformed();
@@ -1257,6 +1271,7 @@ public void itemStateChanged(ItemEvent evt)
     alignPanel.repaint();
   }
 
+
   protected void scaleAbove_actionPerformed()
   {
     viewport.setScaleAboveWrapped(scaleAbove.getState());
@@ -1937,12 +1952,11 @@ public void itemStateChanged(ItemEvent evt)
       MenuItem item;
 
       // dynamically fill save as menu with available formats
-      for (int i = 0; i < jalview.io.AppletFormatAdapter.formats.size(); i++)
+      for (int i = 0; i < jalview.io.AppletFormatAdapter.WRITEABLE_FORMATS.length; i++)
       {
 
-        item = new MenuItem( (String) jalview.io.AppletFormatAdapter.formats.
-                            elementAt(
-                                i));
+        item = new MenuItem( jalview.io.AppletFormatAdapter.WRITEABLE_FORMATS[i]);
+
         item.addActionListener(new java.awt.event.ActionListener()
         {
           public void actionPerformed(ActionEvent e)