accelerators, save menu item

[jalview.git] / src / jalview / jbgui / GAlignFrame.java

diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index cbe888a..304134c 100755 (executable)
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@ -61,7 +61,7 @@ public class GAlignFrame
   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
@@ -142,6 +142,7 @@ public class GAlignFrame
   protected JCheckBoxMenuItem hiddenMarkers = new JCheckBoxMenuItem();\r
   JMenuItem invertColSel = new JMenuItem();\r
   protected JTabbedPane tabbedPane = new JTabbedPane();\r
+  JMenuItem save = new JMenuItem();\r
   public GAlignFrame()\r
   {\r
     try\r
@@ -316,21 +317,21 @@ public class GAlignFrame
   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.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.\r
-        awt.event.KeyEvent.VK_S, java.awt.event.KeyEvent.CTRL_MASK, false));\r
-    saveAlignmentMenu.addActionListener(new ActionListener()\r
+    saveAs.setText("Save As ...");\r
+    saveAs.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.\r
+        KeyEvent.VK_S, java.awt.event.KeyEvent.ALT_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, java.awt.event.KeyEvent.CTRL_MASK, false));\r
     closeMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -650,8 +651,6 @@ public class GAlignFrame
       }\r
     });\r
     overviewMenuItem.setText("Overview Window");\r
-    overviewMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.\r
-        event.KeyEvent.VK_O, java.awt.event.KeyEvent.CTRL_MASK, false));\r
     overviewMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -709,6 +708,8 @@ public class GAlignFrame
       }\r
     });\r
     printMenuItem.setText("Print");\r
+    printMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.\r
+        event.KeyEvent.VK_P, java.awt.event.KeyEvent.CTRL_MASK, false));\r
     printMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -927,10 +928,8 @@ public class GAlignFrame
     sort.setText("Sort");\r
     calculate.setText("Calculate Tree");\r
 \r
-    jMenu2.setText("Export");\r
+    jMenu2.setText("Export Image");\r
     padGapsMenuitem.setText("Pad Gaps");\r
-    padGapsMenuitem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.\r
-        event.KeyEvent.VK_P, java.awt.event.KeyEvent.CTRL_MASK, false));\r
     padGapsMenuitem.setState( jalview.bin.Cache.getDefault("PAD_GAPS", false));\r
     padGapsMenuitem.addActionListener(new ActionListener()\r
     {\r
@@ -1125,6 +1124,16 @@ public class GAlignFrame
         tabbedPane_focusGained(e);\r
       }\r
     });\r
+    save.setText("Save");\r
+    save.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.\r
+        KeyEvent.VK_S, java.awt.event.KeyEvent.CTRL_MASK, false));\r
+    save.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        save_actionPerformed(e);\r
+      }\r
+    });\r
 \r
     alignFrameMenuBar.add(fileMenu);\r
     alignFrameMenuBar.add(editMenu);\r
@@ -1137,11 +1146,12 @@ public class GAlignFrame
     fileMenu.add(fetchSequence);\r
     fileMenu.addSeparator();\r
     fileMenu.add(vamsasStore);\r
-    fileMenu.add(saveAlignmentMenu);\r
-    fileMenu.add(jMenu2);\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
@@ -1538,7 +1548,7 @@ public class GAlignFrame
 \r
 \r
 \r
-  protected void saveAlignmentMenu_actionPerformed(ActionEvent e)\r
+  protected void saveAs_actionPerformed(ActionEvent e)\r
   {\r
   }\r
 \r
@@ -1652,4 +1662,9 @@ public class GAlignFrame
   {\r
     requestFocus();\r
   }\r
+\r
+  public void save_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
 }\r