RIght align seq ids
[jalview.git] / src / jalview / jbgui / GAlignFrame.java
index 23c78f3..d032756 100755 (executable)
@@ -1,23 +1,36 @@
-/********************\r
- * 2004 Jalview Reengineered\r
- * Barton Group\r
- * Dundee University\r
+/*\r
+ * Jalview - A Sequence Alignment Editor and Viewer\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
  *\r
- * AM Waterhouse\r
- *******************/\r
-\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ *\r
+ * This program is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program; if not, write to the Free Software\r
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
+ */\r
 package jalview.jbgui;\r
 \r
-import javax.swing.*;\r
-import java.awt.event.*;\r
 import java.awt.*;\r
+import java.awt.event.*;\r
+import javax.swing.*;\r
+import javax.swing.event.*;\r
 \r
-import jalview.gui.Preferences;\r
-import jalview.schemes.ColourSchemeProperty;\r
-import javax.swing.event.AncestorListener;\r
-import javax.swing.event.AncestorEvent;\r
+import jalview.schemes.*;\r
+import java.awt.BorderLayout;\r
 \r
-public class GAlignFrame extends JInternalFrame\r
+\r
+\r
+\r
+public class GAlignFrame\r
+    extends JInternalFrame\r
 {\r
   protected JMenuBar alignFrameMenuBar = new JMenuBar();\r
   protected JMenu fileMenu = new JMenu();\r
@@ -27,6 +40,7 @@ public class GAlignFrame extends JInternalFrame
   protected JMenu colourMenu = new JMenu();\r
   protected JMenu calculateMenu = new JMenu();\r
   protected JMenu webService = new JMenu();\r
+  protected JMenuItem webServiceNoServices;\r
   protected JMenuItem selectAllSequenceMenuItem = new JMenuItem();\r
   protected JMenuItem deselectAllSequenceMenuItem = new JMenuItem();\r
   protected JMenuItem invertSequenceMenuItem = new JMenuItem();\r
@@ -34,8 +48,8 @@ public class GAlignFrame extends JInternalFrame
   protected JMenuItem remove2RightMenuItem = new JMenuItem();\r
   protected JMenuItem removeGappedColumnMenuItem = new JMenuItem();\r
   protected JMenuItem removeAllGapsMenuItem = new JMenuItem();\r
-  protected JCheckBoxMenuItem viewBoxesMenuItem = new JCheckBoxMenuItem();\r
-  protected JCheckBoxMenuItem viewTextMenuItem = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem viewBoxesMenuItem = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem viewTextMenuItem = new JCheckBoxMenuItem();\r
   protected JMenuItem sortPairwiseMenuItem = new JMenuItem();\r
   protected JMenuItem sortIDMenuItem = new JMenuItem();\r
   protected JMenuItem sortGroupMenuItem = new JMenuItem();\r
@@ -44,15 +58,15 @@ public class GAlignFrame extends JInternalFrame
   protected JMenuItem PCAMenuItem = new JMenuItem();\r
   protected JMenuItem averageDistanceTreeMenuItem = new JMenuItem();\r
   protected JMenuItem neighbourTreeMenuItem = new JMenuItem();\r
-  protected JMenuItem clustalAlignMenuItem = new JMenuItem();\r
   BorderLayout borderLayout1 = new BorderLayout();\r
   public JLabel statusBar = new JLabel();\r
-  protected JMenuItem saveAlignmentMenu = new JMenuItem();\r
+  protected JMenuItem saveAs = new JMenuItem();\r
   protected JMenu outputTextboxMenu = new JMenu();\r
   protected JRadioButtonMenuItem clustalColour = new JRadioButtonMenuItem();\r
   protected JRadioButtonMenuItem zappoColour = new JRadioButtonMenuItem();\r
   protected JRadioButtonMenuItem taylorColour = new JRadioButtonMenuItem();\r
-  protected JRadioButtonMenuItem hydrophobicityColour = new JRadioButtonMenuItem();\r
+  protected JRadioButtonMenuItem hydrophobicityColour = new\r
+      JRadioButtonMenuItem();\r
   protected JRadioButtonMenuItem helixColour = new JRadioButtonMenuItem();\r
   protected JRadioButtonMenuItem strandColour = new JRadioButtonMenuItem();\r
   protected JRadioButtonMenuItem turnColour = new JRadioButtonMenuItem();\r
@@ -62,51 +76,167 @@ public class GAlignFrame extends JInternalFrame
   protected JRadioButtonMenuItem BLOSUM62Colour = new JRadioButtonMenuItem();\r
   JMenuItem njTreeBlosumMenuItem = new JMenuItem();\r
   JMenuItem avDistanceTreeBlosumMenuItem = new JMenuItem();\r
-  protected JCheckBoxMenuItem annotationPanelMenuItem = new JCheckBoxMenuItem();\r
-  protected JCheckBoxMenuItem colourTextMenuItem = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem annotationPanelMenuItem = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem colourTextMenuItem = new JCheckBoxMenuItem();\r
   JMenuItem htmlMenuItem = new JMenuItem();\r
   JMenuItem overviewMenuItem = new JMenuItem();\r
   protected JMenuItem undoMenuItem = new JMenuItem();\r
   protected JMenuItem redoMenuItem = new JMenuItem();\r
-  protected JCheckBoxMenuItem conservationMenuItem = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem conservationMenuItem = new JCheckBoxMenuItem();\r
   JRadioButtonMenuItem noColourmenuItem = new JRadioButtonMenuItem();\r
-  protected JCheckBoxMenuItem wrapMenuItem = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem wrapMenuItem = new JCheckBoxMenuItem();\r
   JMenuItem printMenuItem = new JMenuItem();\r
-  protected JCheckBoxMenuItem renderGapsMenuItem = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem renderGapsMenuItem = new JCheckBoxMenuItem();\r
   JMenuItem findMenuItem = new JMenuItem();\r
-  JMenu searchMenu = new JMenu();\r
-  protected JCheckBoxMenuItem abovePIDThreshold = new JCheckBoxMenuItem();\r
-  protected JCheckBoxMenuItem sequenceFeatures = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem abovePIDThreshold = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem showSeqFeatures = new JCheckBoxMenuItem();\r
   protected JRadioButtonMenuItem nucleotideColour = new JRadioButtonMenuItem();\r
   JMenuItem deleteGroups = new JMenuItem();\r
   JMenuItem delete = new JMenuItem();\r
   JMenuItem copy = new JMenuItem();\r
   JMenuItem cut = new JMenuItem();\r
-  JMenu jMenu1 = new JMenu();\r
+  JMenu pasteMenu = new JMenu();\r
   JMenuItem pasteNew = new JMenuItem();\r
   JMenuItem pasteThis = new JMenuItem();\r
-  protected JCheckBoxMenuItem applyToAllGroups = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem applyToAllGroups = new JCheckBoxMenuItem();\r
   JMenuItem createPNG = new JMenuItem();\r
   protected JMenuItem font = new JMenuItem();\r
-  protected JCheckBoxMenuItem fullSeqId = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem seqLimits = new JCheckBoxMenuItem();\r
   JMenuItem epsFile = new JMenuItem();\r
   JMenuItem LoadtreeMenuItem = new JMenuItem();\r
-  JMenuItem jpred = new JMenuItem();\r
-  protected JCheckBoxMenuItem scaleAbove = new JCheckBoxMenuItem();\r
-  protected JCheckBoxMenuItem scaleLeft = new JCheckBoxMenuItem();\r
-  protected JCheckBoxMenuItem scaleRight = new JCheckBoxMenuItem();\r
-  JMenuItem modifyPID = new JMenuItem();\r
-  JMenuItem modifyConservation = new JMenuItem();\r
+  public JCheckBoxMenuItem scaleAbove = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem scaleLeft = new JCheckBoxMenuItem();\r
+  public JCheckBoxMenuItem scaleRight = new JCheckBoxMenuItem();\r
+  protected JMenuItem modifyPID = new JMenuItem();\r
+  protected JMenuItem modifyConservation = new JMenuItem();\r
   protected JMenu sortByTreeMenu = new JMenu();\r
   protected JMenu sort = new JMenu();\r
   JMenu calculate = new JMenu();\r
-  JMenuItem msaAlignMenuItem = new JMenuItem();\r
   JMenu jMenu2 = new JMenu();\r
-  JMenuItem padGapsMenuitem = new JMenuItem();\r
-  JMenuItem ClustalRealign = new JMenuItem();\r
+  protected JCheckBoxMenuItem padGapsMenuitem = new JCheckBoxMenuItem();\r
+  protected ButtonGroup colours = new ButtonGroup();\r
+  JMenuItem vamsasStore = new JMenuItem();\r
+  protected JMenuItem showTranslation = new JMenuItem();\r
+  public JMenuItem featureSettings = new JMenuItem();\r
+  JMenuItem fetchSequence = new JMenuItem();\r
+  JMenuItem annotationColour = new JMenuItem();\r
+  JMenuItem associatedData = new JMenuItem();\r
+  protected JCheckBoxMenuItem autoCalculate = new JCheckBoxMenuItem();\r
+  JMenu addSequenceMenu = new JMenu();\r
+  JMenuItem addFromFile = new JMenuItem();\r
+  JMenuItem addFromText = new JMenuItem();\r
+  JMenuItem addFromURL = new JMenuItem();\r
+  JMenuItem exportAnnotations = new JMenuItem();\r
+  JMenuItem exportFeatures = new JMenuItem();\r
+  protected JPanel statusPanel = new JPanel();\r
+  GridLayout gridLayout1 = new GridLayout();\r
+  JMenu jMenu3 = new JMenu();\r
+  JMenuItem showAllSeqs = new JMenuItem();\r
+  JMenuItem showAllColumns = new JMenuItem();\r
+  JMenu hideMenu = new JMenu();\r
+  JMenuItem hideSelSequences = new JMenuItem();\r
+  JMenuItem hideSelColumns = new JMenuItem();\r
+  protected JCheckBoxMenuItem hiddenMarkers = new JCheckBoxMenuItem();\r
+  JMenuItem invertColSel = new JMenuItem();\r
+  protected JTabbedPane tabbedPane = new JTabbedPane();\r
+  JMenuItem save = new JMenuItem();\r
+  JMenuItem jMenuItem1 = new JMenuItem();\r
+  protected JMenuItem reload = new JMenuItem();\r
+  JMenuItem newView = new JMenuItem();\r
+  JMenuItem textColour = new JMenuItem();\r
+  JMenu jMenu1 = new JMenu();\r
+  JCheckBoxMenuItem jCheckBoxMenuItem1 = new JCheckBoxMenuItem();\r
+  JMenu jMenu4 = new JMenu();\r
+  protected JCheckBoxMenuItem idRightAlign = new JCheckBoxMenuItem();\r
   public GAlignFrame()\r
   {\r
-    ButtonGroup colours = new ButtonGroup();\r
+    try\r
+    {\r
+      jbInit();\r
+      setJMenuBar(alignFrameMenuBar);\r
+\r
+      // dynamically fill save as menu with available formats\r
+      for (int i = 0; i < jalview.io.FormatAdapter.WRITEABLE_FORMATS.length; i++)\r
+      {\r
+        JMenuItem item = new JMenuItem( jalview.io.FormatAdapter.WRITEABLE_FORMATS[i] );\r
+\r
+        item.addActionListener(new java.awt.event.ActionListener()\r
+        {\r
+          public void actionPerformed(ActionEvent e)\r
+          {\r
+            outputText_actionPerformed(e);\r
+          }\r
+        });\r
+\r
+        outputTextboxMenu.add(item);\r
+      }\r
+    }\r
+    catch (Exception e)\r
+    {\r
+    }\r
+\r
+    if (!System.getProperty("os.name").startsWith("Mac"))\r
+    {\r
+      closeMenuItem.setMnemonic('C');\r
+      outputTextboxMenu.setMnemonic('T');\r
+      undoMenuItem.setMnemonic('Z');\r
+      redoMenuItem.setMnemonic('0');\r
+      copy.setMnemonic('C');\r
+      cut.setMnemonic('U');\r
+      pasteMenu.setMnemonic('P');\r
+      reload.setMnemonic('R');\r
+    }\r
+\r
+\r
+    if(jalview.gui.UserDefinedColours.getUserColourSchemes()!=null)\r
+    {\r
+      java.util.Enumeration userColours = jalview.gui.UserDefinedColours.\r
+          getUserColourSchemes().keys();\r
+\r
+      while (userColours.hasMoreElements())\r
+      {\r
+        final JRadioButtonMenuItem radioItem = new JRadioButtonMenuItem(userColours.\r
+            nextElement().toString());\r
+        radioItem.setName("USER_DEFINED");\r
+        radioItem.addMouseListener(new MouseAdapter()\r
+            {\r
+              public void mousePressed(MouseEvent evt)\r
+              {\r
+                if(evt.isControlDown() || SwingUtilities.isRightMouseButton(evt))\r
+                {\r
+                  radioItem.removeActionListener(radioItem.getActionListeners()[0]);\r
+\r
+                  int option = JOptionPane.showInternalConfirmDialog(jalview.gui.Desktop.desktop,\r
+                      "Remove from default list?",\r
+                      "Remove user defined colour",\r
+                      JOptionPane.YES_NO_OPTION);\r
+                  if(option == JOptionPane.YES_OPTION)\r
+                  {\r
+                    jalview.gui.UserDefinedColours.removeColourFromDefaults(radioItem.getText());\r
+                    colourMenu.remove(radioItem);\r
+                  }\r
+                  else\r
+                    radioItem.addActionListener(new ActionListener()\r
+                    {\r
+                      public void actionPerformed(ActionEvent evt)\r
+                      {\r
+                        userDefinedColour_actionPerformed(evt);\r
+                      }\r
+                    });\r
+                }\r
+              }\r
+            });\r
+        radioItem.addActionListener(new ActionListener()\r
+        {\r
+          public void actionPerformed(ActionEvent evt)\r
+          {\r
+            userDefinedColour_actionPerformed(evt);\r
+          }\r
+        });\r
+        colourMenu.insert(radioItem, 15);\r
+        colours.add(radioItem);\r
+      }\r
+    }\r
     colours.add(noColourmenuItem);\r
     colours.add(clustalColour);\r
     colours.add(zappoColour);\r
@@ -121,75 +251,109 @@ public class GAlignFrame extends JInternalFrame
     colours.add(BLOSUM62Colour);\r
     colours.add(nucleotideColour);\r
 \r
-   noColourmenuItem.setSelected(true);\r
-   String defaultColour = Preferences.defaultColour;\r
-   if(defaultColour!=null)\r
-   {\r
-   int index = ColourSchemeProperty.getColourIndexFromName(defaultColour);\r
-   switch(index)\r
-   {\r
-     case ColourSchemeProperty.CLUSTAL : clustalColour.setSelected(true); break;\r
-     case ColourSchemeProperty.BLOSUM : BLOSUM62Colour.setSelected(true); break;\r
-     case ColourSchemeProperty.PID : PIDColour.setSelected(true); break;\r
-     case ColourSchemeProperty.ZAPPO : zappoColour.setSelected(true); break;\r
-     case ColourSchemeProperty.HYDROPHOBIC: hydrophobicityColour.setSelected(true); break;\r
-     case ColourSchemeProperty.HELIX: helixColour.setSelected(true); break;\r
-     case ColourSchemeProperty.STRAND: strandColour.setSelected(true); break;\r
-     case ColourSchemeProperty.TURN : turnColour.setSelected(true); break;\r
-     case ColourSchemeProperty.BURIED: buriedColour.setSelected(true); break;\r
-     case ColourSchemeProperty.NUCLEOTIDE: nucleotideColour.setSelected(true); break;\r
-     case ColourSchemeProperty.USER_DEFINED : userDefinedColour.setSelected(true); break;\r
-   }\r
-   }\r
+    setColourSelected(jalview.bin.Cache.getDefault("DEFAULT_COLOUR", "None"));\r
 \r
 \r
-    try\r
+  }\r
+\r
+  public void setColourSelected(String defaultColour)\r
+  {\r
+\r
+    if (defaultColour != null)\r
     {\r
-      jbInit();\r
-      setJMenuBar(alignFrameMenuBar);\r
+      int index = ColourSchemeProperty.getColourIndexFromName(defaultColour);\r
 \r
-      JMenuItem item;\r
-      // dynamically fill save as menu with available formats\r
-      for (int i = 0; i < jalview.io.FormatAdapter.formats.size(); i++) {\r
-        item = new JMenuItem((String) jalview.io.FormatAdapter.formats.elementAt(i));\r
-        item.addActionListener(new java.awt.event.ActionListener()\r
-        {\r
-          public void actionPerformed(ActionEvent e)\r
-          {\r
-            outputText_actionPerformed(e);\r
-          }\r
-        });\r
+      switch (index)\r
+      {\r
+        case ColourSchemeProperty.NONE:\r
+              noColourmenuItem.setSelected(true);\r
+              break;\r
+        case ColourSchemeProperty.CLUSTAL:\r
+          clustalColour.setSelected(true);\r
 \r
-        outputTextboxMenu.add( item );\r
-      }\r
+          break;\r
 \r
-    }\r
-    catch(Exception e)\r
-    {\r
-      e.printStackTrace();\r
+        case ColourSchemeProperty.BLOSUM:\r
+          BLOSUM62Colour.setSelected(true);\r
+\r
+          break;\r
+\r
+        case ColourSchemeProperty.PID:\r
+          PIDColour.setSelected(true);\r
+\r
+          break;\r
+\r
+        case ColourSchemeProperty.ZAPPO:\r
+          zappoColour.setSelected(true);\r
+\r
+          break;\r
+\r
+        case ColourSchemeProperty.TAYLOR:\r
+          taylorColour.setSelected(true);\r
+          break;\r
+\r
+        case ColourSchemeProperty.HYDROPHOBIC:\r
+          hydrophobicityColour.setSelected(true);\r
+\r
+          break;\r
+\r
+        case ColourSchemeProperty.HELIX:\r
+          helixColour.setSelected(true);\r
+\r
+          break;\r
+\r
+        case ColourSchemeProperty.STRAND:\r
+          strandColour.setSelected(true);\r
+\r
+          break;\r
+\r
+        case ColourSchemeProperty.TURN:\r
+          turnColour.setSelected(true);\r
+\r
+          break;\r
+\r
+        case ColourSchemeProperty.BURIED:\r
+          buriedColour.setSelected(true);\r
+\r
+          break;\r
+\r
+        case ColourSchemeProperty.NUCLEOTIDE:\r
+          nucleotideColour.setSelected(true);\r
+\r
+          break;\r
+\r
+        case ColourSchemeProperty.USER_DEFINED:\r
+          userDefinedColour.setSelected(true);\r
+\r
+          break;\r
+      }\r
     }\r
 \r
   }\r
-  private void jbInit() throws Exception\r
+\r
+  private void jbInit()\r
+      throws Exception\r
   {\r
-    fileMenu.setMnemonic('F');\r
     fileMenu.setText("File");\r
-    saveAlignmentMenu.setMnemonic('L');\r
-    saveAlignmentMenu.setText("Save As");\r
-    saveAlignmentMenu.addActionListener(new ActionListener()\r
+    saveAs.setText("Save As...");\r
+    saveAs.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.\r
+        KeyEvent.VK_S,\r
+        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()| java.awt.event.KeyEvent.SHIFT_MASK, false));\r
+    saveAs.addActionListener(new ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
-        saveAlignmentMenu_actionPerformed(e);\r
+        saveAs_actionPerformed(e);\r
       }\r
     });\r
-    closeMenuItem.setMnemonic('C');\r
     closeMenuItem.setText("Close");\r
+    closeMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.\r
+        event.KeyEvent.VK_W, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
     closeMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
-        closeMenuItem_actionPerformed(e);\r
+        closeMenuItem_actionPerformed(false);\r
       }\r
     });\r
     editMenu.setText("Edit");\r
@@ -197,10 +361,12 @@ public class GAlignFrame extends JInternalFrame
     colourMenu.setText("Colour");\r
     calculateMenu.setText("Calculate");\r
     webService.setText("Web Service");\r
-    selectAllSequenceMenuItem.setText("Select all");\r
+    selectAllSequenceMenuItem.setText("Select All");\r
     selectAllSequenceMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
-        java.awt.event.KeyEvent.VK_A, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
-    selectAllSequenceMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+        java.awt.event.KeyEvent.VK_A,\r
+        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
+    selectAllSequenceMenuItem.addActionListener(new java.awt.event.\r
+                                                ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
@@ -209,16 +375,20 @@ public class GAlignFrame extends JInternalFrame
     });\r
     deselectAllSequenceMenuItem.setText("Deselect All");\r
     deselectAllSequenceMenuItem.setAccelerator(javax.swing.KeyStroke.\r
-                                               getKeyStroke(java.awt.event.\r
-        KeyEvent.VK_ESCAPE, 0, false));\r
-    deselectAllSequenceMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+                                               getKeyStroke(\r
+        java.awt.event.KeyEvent.VK_ESCAPE, 0, false));\r
+    deselectAllSequenceMenuItem.addActionListener(new java.awt.event.\r
+                                                  ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
         deselectAllSequenceMenuItem_actionPerformed(e);\r
       }\r
     });\r
-    invertSequenceMenuItem.setText("Invert Selection");\r
+    invertSequenceMenuItem.setText("Invert Sequence Selection");\r
+    invertSequenceMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
+        java.awt.event.KeyEvent.VK_I,\r
+        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()|java.awt.event.KeyEvent.SHIFT_MASK, false));\r
     invertSequenceMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -227,6 +397,8 @@ public class GAlignFrame extends JInternalFrame
       }\r
     });\r
     remove2LeftMenuItem.setText("Remove Left");\r
+    remove2LeftMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.\r
+        awt.event.KeyEvent.VK_L, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
     remove2LeftMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -235,6 +407,8 @@ public class GAlignFrame extends JInternalFrame
       }\r
     });\r
     remove2RightMenuItem.setText("Remove Right");\r
+    remove2RightMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.\r
+        awt.event.KeyEvent.VK_R, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
     remove2RightMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -243,7 +417,11 @@ public class GAlignFrame extends JInternalFrame
       }\r
     });\r
     removeGappedColumnMenuItem.setText("Remove Empty Columns");\r
-    removeGappedColumnMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+    removeGappedColumnMenuItem.setAccelerator(javax.swing.KeyStroke.\r
+                                              getKeyStroke(java.awt.event.\r
+        KeyEvent.VK_E, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
+    removeGappedColumnMenuItem.addActionListener(new java.awt.event.\r
+                                                 ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
@@ -251,6 +429,9 @@ public class GAlignFrame extends JInternalFrame
       }\r
     });\r
     removeAllGapsMenuItem.setText("Remove All Gaps");\r
+    removeAllGapsMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
+        java.awt.event.KeyEvent.VK_E,\r
+        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | java.awt.event.KeyEvent.SHIFT_MASK, false));\r
     removeAllGapsMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -301,7 +482,10 @@ public class GAlignFrame extends JInternalFrame
       }\r
     });\r
     removeRedundancyMenuItem.setText("Remove Redundancy...");\r
-    removeRedundancyMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+    removeRedundancyMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
+        java.awt.event.KeyEvent.VK_D, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
+    removeRedundancyMenuItem.addActionListener(new java.awt.event.\r
+                                               ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
@@ -309,14 +493,15 @@ public class GAlignFrame extends JInternalFrame
       }\r
     });\r
     pairwiseAlignmentMenuItem.setText("Pairwise Alignments...");\r
-    pairwiseAlignmentMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+    pairwiseAlignmentMenuItem.addActionListener(new java.awt.event.\r
+                                                ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
         pairwiseAlignmentMenuItem_actionPerformed(e);\r
       }\r
     });\r
-    PCAMenuItem.setText("Principal Component Analysis...");\r
+    PCAMenuItem.setText("Principal Component Analysis");\r
     PCAMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -324,15 +509,17 @@ public class GAlignFrame extends JInternalFrame
         PCAMenuItem_actionPerformed(e);\r
       }\r
     });\r
-    averageDistanceTreeMenuItem.setText("Average Distance Using % Identity...");\r
-    averageDistanceTreeMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+    averageDistanceTreeMenuItem.setText(\r
+        "Average Distance Using % Identity");\r
+    averageDistanceTreeMenuItem.addActionListener(new java.awt.event.\r
+                                                  ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
         averageDistanceTreeMenuItem_actionPerformed(e);\r
       }\r
     });\r
-    neighbourTreeMenuItem.setText("Neighbour Joining Using % Identity...");\r
+    neighbourTreeMenuItem.setText("Neighbour Joining Using % Identity");\r
     neighbourTreeMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -340,36 +527,12 @@ public class GAlignFrame extends JInternalFrame
         neighbourTreeMenuItem_actionPerformed(e);\r
       }\r
     });\r
-    clustalAlignMenuItem.setText("Clustal Alignment...");\r
-    clustalAlignMenuItem.addActionListener(new java.awt.event.ActionListener()\r
-    {\r
-      public void actionPerformed(ActionEvent e)\r
-      {\r
-        clustalAlignMenuItem_actionPerformed(e);\r
-      }\r
-    });\r
     this.getContentPane().setLayout(borderLayout1);\r
     alignFrameMenuBar.setFont(new java.awt.Font("Verdana", 0, 11));\r
-    alignFrameMenuBar.addAncestorListener(new AncestorListener()\r
-    {\r
-      public void ancestorAdded(AncestorEvent event)\r
-      {\r
-        alignFrameMenuBar_ancestorAdded(event);\r
-      }\r
-\r
-      public void ancestorRemoved(AncestorEvent event)\r
-      {\r
-      }\r
-\r
-      public void ancestorMoved(AncestorEvent event)\r
-      {\r
-      }\r
-    });\r
     statusBar.setBackground(Color.white);\r
     statusBar.setFont(new java.awt.Font("Verdana", 0, 11));\r
     statusBar.setBorder(BorderFactory.createLineBorder(Color.black));\r
     statusBar.setText("Status bar");\r
-    outputTextboxMenu.setMnemonic('T');\r
     outputTextboxMenu.setText("Output to Textbox");\r
     clustalColour.setText("Clustalx");\r
 \r
@@ -460,15 +623,17 @@ public class GAlignFrame extends JInternalFrame
         BLOSUM62Colour_actionPerformed(e);\r
       }\r
     });\r
-    avDistanceTreeBlosumMenuItem.setText("Average Distance Using BLOSUM62...");\r
-    avDistanceTreeBlosumMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+    avDistanceTreeBlosumMenuItem.setText(\r
+        "Average Distance Using BLOSUM62");\r
+    avDistanceTreeBlosumMenuItem.addActionListener(new java.awt.event.\r
+        ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
         avTreeBlosumMenuItem_actionPerformed(e);\r
       }\r
     });\r
-    njTreeBlosumMenuItem.setText("Neighbour Joining using BLOSUM62...");\r
+    njTreeBlosumMenuItem.setText("Neighbour Joining using BLOSUM62");\r
     njTreeBlosumMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -478,7 +643,7 @@ public class GAlignFrame extends JInternalFrame
     });\r
     annotationPanelMenuItem.setActionCommand("");\r
     annotationPanelMenuItem.setText("Show Annotations");\r
-    annotationPanelMenuItem.setState( jalview.gui.Preferences.showAnnotation );\r
+    annotationPanelMenuItem.setState( jalview.bin.Cache.getDefault("SHOW_ANNOTATIONS",true));\r
     annotationPanelMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -502,7 +667,7 @@ public class GAlignFrame extends JInternalFrame
         htmlMenuItem_actionPerformed(e);\r
       }\r
     });\r
-    overviewMenuItem.setText("Overview Window...");\r
+    overviewMenuItem.setText("Overview Window");\r
     overviewMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -511,10 +676,10 @@ public class GAlignFrame extends JInternalFrame
       }\r
     });\r
     undoMenuItem.setEnabled(false);\r
-    undoMenuItem.setMnemonic('Z');\r
     undoMenuItem.setText("Undo");\r
-    undoMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.\r
-        event.KeyEvent.VK_Z, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
+    undoMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
+        java.awt.event.KeyEvent.VK_Z,\r
+        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
     undoMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -523,8 +688,9 @@ public class GAlignFrame extends JInternalFrame
       }\r
     });\r
     redoMenuItem.setEnabled(false);\r
-    redoMenuItem.setMnemonic('0');\r
     redoMenuItem.setText("Redo");\r
+    redoMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.\r
+        event.KeyEvent.VK_Y, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
     redoMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -557,6 +723,8 @@ public class GAlignFrame extends JInternalFrame
       }\r
     });\r
     printMenuItem.setText("Print");\r
+    printMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.\r
+        event.KeyEvent.VK_P, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
     printMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -574,8 +742,9 @@ public class GAlignFrame extends JInternalFrame
       }\r
     });\r
     findMenuItem.setText("Find...");\r
-    findMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.\r
-        event.KeyEvent.VK_F, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
+    findMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
+        java.awt.event.KeyEvent.VK_F,\r
+        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
     findMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -583,20 +752,20 @@ public class GAlignFrame extends JInternalFrame
         findMenuItem_actionPerformed(e);\r
       }\r
     });\r
-    searchMenu.setText("Search");\r
-\r
     abovePIDThreshold.setText("Above Identity Threshold");\r
-    abovePIDThreshold.addActionListener(new java.awt.event.ActionListener() {\r
-      public void actionPerformed(ActionEvent e) {\r
+    abovePIDThreshold.addActionListener(new java.awt.event.ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
         abovePIDThreshold_actionPerformed(e);\r
       }\r
     });\r
-    sequenceFeatures.setText("Sequence Features");\r
-    sequenceFeatures.addActionListener(new ActionListener()\r
+    showSeqFeatures.setText("Show Sequence Features");\r
+    showSeqFeatures.addActionListener(new ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent actionEvent)\r
       {\r
-        sequenceFeatures_actionPerformed(actionEvent);\r
+        showSeqFeatures_actionPerformed(actionEvent);\r
       }\r
     });\r
     nucleotideColour.setText("Nucleotide");\r
@@ -608,6 +777,8 @@ public class GAlignFrame extends JInternalFrame
       }\r
     });\r
     deleteGroups.setText("Undefine groups");\r
+    deleteGroups.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.\r
+        event.KeyEvent.VK_U, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
     deleteGroups.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -616,9 +787,9 @@ public class GAlignFrame extends JInternalFrame
       }\r
     });\r
     copy.setText("Copy");\r
-    copy.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.\r
-        KeyEvent.VK_C, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
-    copy.setMnemonic(KeyEvent.VK_C);\r
+    copy.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
+        java.awt.event.KeyEvent.VK_C,\r
+        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
 \r
     copy.addActionListener(new java.awt.event.ActionListener()\r
     {\r
@@ -628,9 +799,9 @@ public class GAlignFrame extends JInternalFrame
       }\r
     });\r
     cut.setText("Cut");\r
-    cut.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.\r
-        KeyEvent.VK_X, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
-    cut.setMnemonic(KeyEvent.VK_X);\r
+    cut.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
+        java.awt.event.KeyEvent.VK_X,\r
+        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
     cut.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -639,6 +810,8 @@ public class GAlignFrame extends JInternalFrame
       }\r
     });\r
     delete.setText("Delete");\r
+    delete.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.\r
+        KeyEvent.VK_BACK_SPACE, 0, false));\r
     delete.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -646,11 +819,11 @@ public class GAlignFrame extends JInternalFrame
         delete_actionPerformed(e);\r
       }\r
     });\r
-    jMenu1.setMnemonic('V');\r
-    jMenu1.setText("Paste");\r
+    pasteMenu.setText("Paste");\r
     pasteNew.setText("To New Alignment");\r
-    pasteNew.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.\r
-        KeyEvent.VK_V, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
+    pasteNew.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
+        java.awt.event.KeyEvent.VK_V,\r
+        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()|java.awt.event.KeyEvent.ALT_MASK, false));\r
     pasteNew.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -659,6 +832,9 @@ public class GAlignFrame extends JInternalFrame
       }\r
     });\r
     pasteThis.setText("Add To This Alignment");\r
+    pasteThis.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
+        java.awt.event.KeyEvent.VK_V,\r
+        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
     pasteThis.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -667,7 +843,6 @@ public class GAlignFrame extends JInternalFrame
       }\r
     });\r
     applyToAllGroups.setText("Apply Colour To All Groups");\r
-    applyToAllGroups.setState(true);\r
     applyToAllGroups.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -679,7 +854,7 @@ public class GAlignFrame extends JInternalFrame
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
-        createPNG_actionPerformed(e);\r
+        createPNG(null);\r
       }\r
     });\r
     createPNG.setActionCommand("Save As PNG Image");\r
@@ -692,13 +867,14 @@ public class GAlignFrame extends JInternalFrame
         font_actionPerformed(e);\r
       }\r
     });\r
-    fullSeqId.setText("Show Full Sequence ID");\r
-    fullSeqId.setState(true);\r
-    fullSeqId.addActionListener(new java.awt.event.ActionListener()\r
+\r
+    seqLimits.setText("Show Sequence Limits");\r
+    seqLimits.setState( jalview.bin.Cache.getDefault("SHOW_JVSUFFIX",true));\r
+    seqLimits.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
-        fullSeqId_actionPerformed(e);\r
+        seqLimit_actionPerformed(e);\r
       }\r
     });\r
     epsFile.setText("EPS");\r
@@ -706,23 +882,16 @@ public class GAlignFrame extends JInternalFrame
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
-        epsFile_actionPerformed(e);\r
+        createEPS(null);\r
       }\r
     });\r
     LoadtreeMenuItem.setActionCommand("Load a tree for this sequence set");\r
-    LoadtreeMenuItem.setText("Load Assocated Tree");\r
-    LoadtreeMenuItem.addActionListener(new java.awt.event.ActionListener() {\r
-      public void actionPerformed(ActionEvent e)\r
-      {\r
-        LoadtreeMenuItem_actionPerformed(e);\r
-      }\r
-    });\r
-    jpred.setText("JPred...");\r
-    jpred.addActionListener(new java.awt.event.ActionListener()\r
+    LoadtreeMenuItem.setText("Load Associated Tree");\r
+    LoadtreeMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
-        jpred_actionPerformed(e);\r
+        LoadtreeMenuItem_actionPerformed(e);\r
       }\r
     });\r
     scaleAbove.setVisible(false);\r
@@ -773,14 +942,10 @@ public class GAlignFrame extends JInternalFrame
     sortByTreeMenu.setText("By Tree Order");\r
     sort.setText("Sort");\r
     calculate.setText("Calculate Tree");\r
-    msaAlignMenuItem.setText("Muscle Alignment...");\r
-    msaAlignMenuItem.addActionListener(new java.awt.event.ActionListener() {\r
-      public void actionPerformed(ActionEvent e) {\r
-        msaAlignMenuItem_actionPerformed(e);\r
-      }\r
-    });\r
-    jMenu2.setText("Export");\r
+\r
+    jMenu2.setText("Export Image");\r
     padGapsMenuitem.setText("Pad Gaps");\r
+    padGapsMenuitem.setState( jalview.bin.Cache.getDefault("PAD_GAPS", false));\r
     padGapsMenuitem.addActionListener(new ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -788,40 +953,267 @@ public class GAlignFrame extends JInternalFrame
         padGapsMenuitem_actionPerformed(e);\r
       }\r
     });\r
-    ClustalRealign.setText("Clustal Realign...");\r
-    ClustalRealign.addActionListener(new ActionListener()\r
+    vamsasStore.setVisible(false);\r
+    vamsasStore.setText("VAMSAS store");\r
+    vamsasStore.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        vamsasStore_actionPerformed(e);\r
+      }\r
+    });\r
+    showTranslation.setText("Translate cDNA");\r
+    showTranslation.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        showTranslation_actionPerformed(e);\r
+      }\r
+    });\r
+\r
+\r
+    featureSettings.setText("Feature Settings...");\r
+    featureSettings.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        featureSettings_actionPerformed(e);\r
+      }\r
+    });\r
+    fetchSequence.setText("Fetch Sequence(s)...");\r
+    fetchSequence.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        fetchSequence_actionPerformed(e);\r
+      }\r
+    });\r
+\r
+    annotationColour.setText("By Annotation...");\r
+    annotationColour.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        annotationColour_actionPerformed(e);\r
+      }\r
+    });\r
+    associatedData.setText("Load Features / Annotations");\r
+    associatedData.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        associatedData_actionPerformed(e);\r
+      }\r
+    });\r
+    autoCalculate.setText("Autocalculate Consensus");\r
+    autoCalculate.setState( jalview.bin.Cache.getDefault("AUTO_CALC_CONSENSUS", true));\r
+    autoCalculate.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        autoCalculate_actionPerformed(e);\r
+      }\r
+    });\r
+    addSequenceMenu.setText("Add Sequences");\r
+    addFromFile.setText("From File");\r
+    addFromFile.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        addFromFile_actionPerformed(e);\r
+      }\r
+    });\r
+    addFromText.setText("From Textbox");\r
+    addFromText.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        addFromText_actionPerformed(e);\r
+      }\r
+    });\r
+    addFromURL.setText("From URL");\r
+    addFromURL.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        addFromURL_actionPerformed(e);\r
+      }\r
+    });\r
+    exportFeatures.setText("Export Features...");\r
+    exportFeatures.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        exportFeatures_actionPerformed(e);\r
+      }\r
+    });\r
+    exportAnnotations.setText("Export Annotations...");\r
+    exportAnnotations.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        exportAnnotations_actionPerformed(e);\r
+      }\r
+    });\r
+    statusPanel.setLayout(gridLayout1);\r
+    jMenu3.setText("Show");\r
+    showAllSeqs.setText("All Sequences");\r
+    showAllSeqs.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        showAllSeqs_actionPerformed(e);\r
+      }\r
+    });\r
+    showAllColumns.setText("All Columns");\r
+    showAllColumns.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        showAllColumns_actionPerformed(e);\r
+      }\r
+    });\r
+    hideMenu.setText("Hide");\r
+    hideSelSequences.setText("Selected Sequences");\r
+    hideSelSequences.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        hideSelSequences_actionPerformed(e);\r
+      }\r
+    });\r
+    hideSelColumns.setText("Selected Columns");\r
+    hideSelColumns.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        hideSelColumns_actionPerformed(e);\r
+      }\r
+    });\r
+    hiddenMarkers.setText("Show Hidden Markers");\r
+    hiddenMarkers.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        hiddenMarkers_actionPerformed(e);\r
+      }\r
+    });\r
+    invertColSel.setText("Invert Column Selection");\r
+    invertColSel.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.\r
+        event.KeyEvent.VK_I, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
+    invertColSel.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        invertColSel_actionPerformed(e);\r
+      }\r
+    });\r
+    tabbedPane.addChangeListener(new javax.swing.event.ChangeListener()\r
+    {\r
+        public void stateChanged(ChangeEvent evt)\r
+        {\r
+            JTabbedPane pane = (JTabbedPane)evt.getSource();\r
+            int sel = pane.getSelectedIndex();\r
+            tabSelectionChanged(sel);\r
+        }\r
+    });\r
+    tabbedPane.addMouseListener(new MouseAdapter()\r
+    {\r
+      public void mousePressed(MouseEvent e)\r
+      {\r
+        tabbedPane_mousePressed(e);\r
+      }\r
+    });\r
+    tabbedPane.addFocusListener(new FocusAdapter()\r
+    {\r
+      public void focusGained(FocusEvent e)\r
+      {\r
+        tabbedPane_focusGained(e);\r
+      }\r
+    });\r
+    save.setText("Save");\r
+    save.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.\r
+        KeyEvent.VK_S, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
+    save.addActionListener(new ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
-        ClustalRealign_actionPerformed(e);\r
+        save_actionPerformed(e);\r
       }\r
     });\r
+    reload.setEnabled(false);\r
+    reload.setText("Reload");\r
+    reload.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        reload_actionPerformed(e);\r
+      }\r
+    });\r
+    newView.setText("New View");\r
+    newView.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.\r
+        KeyEvent.VK_T, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
+    newView.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        newView_actionPerformed(e);\r
+      }\r
+    });\r
+    tabbedPane.setToolTipText("<html><i> Right-click to rename tab"\r
+                              +"<br> Press X to eXpand tabs, G to reGroup.</i></html>");\r
+    textColour.setText("Text Colour");\r
+    textColour.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        textColour_actionPerformed(e);\r
+      }\r
+    });\r
+    jMenu1.setText("Format");\r
+    jCheckBoxMenuItem1.setText("Right Align Ids");\r
+    jMenu4.setText("Select");\r
+    idRightAlign.setText("Right Align Sequence Id");\r
+    idRightAlign.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        idRightAlign_actionPerformed(e);\r
+      }\r
+    });\r
+\r
     alignFrameMenuBar.add(fileMenu);\r
     alignFrameMenuBar.add(editMenu);\r
-    alignFrameMenuBar.add(searchMenu);\r
+    alignFrameMenuBar.add(jMenu4);\r
     alignFrameMenuBar.add(viewMenu);\r
+    alignFrameMenuBar.add(jMenu1);\r
     alignFrameMenuBar.add(colourMenu);\r
     alignFrameMenuBar.add(calculateMenu);\r
-    fileMenu.add(saveAlignmentMenu);\r
-    fileMenu.add(jMenu2);\r
+    alignFrameMenuBar.add(webService);\r
+    fileMenu.add(fetchSequence);\r
+    fileMenu.add(addSequenceMenu);\r
+    fileMenu.add(reload);\r
+    fileMenu.addSeparator();\r
+    fileMenu.add(vamsasStore);\r
+    fileMenu.add(save);\r
+    fileMenu.add(saveAs);\r
     fileMenu.add(outputTextboxMenu);\r
     fileMenu.add(printMenuItem);\r
     fileMenu.addSeparator();\r
+    fileMenu.add(jMenu2);\r
+    fileMenu.add(exportFeatures);\r
+    fileMenu.add(exportAnnotations);\r
     fileMenu.add(LoadtreeMenuItem);\r
+    fileMenu.add(associatedData);\r
     fileMenu.addSeparator();\r
     fileMenu.add(closeMenuItem);\r
     editMenu.add(undoMenuItem);\r
     editMenu.add(redoMenuItem);\r
     editMenu.add(cut);\r
     editMenu.add(copy);\r
-    editMenu.add(jMenu1);\r
+    editMenu.add(pasteMenu);\r
     editMenu.add(delete);\r
     editMenu.addSeparator();\r
-    editMenu.add(selectAllSequenceMenuItem);\r
-    editMenu.add(deselectAllSequenceMenuItem);\r
-    editMenu.add(invertSequenceMenuItem);\r
-    editMenu.add(deleteGroups);\r
-    editMenu.addSeparator();\r
     editMenu.add(remove2LeftMenuItem);\r
     editMenu.add(remove2RightMenuItem);\r
     editMenu.add(removeGappedColumnMenuItem);\r
@@ -829,23 +1221,19 @@ public class GAlignFrame extends JInternalFrame
     editMenu.add(removeRedundancyMenuItem);\r
     editMenu.addSeparator();\r
     editMenu.add(padGapsMenuitem);\r
-    searchMenu.add(findMenuItem);\r
-    viewMenu.add(font);\r
+    viewMenu.add(newView);\r
+    viewMenu.addSeparator();\r
+    viewMenu.add(jMenu3);\r
+    viewMenu.add(hideMenu);\r
     viewMenu.addSeparator();\r
-    viewMenu.add(wrapMenuItem);\r
-    viewMenu.add(fullSeqId);\r
-    viewMenu.add(scaleAbove);\r
-    viewMenu.add(scaleLeft);\r
-    viewMenu.add(scaleRight);\r
-    viewMenu.add(viewBoxesMenuItem);\r
-    viewMenu.add(viewTextMenuItem);\r
-    viewMenu.add(colourTextMenuItem);\r
-    viewMenu.add(renderGapsMenuItem);\r
     viewMenu.add(annotationPanelMenuItem);\r
-    viewMenu.add(sequenceFeatures);\r
+    viewMenu.addSeparator();\r
+    viewMenu.add(showSeqFeatures);\r
+    viewMenu.add(featureSettings);\r
     viewMenu.addSeparator();\r
     viewMenu.add(overviewMenuItem);\r
     colourMenu.add(applyToAllGroups);\r
+    colourMenu.add(textColour);\r
     colourMenu.addSeparator();\r
     colourMenu.add(noColourmenuItem);\r
     colourMenu.add(clustalColour);\r
@@ -865,20 +1253,18 @@ public class GAlignFrame extends JInternalFrame
     colourMenu.add(modifyConservation);\r
     colourMenu.add(abovePIDThreshold);\r
     colourMenu.add(modifyPID);\r
+    colourMenu.add(annotationColour);\r
     calculateMenu.add(sort);\r
     calculateMenu.add(calculate);\r
     calculateMenu.addSeparator();\r
     calculateMenu.add(pairwiseAlignmentMenuItem);\r
     calculateMenu.add(PCAMenuItem);\r
     calculateMenu.addSeparator();\r
-    calculateMenu.add(webService);\r
-    webService.add(clustalAlignMenuItem);\r
-    webService.add(msaAlignMenuItem);\r
-    webService.add(jpred);\r
-    webService.add(ClustalRealign);\r
-    this.getContentPane().add(statusBar, BorderLayout.SOUTH);\r
-    jMenu1.add(pasteNew);\r
-    jMenu1.add(pasteThis);\r
+    calculateMenu.add(showTranslation);\r
+    calculateMenu.add(autoCalculate);\r
+    webServiceNoServices=new JMenuItem("<No Services>");\r
+    webService.add(webServiceNoServices);pasteMenu.add(pasteNew);\r
+    pasteMenu.add(pasteThis);\r
     sort.add(sortIDMenuItem);\r
     sort.add(sortGroupMenuItem);\r
     sort.add(sortPairwiseMenuItem);\r
@@ -889,382 +1275,468 @@ public class GAlignFrame extends JInternalFrame
     jMenu2.add(htmlMenuItem);\r
     jMenu2.add(epsFile);\r
     jMenu2.add(createPNG);\r
+    addSequenceMenu.add(addFromFile);\r
+    addSequenceMenu.add(addFromText);\r
+    addSequenceMenu.add(addFromURL);\r
+    this.getContentPane().add(statusPanel, java.awt.BorderLayout.SOUTH);\r
+    statusPanel.add(statusBar, null);\r
+    this.getContentPane().add(tabbedPane, java.awt.BorderLayout.CENTER);\r
+    jMenu3.add(showAllColumns);\r
+    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
   }\r
 \r
   protected void outputText_actionPerformed(ActionEvent e)\r
   {\r
+  }\r
+\r
+  public void addFromFile_actionPerformed(ActionEvent e)\r
+  {\r
 \r
   }\r
 \r
-  protected void htmlMenuItem_actionPerformed(ActionEvent e)\r
+  public void addFromText_actionPerformed(ActionEvent e)\r
   {\r
 \r
   }\r
 \r
+  public void addFromURL_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
 \r
-  protected void closeMenuItem_actionPerformed(ActionEvent e)\r
+  public void exportFeatures_actionPerformed(ActionEvent e)\r
   {\r
 \r
   }\r
 \r
-  protected void redoMenuItem_actionPerformed(ActionEvent e)\r
+  public void exportAnnotations_actionPerformed(ActionEvent e)\r
   {\r
 \r
   }\r
 \r
-  protected void undoMenuItem_actionPerformed(ActionEvent e)\r
+  protected void htmlMenuItem_actionPerformed(ActionEvent e)\r
+  {\r
+  }\r
+\r
+  protected void closeMenuItem_actionPerformed(boolean b)\r
   {\r
+  }\r
 \r
+  protected void redoMenuItem_actionPerformed(ActionEvent e)\r
+  {\r
   }\r
 \r
+  protected void undoMenuItem_actionPerformed(ActionEvent e)\r
+  {\r
+  }\r
 \r
   protected void selectAllSequenceMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void deselectAllSequenceMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void invertSequenceMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void remove2LeftMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void remove2RightMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void removeGappedColumnMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void removeAllGapsMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
-\r
   protected void wrapMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
-\r
   protected void viewBoxesMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void viewTextMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
-\r
   protected void colourTextMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void annotationPanelMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void overviewMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void sortPairwiseMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void sortIDMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void sortGroupMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
-\r
   protected void removeRedundancyMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void pairwiseAlignmentMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void PCAMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void averageDistanceTreeMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void neighbourTreeMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
-\r
   protected void njTreeBlosumMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
   protected void avTreeBlosumMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
+  protected void clustalColour_actionPerformed(ActionEvent e)\r
+  {\r
+  }\r
 \r
-\r
-  protected void clustalAlignMenuItem_actionPerformed(ActionEvent e)\r
+  protected void zappoColour_actionPerformed(ActionEvent e)\r
   {\r
+  }\r
 \r
+  protected void taylorColour_actionPerformed(ActionEvent e)\r
+  {\r
   }\r
 \r
+  protected void hydrophobicityColour_actionPerformed(ActionEvent e)\r
+  {\r
+  }\r
 \r
+  protected void helixColour_actionPerformed(ActionEvent e)\r
+  {\r
+  }\r
 \r
+  protected void strandColour_actionPerformed(ActionEvent e)\r
+  {\r
+  }\r
 \r
-  protected void clustalColour_actionPerformed(ActionEvent e)\r
+  protected void turnColour_actionPerformed(ActionEvent e)\r
   {\r
+  }\r
 \r
+  protected void buriedColour_actionPerformed(ActionEvent e)\r
+  {\r
   }\r
 \r
-  protected void zappoColour_actionPerformed(ActionEvent e)\r
+  protected void userDefinedColour_actionPerformed(ActionEvent e)\r
   {\r
+  }\r
 \r
+  protected void PIDColour_actionPerformed(ActionEvent e)\r
+  {\r
   }\r
 \r
-  protected void taylorColour_actionPerformed(ActionEvent e)\r
+  protected void BLOSUM62Colour_actionPerformed(ActionEvent e)\r
   {\r
+  }\r
 \r
+  protected void noColourmenuItem_actionPerformed(ActionEvent e)\r
+  {\r
   }\r
 \r
+  protected void conservationMenuItem_actionPerformed(ActionEvent e)\r
+  {\r
+  }\r
 \r
-  protected void hydrophobicityColour_actionPerformed(ActionEvent e)\r
+  protected void printMenuItem_actionPerformed(ActionEvent e)\r
   {\r
+  }\r
 \r
+  protected void renderGapsMenuItem_actionPerformed(ActionEvent e)\r
+  {\r
   }\r
 \r
-  protected void helixColour_actionPerformed(ActionEvent e)\r
+  protected void findMenuItem_actionPerformed(ActionEvent e)\r
   {\r
+  }\r
 \r
+  protected void abovePIDThreshold_actionPerformed(ActionEvent e)\r
+  {\r
   }\r
 \r
-  protected void strandColour_actionPerformed(ActionEvent e)\r
+  public void showSeqFeatures_actionPerformed(ActionEvent actionEvent)\r
   {\r
+  }\r
 \r
+  protected void nucleotideColour_actionPerformed(ActionEvent e)\r
+  {\r
   }\r
 \r
-  protected void turnColour_actionPerformed(ActionEvent e)\r
+  protected void deleteGroups_actionPerformed(ActionEvent e)\r
   {\r
+  }\r
 \r
+  protected void copy_actionPerformed(ActionEvent e)\r
+  {\r
   }\r
 \r
-  protected void buriedColour_actionPerformed(ActionEvent e)\r
+  protected void cut_actionPerformed(ActionEvent e)\r
   {\r
+  }\r
 \r
+  protected void delete_actionPerformed(ActionEvent e)\r
+  {\r
   }\r
 \r
+  protected void pasteNew_actionPerformed(ActionEvent e)\r
+  {\r
+  }\r
 \r
+  protected void pasteThis_actionPerformed(ActionEvent e)\r
+  {\r
+  }\r
 \r
-  protected void userDefinedColour_actionPerformed(ActionEvent e)\r
+  protected void applyToAllGroups_actionPerformed(ActionEvent e)\r
   {\r
+  }\r
 \r
+  public void createPNG(java.io.File f)\r
+  {\r
   }\r
 \r
-  protected void PIDColour_actionPerformed(ActionEvent e)\r
+  protected void font_actionPerformed(ActionEvent e)\r
   {\r
+  }\r
 \r
+  protected void seqLimit_actionPerformed(ActionEvent e)\r
+  {\r
   }\r
 \r
-  protected void BLOSUM62Colour_actionPerformed(ActionEvent e)\r
+  public void seqDBRef_actionPerformed(ActionEvent e)\r
   {\r
 \r
   }\r
 \r
 \r
-  protected void noColourmenuItem_actionPerformed(ActionEvent e)\r
+  public void createEPS(java.io.File f)\r
   {\r
-\r
   }\r
 \r
-  protected  void conservationMenuItem_actionPerformed(ActionEvent e)\r
+  protected void LoadtreeMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
-\r
-  protected void printMenuItem_actionPerformed(ActionEvent e)\r
+  protected void jpred_actionPerformed(ActionEvent e)\r
   {\r
+  }\r
 \r
+  protected void scaleAbove_actionPerformed(ActionEvent e)\r
+  {\r
   }\r
 \r
-  protected void renderGapsMenuItem_actionPerformed(ActionEvent e)\r
+  protected void scaleLeft_actionPerformed(ActionEvent e)\r
   {\r
+  }\r
 \r
+  protected void scaleRight_actionPerformed(ActionEvent e)\r
+  {\r
   }\r
 \r
-  protected void findMenuItem_actionPerformed(ActionEvent e)\r
+  protected void modifyPID_actionPerformed(ActionEvent e)\r
   {\r
+  }\r
 \r
+  protected void modifyConservation_actionPerformed(ActionEvent e)\r
+  {\r
   }\r
 \r
 \r
-  protected void abovePIDThreshold_actionPerformed(ActionEvent e) {\r
 \r
+  protected void saveAs_actionPerformed(ActionEvent e)\r
+  {\r
   }\r
 \r
-  public void sequenceFeatures_actionPerformed(ActionEvent actionEvent)\r
+  protected void padGapsMenuitem_actionPerformed(ActionEvent e)\r
   {\r
-\r
   }\r
 \r
-  protected void nucleotideColour_actionPerformed(ActionEvent e)\r
+\r
+  public void vamsasStore_actionPerformed(ActionEvent e)\r
   {\r
 \r
   }\r
 \r
-  protected void deleteGroups_actionPerformed(ActionEvent e)\r
+  public void vamsasLoad_actionPerformed(ActionEvent e)\r
   {\r
 \r
   }\r
 \r
- protected void copy_actionPerformed(ActionEvent e)\r
+  public void showTranslation_actionPerformed(ActionEvent e)\r
   {\r
 \r
   }\r
 \r
-\r
-  protected void cut_actionPerformed(ActionEvent e)\r
+  public void featureSettings_actionPerformed(ActionEvent e)\r
   {\r
 \r
   }\r
 \r
-  protected void delete_actionPerformed(ActionEvent e)\r
+  public void fetchSequence_actionPerformed(ActionEvent e)\r
   {\r
 \r
   }\r
 \r
-  protected void pasteNew_actionPerformed(ActionEvent e)\r
+  public void smoothFont_actionPerformed(ActionEvent e)\r
   {\r
 \r
   }\r
 \r
-  protected void pasteThis_actionPerformed(ActionEvent e)\r
+  public void annotationColour_actionPerformed(ActionEvent e)\r
   {\r
 \r
   }\r
 \r
-  protected void applyToAllGroups_actionPerformed(ActionEvent e)\r
+\r
+  public void associatedData_actionPerformed(ActionEvent e)\r
   {\r
 \r
   }\r
 \r
-  protected void createPNG_actionPerformed(ActionEvent e)\r
+  public void autoCalculate_actionPerformed(ActionEvent e)\r
   {\r
 \r
   }\r
 \r
-  protected void font_actionPerformed(ActionEvent e)\r
+  public void showAllSeqs_actionPerformed(ActionEvent e)\r
   {\r
 \r
   }\r
 \r
-  protected void fullSeqId_actionPerformed(ActionEvent e)\r
+  public void showAllColumns_actionPerformed(ActionEvent e)\r
   {\r
 \r
   }\r
 \r
-  protected void epsFile_actionPerformed(ActionEvent e)\r
+  public void hideSelSequences_actionPerformed(ActionEvent e)\r
   {\r
 \r
   }\r
 \r
-  protected void LoadtreeMenuItem_actionPerformed(ActionEvent e) {\r
+  public void hideSelColumns_actionPerformed(ActionEvent e)\r
+  {\r
 \r
   }\r
 \r
-  protected void jpred_actionPerformed(ActionEvent e)\r
+  public void hiddenMarkers_actionPerformed(ActionEvent e)\r
   {\r
 \r
   }\r
 \r
-  protected void scaleAbove_actionPerformed(ActionEvent e)\r
+  public void findPdbId_actionPerformed(ActionEvent e)\r
   {\r
 \r
   }\r
 \r
-  protected void scaleLeft_actionPerformed(ActionEvent e)\r
+  public void enterPdbId_actionPerformed(ActionEvent e)\r
   {\r
 \r
   }\r
 \r
-  protected void scaleRight_actionPerformed(ActionEvent e)\r
+  public void pdbFile_actionPerformed(ActionEvent e)\r
   {\r
 \r
   }\r
 \r
-  protected void modifyPID_actionPerformed(ActionEvent e)\r
+  public void invertColSel_actionPerformed(ActionEvent e)\r
   {\r
 \r
   }\r
 \r
-  protected void modifyConservation_actionPerformed(ActionEvent e)\r
+  public void tabSelectionChanged(int sel)\r
   {\r
 \r
   }\r
 \r
-  protected void preferences_actionPerformed(ActionEvent e)\r
+  public void tabbedPane_mousePressed(MouseEvent e)\r
   {\r
 \r
   }\r
 \r
-  protected void msaAlignMenuItem_actionPerformed(ActionEvent e) {\r
-\r
+  public void tabbedPane_focusGained(FocusEvent e)\r
+  {\r
+    requestFocus();\r
   }\r
 \r
-  protected void alignFrameMenuBar_ancestorAdded(AncestorEvent event)\r
+  public void save_actionPerformed(ActionEvent e)\r
   {\r
 \r
   }\r
 \r
-  protected void saveAlignmentMenu_actionPerformed(ActionEvent e)\r
+  public void reload_actionPerformed(ActionEvent e)\r
   {\r
 \r
   }\r
 \r
-  protected void padGapsMenuitem_actionPerformed(ActionEvent e)\r
+  public void newView_actionPerformed(ActionEvent e)\r
   {\r
 \r
   }\r
 \r
-  protected void ClustalRealign_actionPerformed(ActionEvent e)\r
+  public void textColour_actionPerformed(ActionEvent e)\r
   {\r
 \r
   }\r
 \r
+  public void idRightAlign_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
 }\r