Shortcuts

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

diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java
index 452db23..3be34c3 100755 (executable)
--- a/src/jalview/jbgui/GDesktop.java
+++ b/src/jalview/jbgui/GDesktop.java
@@ -33,7 +33,7 @@ import javax.swing.*;
 public class GDesktop extends JFrame\r
 {\r
     protected static JMenu windowMenu = new JMenu();\r
-    JMenuBar DesktopMenubar = new JMenuBar();\r
+    JMenuBar desktopMenubar = new JMenuBar();\r
     JMenu FileMenu = new JMenu();\r
     JMenu HelpMenu = new JMenu();\r
     protected JMenu VamsasMenu = new JMenu();\r
@@ -48,7 +48,7 @@ public class GDesktop extends JFrame
     JMenuItem preferences = new JMenuItem();\r
     JMenuItem saveState = new JMenuItem();\r
     JMenuItem loadState = new JMenuItem();\r
-    JMenu jMenu1 = new JMenu();\r
+    JMenu inputMenu = new JMenu();\r
   protected JMenuItem vamsasLoad = new JMenuItem();\r
   JMenuItem inputSequence = new JMenuItem();\r
   protected JMenuItem vamsasStop = new JMenuItem();\r
@@ -61,12 +61,25 @@ public class GDesktop extends JFrame
         try\r
         {\r
             jbInit();\r
-            this.setJMenuBar(DesktopMenubar);\r
+            this.setJMenuBar(desktopMenubar);\r
         }\r
         catch (Exception e)\r
         {\r
             e.printStackTrace();\r
         }\r
+\r
+        if (!System.getProperty("os.name").startsWith("Mac"))\r
+        {\r
+          FileMenu.setMnemonic('F');\r
+          inputLocalFileMenuItem.setMnemonic('L');\r
+          VamsasMenu.setMnemonic('V');\r
+          inputURLMenuItem.setMnemonic('U');\r
+          inputTextboxMenuItem.setMnemonic('C');\r
+          quit.setMnemonic('Q');\r
+          saveState.setMnemonic('S');\r
+          loadState.setMnemonic('L');\r
+          inputMenu.setMnemonic('I');\r
+        }\r
     }\r
 \r
     /**\r
@@ -76,13 +89,10 @@ public class GDesktop extends JFrame
      */\r
     private void jbInit() throws Exception\r
     {\r
-        FileMenu.setMnemonic('F');\r
         FileMenu.setText("File");\r
         HelpMenu.setText("Help");\r
         VamsasMenu.setText("Vamsas");\r
-        VamsasMenu.setMnemonic('V');\r
         VamsasMenu.setToolTipText("Share data with other vamsas applications.");\r
-        inputLocalFileMenuItem.setMnemonic('L');\r
         inputLocalFileMenuItem.setText("from File");\r
     inputLocalFileMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
         java.awt.event.KeyEvent.VK_O, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
@@ -93,7 +103,6 @@ public class GDesktop extends JFrame
                     inputLocalFileMenuItem_actionPerformed(null);\r
                 }\r
             });\r
-        inputURLMenuItem.setMnemonic('U');\r
         inputURLMenuItem.setText("from URL");\r
         inputURLMenuItem.addActionListener(new java.awt.event.ActionListener()\r
             {\r
@@ -102,7 +111,6 @@ public class GDesktop extends JFrame
                     inputURLMenuItem_actionPerformed(null);\r
                 }\r
             });\r
-        inputTextboxMenuItem.setMnemonic('C');\r
         inputTextboxMenuItem.setText("from Textbox");\r
         inputTextboxMenuItem.addActionListener(new java.awt.event.ActionListener()\r
             {\r
@@ -111,7 +119,6 @@ public class GDesktop extends JFrame
                     inputTextboxMenuItem_actionPerformed(null);\r
                 }\r
             });\r
-        quit.setMnemonic('Q');\r
         quit.setText("Quit");\r
         quit.addActionListener(new java.awt.event.ActionListener()\r
             {\r
@@ -147,7 +154,6 @@ public class GDesktop extends JFrame
                 }\r
             });\r
         toolsMenu.setText("Tools");\r
-        saveState.setMnemonic('S');\r
         saveState.setText("Save Project");\r
         saveState.addActionListener(new ActionListener()\r
             {\r
@@ -156,7 +162,6 @@ public class GDesktop extends JFrame
                     saveState_actionPerformed(e);\r
                 }\r
             });\r
-        loadState.setMnemonic('L');\r
         loadState.setText("Load Project");\r
         loadState.addActionListener(new ActionListener()\r
             {\r
@@ -165,8 +170,7 @@ public class GDesktop extends JFrame
                     loadState_actionPerformed(e);\r
                 }\r
             });\r
-        jMenu1.setMnemonic('I');\r
-        jMenu1.setText("Input Alignment");\r
+        inputMenu.setText("Input Alignment");\r
     vamsasLoad.setText("Start Vamsas Session...");\r
     vamsasLoad.setVisible(false);\r
     vamsasLoad.addActionListener(new ActionListener()\r
@@ -192,28 +196,29 @@ public class GDesktop extends JFrame
       {\r
         vamsasStop_actionPerformed(e);\r
       }\r
-    });    DesktopMenubar.add(FileMenu);\r
-        DesktopMenubar.add(toolsMenu);\r
-        VamsasMenu.setVisible(false);\r
-        DesktopMenubar.add(VamsasMenu);\r
-        DesktopMenubar.add(HelpMenu);\r
-        DesktopMenubar.add(windowMenu);\r
-    FileMenu.add(jMenu1);\r
+    });\r
+    desktopMenubar.add(FileMenu);\r
+    desktopMenubar.add(toolsMenu);\r
+    VamsasMenu.setVisible(false);\r
+    desktopMenubar.add(VamsasMenu);\r
+    desktopMenubar.add(HelpMenu);\r
+    desktopMenubar.add(windowMenu);\r
+    FileMenu.add(inputMenu);\r
     FileMenu.add(inputSequence);\r
     FileMenu.addSeparator();\r
-        FileMenu.add(saveState);\r
-        FileMenu.add(loadState);\r
-        FileMenu.addSeparator();\r
-        FileMenu.add(quit);\r
-        HelpMenu.add(aboutMenuItem);\r
-        HelpMenu.add(documentationMenuItem);\r
-        VamsasMenu.add(vamsasLoad);\r
-        VamsasMenu.add(vamsasStop);\r
-        toolsMenu.add(preferences);\r
-        jMenu1.add(inputLocalFileMenuItem);\r
-        jMenu1.add(inputURLMenuItem);\r
-        jMenu1.add(inputTextboxMenuItem);\r
-       //    jMenu1.add(vamsasLoad);\r
+    FileMenu.add(saveState);\r
+    FileMenu.add(loadState);\r
+    FileMenu.addSeparator();\r
+    FileMenu.add(quit);\r
+    HelpMenu.add(aboutMenuItem);\r
+    HelpMenu.add(documentationMenuItem);\r
+    VamsasMenu.add(vamsasLoad);\r
+    VamsasMenu.add(vamsasStop);\r
+    toolsMenu.add(preferences);\r
+    inputMenu.add(inputLocalFileMenuItem);\r
+    inputMenu.add(inputURLMenuItem);\r
+    inputMenu.add(inputTextboxMenuItem);\r
+       //    inputMenu.add(vamsasLoad);\r
   }\r
 \r
     /**\r