Add more keys
authoramwaterhouse <Andrew Waterhouse>
Tue, 21 Nov 2006 17:14:40 +0000 (17:14 +0000)
committeramwaterhouse <Andrew Waterhouse>
Tue, 21 Nov 2006 17:14:40 +0000 (17:14 +0000)
src/jalview/appletgui/AlignFrame.java

index 7b0eb2e..4d9a419 100755 (executable)
@@ -208,9 +208,9 @@ public class AlignFrame extends Frame implements ActionListener,
         }\r
         break;\r
       case KeyEvent.VK_V:\r
-        if (evt.isControlDown() || evt.isMetaDown())\r
+        if (evt.isControlDown())\r
         {\r
-          paste(true);\r
+          paste(evt.isShiftDown());\r
         }\r
         break;\r
       case KeyEvent.VK_A:\r
@@ -266,8 +266,7 @@ public class AlignFrame extends Frame implements ActionListener,
         {\r
           alignPanel.seqPanel.deleteGapAtCursor(evt.isControlDown()\r
                                                 || evt.isShiftDown()\r
-                                                || evt.isAltDown()\r
-              );\r
+                                                || evt.isAltDown());\r
         }\r
        else\r
         {\r
@@ -319,7 +318,6 @@ public class AlignFrame extends Frame implements ActionListener,
          alignPanel.seqPanel.seqCanvas.cursorX = viewport.startRes;\r
          alignPanel.seqPanel.seqCanvas.cursorY = viewport.startSeq;\r
        }\r
-       alignPanel.seqPanel.seqCanvas.repaint();\r
        break;\r
 \r
       case KeyEvent.VK_F:\r
@@ -328,6 +326,7 @@ public class AlignFrame extends Frame implements ActionListener,
           findMenuItem_actionPerformed();\r
         }\r
         break;\r
+\r
       case KeyEvent.VK_H:\r
       {\r
         boolean toggleSeqs = !evt.isControlDown();\r
@@ -357,10 +356,9 @@ public class AlignFrame extends Frame implements ActionListener,
           else if (!hide)\r
             viewport.showAllHiddenColumns();\r
         }\r
-\r
-        alignPanel.repaint();\r
         break;\r
       }\r
+\r
       case KeyEvent.VK_PAGE_UP:\r
         if (viewport.wrapAlignment)\r
           alignPanel.scrollUp(true);\r
@@ -369,6 +367,7 @@ public class AlignFrame extends Frame implements ActionListener,
                                      viewport.startSeq\r
                                      - viewport.endSeq + viewport.startSeq);\r
         break;\r
+\r
       case KeyEvent.VK_PAGE_DOWN:\r
         if (viewport.wrapAlignment)\r
           alignPanel.scrollUp(false);\r
@@ -377,7 +376,64 @@ public class AlignFrame extends Frame implements ActionListener,
                                      viewport.startSeq\r
                                      + viewport.endSeq - viewport.startSeq);\r
         break;\r
+\r
+      case KeyEvent.VK_Z:\r
+        if (evt.isControlDown())\r
+        {\r
+          undoMenuItem_actionPerformed();\r
+        }\r
+        break;\r
+\r
+      case KeyEvent.VK_Y:\r
+        if (evt.isControlDown())\r
+        {\r
+          redoMenuItem_actionPerformed();\r
+        }\r
+        break;\r
+\r
+      case KeyEvent.VK_L:\r
+        if (evt.isControlDown())\r
+        {\r
+          trimAlignment(true);\r
+        }\r
+        break;\r
+\r
+      case KeyEvent.VK_R:\r
+        if (evt.isControlDown())\r
+        {\r
+          trimAlignment(false);\r
+        }\r
+        break;\r
+\r
+      case KeyEvent.VK_E:\r
+        if (evt.isControlDown())\r
+        {\r
+          if (evt.isShiftDown())\r
+            this.removeAllGapsMenuItem_actionPerformed();\r
+          else\r
+            removeGappedColumnMenuItem_actionPerformed();\r
+        }\r
+        break;\r
+      case KeyEvent.VK_I:\r
+        if (evt.isControlDown())\r
+        {\r
+          if (evt.isAltDown())\r
+            viewport.invertColumnSelection();\r
+          else\r
+            this.invertSequenceMenuItem_actionPerformed();\r
+        }\r
+        break;\r
+\r
+      case KeyEvent.VK_U:\r
+      if (evt.isControlDown())\r
+      {\r
+       this.deleteGroups_actionPerformed();\r
       }\r
+      break;\r
+\r
+\r
+      }\r
+      alignPanel.repaint();\r
   }\r
   public void keyReleased(KeyEvent evt)\r
   {}\r
@@ -707,6 +763,9 @@ public void itemStateChanged(ItemEvent evt)
    */\r
   protected void undoMenuItem_actionPerformed()\r
   {\r
+    if(viewport.historyList.size()<1)\r
+      return;\r
+\r
     CommandI command = (CommandI)viewport.historyList.pop();\r
     viewport.redoList.push(command);\r
     command.undoCommand();\r