From 4a3f84f077dde7be327e3fa679cd58addc5f4ea3 Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Wed, 8 Nov 2006 17:34:43 +0000 Subject: [PATCH] Apple friendly --- src/jalview/jbgui/GAlignFrame.java | 46 ++++++++++++++++++++++++++---------- src/jalview/jbgui/GDesktop.java | 2 +- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java index 304134c..7fb94f9 100755 --- a/src/jalview/jbgui/GAlignFrame.java +++ b/src/jalview/jbgui/GAlignFrame.java @@ -58,7 +58,6 @@ public class GAlignFrame protected JMenuItem PCAMenuItem = new JMenuItem(); protected JMenuItem averageDistanceTreeMenuItem = new JMenuItem(); protected JMenuItem neighbourTreeMenuItem = new JMenuItem(); - protected JMenuItem clustalAlignMenuItem = new JMenuItem(); BorderLayout borderLayout1 = new BorderLayout(); public JLabel statusBar = new JLabel(); protected JMenuItem saveAs = new JMenuItem(); @@ -143,6 +142,8 @@ public class GAlignFrame JMenuItem invertColSel = new JMenuItem(); protected JTabbedPane tabbedPane = new JTabbedPane(); JMenuItem save = new JMenuItem(); + JMenuItem jMenuItem1 = new JMenuItem(); + JMenuItem reload = new JMenuItem(); public GAlignFrame() { try @@ -331,7 +332,7 @@ public class GAlignFrame closeMenuItem.setMnemonic('C'); closeMenuItem.setText("Close"); closeMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt. - event.KeyEvent.VK_W, java.awt.event.KeyEvent.CTRL_MASK, false)); + event.KeyEvent.VK_W, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); closeMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -381,7 +382,7 @@ public class GAlignFrame }); remove2LeftMenuItem.setText("Remove Left"); remove2LeftMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java. - awt.event.KeyEvent.VK_L, java.awt.event.KeyEvent.CTRL_MASK, false)); + awt.event.KeyEvent.VK_L, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); remove2LeftMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -391,7 +392,7 @@ public class GAlignFrame }); remove2RightMenuItem.setText("Remove Right"); remove2RightMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java. - awt.event.KeyEvent.VK_R, java.awt.event.KeyEvent.CTRL_MASK, false)); + awt.event.KeyEvent.VK_R, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); remove2RightMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -402,7 +403,7 @@ public class GAlignFrame removeGappedColumnMenuItem.setText("Remove Empty Columns"); removeGappedColumnMenuItem.setAccelerator(javax.swing.KeyStroke. getKeyStroke(java.awt.event. - KeyEvent.VK_E, java.awt.event.KeyEvent.CTRL_MASK, false)); + KeyEvent.VK_E, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); removeGappedColumnMenuItem.addActionListener(new java.awt.event. ActionListener() { @@ -413,7 +414,7 @@ public class GAlignFrame }); removeAllGapsMenuItem.setText("Remove All Gaps"); removeAllGapsMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( - java.awt.event.KeyEvent.VK_G, java.awt.event.KeyEvent.CTRL_MASK, false)); + java.awt.event.KeyEvent.VK_G, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); removeAllGapsMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -465,7 +466,7 @@ public class GAlignFrame }); removeRedundancyMenuItem.setText("Remove Redundancy..."); removeRedundancyMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( - java.awt.event.KeyEvent.VK_R, java.awt.event.KeyEvent.CTRL_MASK, false)); + java.awt.event.KeyEvent.VK_D, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); removeRedundancyMenuItem.addActionListener(new java.awt.event. ActionListener() { @@ -675,7 +676,7 @@ public class GAlignFrame redoMenuItem.setMnemonic('0'); redoMenuItem.setText("Redo"); redoMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt. - event.KeyEvent.VK_Y, java.awt.event.KeyEvent.CTRL_MASK, false)); + event.KeyEvent.VK_Y, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); redoMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -709,7 +710,7 @@ public class GAlignFrame }); printMenuItem.setText("Print"); printMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt. - event.KeyEvent.VK_P, java.awt.event.KeyEvent.CTRL_MASK, false)); + event.KeyEvent.VK_P, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); printMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -765,7 +766,7 @@ public class GAlignFrame }); deleteGroups.setText("Undefine groups"); deleteGroups.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt. - event.KeyEvent.VK_U, java.awt.event.KeyEvent.CTRL_MASK, false)); + event.KeyEvent.VK_U, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); deleteGroups.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -799,6 +800,8 @@ public class GAlignFrame } }); delete.setText("Delete"); + delete.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event. + KeyEvent.VK_BACK_SPACE, 0, false)); delete.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1093,7 +1096,7 @@ public class GAlignFrame }); invertColSel.setText("Invert Column Selection"); invertColSel.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt. - event.KeyEvent.VK_I, java.awt.event.KeyEvent.CTRL_MASK, false)); + event.KeyEvent.VK_I, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); invertColSel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1126,7 +1129,7 @@ public class GAlignFrame }); save.setText("Save"); save.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event. - KeyEvent.VK_S, java.awt.event.KeyEvent.CTRL_MASK, false)); + KeyEvent.VK_S, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); save.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1134,6 +1137,17 @@ public class GAlignFrame save_actionPerformed(e); } }); + reload.setMnemonic('R'); + reload.setText("Reload"); + // reload.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event. + // KeyEvent.VK_R, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); + reload.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + reload_actionPerformed(e); + } + }); alignFrameMenuBar.add(fileMenu); alignFrameMenuBar.add(editMenu); @@ -1142,8 +1156,9 @@ public class GAlignFrame alignFrameMenuBar.add(colourMenu); alignFrameMenuBar.add(calculateMenu); alignFrameMenuBar.add(webService); - fileMenu.add(addSequenceMenu); fileMenu.add(fetchSequence); + fileMenu.add(addSequenceMenu); + fileMenu.add(reload); fileMenu.addSeparator(); fileMenu.add(vamsasStore); fileMenu.add(save); @@ -1667,4 +1682,9 @@ public class GAlignFrame { } + + public void reload_actionPerformed(ActionEvent e) + { + + } } diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java index 16b4950..452db23 100755 --- a/src/jalview/jbgui/GDesktop.java +++ b/src/jalview/jbgui/GDesktop.java @@ -85,7 +85,7 @@ public class GDesktop extends JFrame inputLocalFileMenuItem.setMnemonic('L'); inputLocalFileMenuItem.setText("from File"); inputLocalFileMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( - java.awt.event.KeyEvent.VK_O, java.awt.event.KeyEvent.CTRL_MASK, false)); + java.awt.event.KeyEvent.VK_O, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); inputLocalFileMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) -- 1.7.10.2