X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGAlignFrame.java;h=f4502e58d2ad292203b30f28e9d4e7151e9bab1b;hb=9f801be1c14ea869cdee39b67acc85ee41bb23b5;hp=615e9bbde6646ced9d0c25abb09e0009cc64e29a;hpb=9a88b5f931393037048bf4d8c1c3b871ae585b1c;p=jalview.git

diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index 615e9bb..f4502e5 100755
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@ -144,9 +144,12 @@ 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();
   public GAlignFrame()
   {
     try
@@ -387,7 +390,7 @@ public class GAlignFrame
     invertSequenceMenuItem.setText("Invert Sequence Selection");
     invertSequenceMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
         java.awt.event.KeyEvent.VK_I,
-        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()|java.awt.event.KeyEvent.SHIFT_MASK, false));
+        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));
     invertSequenceMenuItem.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -822,7 +825,7 @@ public class GAlignFrame
     pasteNew.setText("To New Alignment");
     pasteNew.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
         java.awt.event.KeyEvent.VK_V,
-        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()|java.awt.event.KeyEvent.ALT_MASK, false));
+        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()|java.awt.event.KeyEvent.SHIFT_MASK, false));
     pasteNew.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1099,7 +1102,10 @@ public class GAlignFrame
     });
     invertColSel.setText("Invert Column Selection");
     invertColSel.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.
-        event.KeyEvent.VK_I, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));
+        event.KeyEvent.VK_I,
+        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()
+        |java.awt.event.KeyEvent.ALT_MASK,
+        false));
     invertColSel.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1169,15 +1175,45 @@ 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()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        idRightAlign_actionPerformed(e);
+      }
+    });
+    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)
+      {
+        gatherViews_actionPerformed(e);
+      }
+    });
+    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)
+      {
+        expandViews_actionPerformed(e);
+      }
+    });
 
     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);
@@ -1213,6 +1249,8 @@ public class GAlignFrame
     editMenu.addSeparator();
     editMenu.add(padGapsMenuitem);
     viewMenu.add(newView);
+    viewMenu.add(expandViews);
+    viewMenu.add(gatherViews);
     viewMenu.addSeparator();
     viewMenu.add(jMenu3);
     viewMenu.add(hideMenu);
@@ -1276,25 +1314,26 @@ public class GAlignFrame
     jMenu3.add(showAllSeqs);
     hideMenu.add(hideSelColumns);
     hideMenu.add(hideSelSequences);
-    jMenu1.add(font);
-    jMenu1.addSeparator();
-    jMenu1.add(seqLimits);
-    jMenu1.add(wrapMenuItem);
-    jMenu1.add(scaleAbove);
-    jMenu1.add(scaleLeft);
-    jMenu1.add(scaleRight);
-    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)
@@ -1724,4 +1763,19 @@ public class GAlignFrame
   {
 
   }
+
+  public void idRightAlign_actionPerformed(ActionEvent e)
+  {
+
+  }
+
+  public void expandViews_actionPerformed(ActionEvent e)
+  {
+
+  }
+
+  public void gatherViews_actionPerformed(ActionEvent e)
+  {
+
+  }
 }