Shortcuts

diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index 7fb94f9..19e9b23 100755 (executable)
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@ -96,7 +96,7 @@ public class GAlignFrame
   JMenuItem delete = new JMenuItem();\r
   JMenuItem copy = new JMenuItem();\r
   JMenuItem cut = new JMenuItem();\r
-  JMenu jMenu1 = new JMenu();\r
+  JMenu pasteMenu = new JMenu();\r
   JMenuItem pasteNew = new JMenuItem();\r
   JMenuItem pasteThis = new JMenuItem();\r
   public JCheckBoxMenuItem applyToAllGroups = new JCheckBoxMenuItem();\r
@@ -120,7 +120,6 @@ public class GAlignFrame
   protected JMenuItem showTranslation = new JMenuItem();\r
   public JMenuItem featureSettings = new JMenuItem();\r
   JMenuItem fetchSequence = new JMenuItem();\r
-  protected JCheckBoxMenuItem smoothFont = new JCheckBoxMenuItem();\r
   JMenuItem annotationColour = new JMenuItem();\r
   JMenuItem associatedData = new JMenuItem();\r
   protected JCheckBoxMenuItem autoCalculate = new JCheckBoxMenuItem();\r
@@ -143,7 +142,8 @@ public class GAlignFrame
   protected JTabbedPane tabbedPane = new JTabbedPane();\r
   JMenuItem save = new JMenuItem();\r
   JMenuItem jMenuItem1 = new JMenuItem();\r
-  JMenuItem reload = new JMenuItem();\r
+  protected JMenuItem reload = new JMenuItem();\r
+  JMenuItem newView = new JMenuItem();\r
   public GAlignFrame()\r
   {\r
     try\r
@@ -171,6 +171,18 @@ public class GAlignFrame
     {\r
     }\r
 \r
+    if (!System.getProperty("os.name").startsWith("Mac"))\r
+    {\r
+      closeMenuItem.setMnemonic('C');\r
+      outputTextboxMenu.setMnemonic('T');\r
+      undoMenuItem.setMnemonic('Z');\r
+      redoMenuItem.setMnemonic('0');\r
+      copy.setMnemonic('C');\r
+      cut.setMnemonic('U');\r
+      pasteMenu.setMnemonic('P');\r
+      reload.setMnemonic('R');\r
+    }\r
+\r
 \r
     if(jalview.gui.UserDefinedColours.getUserColourSchemes()!=null)\r
     {\r
@@ -319,9 +331,10 @@ public class GAlignFrame
       throws Exception\r
   {\r
     fileMenu.setText("File");\r
-    saveAs.setText("Save As ...");\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
+        KeyEvent.VK_S,\r
+        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()| java.awt.event.KeyEvent.SHIFT_MASK, false));\r
     saveAs.addActionListener(new ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -329,7 +342,6 @@ public class GAlignFrame
         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
@@ -337,7 +349,7 @@ public class GAlignFrame
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
-        closeMenuItem_actionPerformed(e);\r
+        closeMenuItem_actionPerformed(false);\r
       }\r
     });\r
     editMenu.setText("Edit");\r
@@ -345,7 +357,7 @@ public class GAlignFrame
     colourMenu.setText("Colour");\r
     calculateMenu.setText("Calculate");\r
     webService.setText("Web Service");\r
-    selectAllSequenceMenuItem.setText("Select all");\r
+    selectAllSequenceMenuItem.setText("Select All");\r
     selectAllSequenceMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
         java.awt.event.KeyEvent.VK_A,\r
         Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
@@ -372,7 +384,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.SHIFT_MASK, false));\r
+        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()|java.awt.event.KeyEvent.SHIFT_MASK, false));\r
     invertSequenceMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -414,7 +426,8 @@ public class GAlignFrame
     });\r
     removeAllGapsMenuItem.setText("Remove All Gaps");\r
     removeAllGapsMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
-        java.awt.event.KeyEvent.VK_G, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
+        java.awt.event.KeyEvent.VK_E,\r
+        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | java.awt.event.KeyEvent.SHIFT_MASK, false));\r
     removeAllGapsMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -516,7 +529,6 @@ public class GAlignFrame
     statusBar.setFont(new java.awt.Font("Verdana", 0, 11));\r
     statusBar.setBorder(BorderFactory.createLineBorder(Color.black));\r
     statusBar.setText("Status bar");\r
-    outputTextboxMenu.setMnemonic('T');\r
     outputTextboxMenu.setText("Output to Textbox");\r
     clustalColour.setText("Clustalx");\r
 \r
@@ -660,7 +672,6 @@ public class GAlignFrame
       }\r
     });\r
     undoMenuItem.setEnabled(false);\r
-    undoMenuItem.setMnemonic('Z');\r
     undoMenuItem.setText("Undo");\r
     undoMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
         java.awt.event.KeyEvent.VK_Z,\r
@@ -673,7 +684,6 @@ public class GAlignFrame
       }\r
     });\r
     redoMenuItem.setEnabled(false);\r
-    redoMenuItem.setMnemonic('0');\r
     redoMenuItem.setText("Redo");\r
     redoMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.\r
         event.KeyEvent.VK_Y, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
@@ -778,7 +788,6 @@ public class GAlignFrame
     copy.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
         java.awt.event.KeyEvent.VK_C,\r
         Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
-    copy.setMnemonic(KeyEvent.VK_C);\r
 \r
     copy.addActionListener(new java.awt.event.ActionListener()\r
     {\r
@@ -791,7 +800,6 @@ public class GAlignFrame
     cut.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
         java.awt.event.KeyEvent.VK_X,\r
         Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
-    cut.setMnemonic(KeyEvent.VK_X);\r
     cut.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -809,12 +817,11 @@ public class GAlignFrame
         delete_actionPerformed(e);\r
       }\r
     });\r
-    jMenu1.setMnemonic('V');\r
-    jMenu1.setText("Paste");\r
+    pasteMenu.setText("Paste");\r
     pasteNew.setText("To New Alignment");\r
     pasteNew.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
         java.awt.event.KeyEvent.VK_V,\r
-        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
+        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()|java.awt.event.KeyEvent.SHIFT_MASK, false));\r
     pasteNew.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -823,6 +830,9 @@ public class GAlignFrame
       }\r
     });\r
     pasteThis.setText("Add To This Alignment");\r
+    pasteThis.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
+        java.awt.event.KeyEvent.VK_V,\r
+        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
     pasteThis.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -976,14 +986,6 @@ public class GAlignFrame
         fetchSequence_actionPerformed(e);\r
       }\r
     });\r
-    smoothFont.setText("Smooth Fonts");\r
-    smoothFont.addActionListener(new ActionListener()\r
-    {\r
-      public void actionPerformed(ActionEvent e)\r
-      {\r
-        smoothFont_actionPerformed(e);\r
-      }\r
-    });\r
 \r
     annotationColour.setText("By Annotation...");\r
     annotationColour.addActionListener(new ActionListener()\r
@@ -1137,10 +1139,8 @@ public class GAlignFrame
         save_actionPerformed(e);\r
       }\r
     });\r
-    reload.setMnemonic('R');\r
+    reload.setEnabled(false);\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
@@ -1148,6 +1148,17 @@ public class GAlignFrame
         reload_actionPerformed(e);\r
       }\r
     });\r
+    newView.setText("New View");\r
+    newView.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.\r
+        KeyEvent.VK_T, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
+    newView.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        newView_actionPerformed(e);\r
+      }\r
+    });\r
+    tabbedPane.setToolTipText("<html><i> Press X to eXpand tabs, G to reGroup</i></html>");\r
 \r
     alignFrameMenuBar.add(fileMenu);\r
     alignFrameMenuBar.add(editMenu);\r
@@ -1177,7 +1188,7 @@ public class GAlignFrame
     editMenu.add(redoMenuItem);\r
     editMenu.add(cut);\r
     editMenu.add(copy);\r
-    editMenu.add(jMenu1);\r
+    editMenu.add(pasteMenu);\r
     editMenu.add(delete);\r
     editMenu.addSeparator();\r
     editMenu.add(selectAllSequenceMenuItem);\r
@@ -1194,8 +1205,9 @@ public class GAlignFrame
     editMenu.addSeparator();\r
     editMenu.add(padGapsMenuitem);\r
     searchMenu.add(findMenuItem);\r
+    viewMenu.add(newView);\r
+    viewMenu.addSeparator();\r
     viewMenu.add(font);\r
-    viewMenu.add(smoothFont);\r
     viewMenu.addSeparator();\r
     viewMenu.add(jMenu3);\r
     viewMenu.add(hideMenu);\r
@@ -1246,8 +1258,8 @@ public class GAlignFrame
     calculateMenu.add(showTranslation);\r
     calculateMenu.add(autoCalculate);\r
     webServiceNoServices=new JMenuItem("<No Services>");\r
-    webService.add(webServiceNoServices);jMenu1.add(pasteNew);\r
-    jMenu1.add(pasteThis);\r
+    webService.add(webServiceNoServices);pasteMenu.add(pasteNew);\r
+    pasteMenu.add(pasteThis);\r
     sort.add(sortIDMenuItem);\r
     sort.add(sortGroupMenuItem);\r
     sort.add(sortPairwiseMenuItem);\r
@@ -1303,7 +1315,7 @@ public class GAlignFrame
   {\r
   }\r
 \r
-  protected void closeMenuItem_actionPerformed(ActionEvent e)\r
+  protected void closeMenuItem_actionPerformed(boolean b)\r
   {\r
   }\r
 \r
@@ -1687,4 +1699,9 @@ public class GAlignFrame
   {\r
 \r
   }\r
+\r
+  public void newView_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
 }\r

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