Apple friendly

diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index 304134c..7fb94f9 100755 (executable)
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@ -58,7 +58,6 @@ public class GAlignFrame
   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 saveAs = new JMenuItem();\r
@@ -143,6 +142,8 @@ public class GAlignFrame
   JMenuItem invertColSel = new JMenuItem();\r
   protected JTabbedPane tabbedPane = new JTabbedPane();\r
   JMenuItem save = new JMenuItem();\r
+  JMenuItem jMenuItem1 = new JMenuItem();\r
+  JMenuItem reload = new JMenuItem();\r
   public GAlignFrame()\r
   {\r
     try\r
@@ -331,7 +332,7 @@ public class GAlignFrame
     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
+        event.KeyEvent.VK_W, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
     closeMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -381,7 +382,7 @@ public class GAlignFrame
     });\r
     remove2LeftMenuItem.setText("Remove Left");\r
     remove2LeftMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.\r
-        awt.event.KeyEvent.VK_L, java.awt.event.KeyEvent.CTRL_MASK, false));\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
@@ -391,7 +392,7 @@ public class GAlignFrame
     });\r
     remove2RightMenuItem.setText("Remove Right");\r
     remove2RightMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.\r
-        awt.event.KeyEvent.VK_R, java.awt.event.KeyEvent.CTRL_MASK, false));\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
@@ -402,7 +403,7 @@ public class GAlignFrame
     removeGappedColumnMenuItem.setText("Remove Empty Columns");\r
     removeGappedColumnMenuItem.setAccelerator(javax.swing.KeyStroke.\r
                                               getKeyStroke(java.awt.event.\r
-        KeyEvent.VK_E, java.awt.event.KeyEvent.CTRL_MASK, false));\r
+        KeyEvent.VK_E, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
     removeGappedColumnMenuItem.addActionListener(new java.awt.event.\r
                                                  ActionListener()\r
     {\r
@@ -413,7 +414,7 @@ public class GAlignFrame
     });\r
     removeAllGapsMenuItem.setText("Remove All Gaps");\r
     removeAllGapsMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
-        java.awt.event.KeyEvent.VK_G, java.awt.event.KeyEvent.CTRL_MASK, false));\r
+        java.awt.event.KeyEvent.VK_G, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
     removeAllGapsMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -465,7 +466,7 @@ public class GAlignFrame
     });\r
     removeRedundancyMenuItem.setText("Remove Redundancy...");\r
     removeRedundancyMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
-        java.awt.event.KeyEvent.VK_R, java.awt.event.KeyEvent.CTRL_MASK, false));\r
+        java.awt.event.KeyEvent.VK_D, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
     removeRedundancyMenuItem.addActionListener(new java.awt.event.\r
                                                ActionListener()\r
     {\r
@@ -675,7 +676,7 @@ public class GAlignFrame
     redoMenuItem.setMnemonic('0');\r
     redoMenuItem.setText("Redo");\r
     redoMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.\r
-        event.KeyEvent.VK_Y, java.awt.event.KeyEvent.CTRL_MASK, false));\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
@@ -709,7 +710,7 @@ public class GAlignFrame
     });\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
+        event.KeyEvent.VK_P, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
     printMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -765,7 +766,7 @@ public class GAlignFrame
     });\r
     deleteGroups.setText("Undefine groups");\r
     deleteGroups.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.\r
-        event.KeyEvent.VK_U, java.awt.event.KeyEvent.CTRL_MASK, false));\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
@@ -799,6 +800,8 @@ public class GAlignFrame
       }\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
@@ -1093,7 +1096,7 @@ public class GAlignFrame
     });\r
     invertColSel.setText("Invert Column Selection");\r
     invertColSel.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.\r
-        event.KeyEvent.VK_I, java.awt.event.KeyEvent.CTRL_MASK, false));\r
+        event.KeyEvent.VK_I, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
     invertColSel.addActionListener(new ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -1126,7 +1129,7 @@ public class GAlignFrame
     });\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
+        KeyEvent.VK_S, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
     save.addActionListener(new ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -1134,6 +1137,17 @@ public class GAlignFrame
         save_actionPerformed(e);\r
       }\r
     });\r
+    reload.setMnemonic('R');\r
+    reload.setText("Reload");\r
+   // reload.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.\r
+  //      KeyEvent.VK_R, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
+    reload.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        reload_actionPerformed(e);\r
+      }\r
+    });\r
 \r
     alignFrameMenuBar.add(fileMenu);\r
     alignFrameMenuBar.add(editMenu);\r
@@ -1142,8 +1156,9 @@ public class GAlignFrame
     alignFrameMenuBar.add(colourMenu);\r
     alignFrameMenuBar.add(calculateMenu);\r
     alignFrameMenuBar.add(webService);\r
-    fileMenu.add(addSequenceMenu);\r
     fileMenu.add(fetchSequence);\r
+    fileMenu.add(addSequenceMenu);\r
+    fileMenu.add(reload);\r
     fileMenu.addSeparator();\r
     fileMenu.add(vamsasStore);\r
     fileMenu.add(save);\r
@@ -1667,4 +1682,9 @@ public class GAlignFrame
   {\r
 \r
   }\r
+\r
+  public void reload_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
 }\r

diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java
index 16b4950..452db23 100755 (executable)
--- a/src/jalview/jbgui/GDesktop.java
+++ b/src/jalview/jbgui/GDesktop.java
@@ -85,7 +85,7 @@ public class GDesktop extends JFrame
         inputLocalFileMenuItem.setMnemonic('L');\r
         inputLocalFileMenuItem.setText("from File");\r
     inputLocalFileMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
-        java.awt.event.KeyEvent.VK_O, java.awt.event.KeyEvent.CTRL_MASK, false));\r
+        java.awt.event.KeyEvent.VK_O, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
     inputLocalFileMenuItem.addActionListener(new java.awt.event.ActionListener()\r
             {\r
                 public void actionPerformed(ActionEvent e)\r