Apple friendly

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

diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index ea6ee25..7fb94f9 100755 (executable)
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@ -58,10 +58,9 @@ 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 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 +141,9 @@ 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
+  JMenuItem jMenuItem1 = new JMenuItem();\r
+  JMenuItem reload = new JMenuItem();\r
   public GAlignFrame()\r
   {\r
     try\r
@@ -316,21 +318,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, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
     closeMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -370,7 +372,7 @@ public class GAlignFrame
     invertSequenceMenuItem.setText("Invert Sequence Selection");\r
     invertSequenceMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
         java.awt.event.KeyEvent.VK_I,\r
-        java.awt.event.KeyEvent.CTRL_MASK | java.awt.event.KeyEvent.SHIFT_MASK, false));\r
+        java.awt.event.KeyEvent.SHIFT_MASK, false));\r
     invertSequenceMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -380,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
@@ -390,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
@@ -401,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
@@ -412,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
@@ -464,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
@@ -650,8 +652,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
@@ -676,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,6 +709,8 @@ public class GAlignFrame
       }\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
@@ -764,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
@@ -798,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
@@ -827,7 +831,6 @@ public class GAlignFrame
       }\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
@@ -928,10 +931,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
@@ -958,14 +959,7 @@ public class GAlignFrame
       }\r
     });\r
 \r
-   /* tabbedPane.addChangeListener(new ChangeListener()\r
-        {\r
-          public void stateChanged(ChangeEvent ece)\r
-          {\r
 \r
-            tabSelected();\r
-          }\r
-        });*/\r
     featureSettings.setText("Feature Settings...");\r
     featureSettings.addActionListener(new ActionListener()\r
     {\r
@@ -990,7 +984,7 @@ public class GAlignFrame
         smoothFont_actionPerformed(e);\r
       }\r
     });\r
-    smoothFont.setState( jalview.bin.Cache.getDefault("ANTI_ALIAS",false));\r
+\r
     annotationColour.setText("By Annotation...");\r
     annotationColour.addActionListener(new ActionListener()\r
     {\r
@@ -1093,7 +1087,6 @@ public class GAlignFrame
       }\r
     });\r
     hiddenMarkers.setText("Hidden Markers");\r
-    hiddenMarkers.setState(true);\r
     hiddenMarkers.addActionListener(new ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -1103,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
@@ -1127,6 +1120,34 @@ public class GAlignFrame
         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
+        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
@@ -1135,15 +1156,17 @@ 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(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
@@ -1540,7 +1563,7 @@ public class GAlignFrame
 \r
 \r
 \r
-  protected void saveAlignmentMenu_actionPerformed(ActionEvent e)\r
+  protected void saveAs_actionPerformed(ActionEvent e)\r
   {\r
   }\r
 \r
@@ -1649,4 +1672,19 @@ public class GAlignFrame
   {\r
 \r
   }\r
+\r
+  public void tabbedPane_focusGained(FocusEvent e)\r
+  {\r
+    requestFocus();\r
+  }\r
+\r
+  public void save_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
+\r
+  public void reload_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
 }\r