X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGAlignFrame.java;h=b5a0d30f35e42fd34f36bd3e7dc1bd5eef31d562;hb=02144db41ec71d19102a08d7f3b4a16b9ae7168e;hp=906724735949718f35e6322ee6ef74a3c7d04086;hpb=2752c8b869e9c395471f45ada636ca4752b4eac1;p=jalview.git

diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index 9067247..b5a0d30 100755
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@ -140,13 +140,11 @@ public class GAlignFrame
   JMenuItem invertColSel = new JMenuItem();
   protected JTabbedPane tabbedPane = new JTabbedPane();
   JMenuItem save = new JMenuItem();
-  JMenuItem jMenuItem1 = new JMenuItem();
   protected JMenuItem reload = new JMenuItem();
   JMenuItem newView = new JMenuItem();
   JMenuItem textColour = new JMenuItem();
-  JMenu jMenu1 = new JMenu();
-  JCheckBoxMenuItem jCheckBoxMenuItem1 = new JCheckBoxMenuItem();
-  JMenu jMenu4 = new JMenu();
+  JMenu formatMenu = new JMenu();
+  JMenu selectMenu = new JMenu();
   protected JCheckBoxMenuItem idRightAlign = new JCheckBoxMenuItem();
   protected JMenuItem gatherViews = new JMenuItem();
   protected JMenuItem expandViews = new JMenuItem();
@@ -943,6 +941,21 @@ public class GAlignFrame
     });
     sortByTreeMenu.setText("By Tree Order");
     sort.setText("Sort");
+    sort.addMenuListener(new MenuListener()
+    {
+      public void menuSelected(MenuEvent e)
+      {
+        buildTreeMenu();
+      }
+
+      public void menuDeselected(MenuEvent e)
+      {
+      }
+
+      public void menuCanceled(MenuEvent e)
+      {
+      }
+    });
     calculate.setText("Calculate Tree");
 
     jMenu2.setText("Export Image");
@@ -1175,9 +1188,8 @@ public class GAlignFrame
         textColour_actionPerformed(e);
       }
     });
-    jMenu1.setText("Format");
-    jCheckBoxMenuItem1.setText("Right Align Ids");
-    jMenu4.setText("Select");
+    formatMenu.setText("Format");
+    selectMenu.setText("Select");
     idRightAlign.setText("Right Align Sequence Id");
     idRightAlign.addActionListener(new ActionListener()
     {
@@ -1188,6 +1200,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 +1211,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 +1223,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);
@@ -1293,6 +1309,7 @@ public class GAlignFrame
     sort.add(sortIDMenuItem);
     sort.add(sortGroupMenuItem);
     sort.add(sortPairwiseMenuItem);
+    sort.add(sortByTreeMenu);
     calculate.add(averageDistanceTreeMenuItem);
     calculate.add(neighbourTreeMenuItem);
     calculate.add(avDistanceTreeBlosumMenuItem);
@@ -1310,26 +1327,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)
@@ -1774,4 +1791,9 @@ public class GAlignFrame
   {
 
   }
+
+  public void buildTreeMenu()
+  {
+
+  }
 }