From b75d6b8e3ca78ec1fe898b1bafd420d7c2e92015 Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Thu, 9 Nov 2006 18:12:08 +0000 Subject: [PATCH] Shortcuts --- src/jalview/jbgui/GAlignFrame.java | 85 +++++++++++++++++++++--------------- src/jalview/jbgui/GDesktop.java | 71 ++++++++++++++++-------------- 2 files changed, 89 insertions(+), 67 deletions(-) diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java index 7fb94f9..19e9b23 100755 --- a/src/jalview/jbgui/GAlignFrame.java +++ b/src/jalview/jbgui/GAlignFrame.java @@ -96,7 +96,7 @@ public class GAlignFrame JMenuItem delete = new JMenuItem(); JMenuItem copy = new JMenuItem(); JMenuItem cut = new JMenuItem(); - JMenu jMenu1 = new JMenu(); + JMenu pasteMenu = new JMenu(); JMenuItem pasteNew = new JMenuItem(); JMenuItem pasteThis = new JMenuItem(); public JCheckBoxMenuItem applyToAllGroups = new JCheckBoxMenuItem(); @@ -120,7 +120,6 @@ public class GAlignFrame protected JMenuItem showTranslation = new JMenuItem(); public JMenuItem featureSettings = new JMenuItem(); JMenuItem fetchSequence = new JMenuItem(); - protected JCheckBoxMenuItem smoothFont = new JCheckBoxMenuItem(); JMenuItem annotationColour = new JMenuItem(); JMenuItem associatedData = new JMenuItem(); protected JCheckBoxMenuItem autoCalculate = new JCheckBoxMenuItem(); @@ -143,7 +142,8 @@ public class GAlignFrame protected JTabbedPane tabbedPane = new JTabbedPane(); JMenuItem save = new JMenuItem(); JMenuItem jMenuItem1 = new JMenuItem(); - JMenuItem reload = new JMenuItem(); + protected JMenuItem reload = new JMenuItem(); + JMenuItem newView = new JMenuItem(); public GAlignFrame() { try @@ -171,6 +171,18 @@ public class GAlignFrame { } + if (!System.getProperty("os.name").startsWith("Mac")) + { + closeMenuItem.setMnemonic('C'); + outputTextboxMenu.setMnemonic('T'); + undoMenuItem.setMnemonic('Z'); + redoMenuItem.setMnemonic('0'); + copy.setMnemonic('C'); + cut.setMnemonic('U'); + pasteMenu.setMnemonic('P'); + reload.setMnemonic('R'); + } + if(jalview.gui.UserDefinedColours.getUserColourSchemes()!=null) { @@ -319,9 +331,10 @@ public class GAlignFrame throws Exception { fileMenu.setText("File"); - saveAs.setText("Save As ..."); + saveAs.setText("Save As..."); saveAs.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event. - KeyEvent.VK_S, java.awt.event.KeyEvent.ALT_MASK, false)); + KeyEvent.VK_S, + Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()| java.awt.event.KeyEvent.SHIFT_MASK, false)); saveAs.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -329,7 +342,6 @@ public class GAlignFrame saveAs_actionPerformed(e); } }); - closeMenuItem.setMnemonic('C'); closeMenuItem.setText("Close"); closeMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt. event.KeyEvent.VK_W, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); @@ -337,7 +349,7 @@ public class GAlignFrame { public void actionPerformed(ActionEvent e) { - closeMenuItem_actionPerformed(e); + closeMenuItem_actionPerformed(false); } }); editMenu.setText("Edit"); @@ -345,7 +357,7 @@ public class GAlignFrame colourMenu.setText("Colour"); calculateMenu.setText("Calculate"); webService.setText("Web Service"); - selectAllSequenceMenuItem.setText("Select all"); + selectAllSequenceMenuItem.setText("Select All"); selectAllSequenceMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_A, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); @@ -372,7 +384,7 @@ public class GAlignFrame invertSequenceMenuItem.setText("Invert Sequence Selection"); invertSequenceMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_I, - java.awt.event.KeyEvent.SHIFT_MASK, false)); + Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()|java.awt.event.KeyEvent.SHIFT_MASK, false)); invertSequenceMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -414,7 +426,8 @@ public class GAlignFrame }); removeAllGapsMenuItem.setText("Remove All Gaps"); removeAllGapsMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( - java.awt.event.KeyEvent.VK_G, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); + java.awt.event.KeyEvent.VK_E, + Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | java.awt.event.KeyEvent.SHIFT_MASK, false)); removeAllGapsMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -516,7 +529,6 @@ public class GAlignFrame statusBar.setFont(new java.awt.Font("Verdana", 0, 11)); statusBar.setBorder(BorderFactory.createLineBorder(Color.black)); statusBar.setText("Status bar"); - outputTextboxMenu.setMnemonic('T'); outputTextboxMenu.setText("Output to Textbox"); clustalColour.setText("Clustalx"); @@ -660,7 +672,6 @@ public class GAlignFrame } }); undoMenuItem.setEnabled(false); - undoMenuItem.setMnemonic('Z'); undoMenuItem.setText("Undo"); undoMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_Z, @@ -673,7 +684,6 @@ public class GAlignFrame } }); redoMenuItem.setEnabled(false); - redoMenuItem.setMnemonic('0'); redoMenuItem.setText("Redo"); redoMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt. event.KeyEvent.VK_Y, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); @@ -778,7 +788,6 @@ public class GAlignFrame copy.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_C, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); - copy.setMnemonic(KeyEvent.VK_C); copy.addActionListener(new java.awt.event.ActionListener() { @@ -791,7 +800,6 @@ public class GAlignFrame cut.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_X, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); - cut.setMnemonic(KeyEvent.VK_X); cut.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -809,12 +817,11 @@ public class GAlignFrame delete_actionPerformed(e); } }); - jMenu1.setMnemonic('V'); - jMenu1.setText("Paste"); + pasteMenu.setText("Paste"); pasteNew.setText("To New Alignment"); pasteNew.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_V, - Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); + Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()|java.awt.event.KeyEvent.SHIFT_MASK, false)); pasteNew.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -823,6 +830,9 @@ public class GAlignFrame } }); pasteThis.setText("Add To This Alignment"); + pasteThis.setAccelerator(javax.swing.KeyStroke.getKeyStroke( + java.awt.event.KeyEvent.VK_V, + Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); pasteThis.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -976,14 +986,6 @@ public class GAlignFrame fetchSequence_actionPerformed(e); } }); - smoothFont.setText("Smooth Fonts"); - smoothFont.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - smoothFont_actionPerformed(e); - } - }); annotationColour.setText("By Annotation..."); annotationColour.addActionListener(new ActionListener() @@ -1137,10 +1139,8 @@ public class GAlignFrame save_actionPerformed(e); } }); - reload.setMnemonic('R'); + reload.setEnabled(false); 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) @@ -1148,6 +1148,17 @@ public class GAlignFrame reload_actionPerformed(e); } }); + newView.setText("New View"); + newView.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event. + KeyEvent.VK_T, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); + newView.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + newView_actionPerformed(e); + } + }); + tabbedPane.setToolTipText(" Press X to eXpand tabs, G to reGroup"); alignFrameMenuBar.add(fileMenu); alignFrameMenuBar.add(editMenu); @@ -1177,7 +1188,7 @@ public class GAlignFrame editMenu.add(redoMenuItem); editMenu.add(cut); editMenu.add(copy); - editMenu.add(jMenu1); + editMenu.add(pasteMenu); editMenu.add(delete); editMenu.addSeparator(); editMenu.add(selectAllSequenceMenuItem); @@ -1194,8 +1205,9 @@ public class GAlignFrame editMenu.addSeparator(); editMenu.add(padGapsMenuitem); searchMenu.add(findMenuItem); + viewMenu.add(newView); + viewMenu.addSeparator(); viewMenu.add(font); - viewMenu.add(smoothFont); viewMenu.addSeparator(); viewMenu.add(jMenu3); viewMenu.add(hideMenu); @@ -1246,8 +1258,8 @@ public class GAlignFrame calculateMenu.add(showTranslation); calculateMenu.add(autoCalculate); webServiceNoServices=new JMenuItem(""); - webService.add(webServiceNoServices);jMenu1.add(pasteNew); - jMenu1.add(pasteThis); + webService.add(webServiceNoServices);pasteMenu.add(pasteNew); + pasteMenu.add(pasteThis); sort.add(sortIDMenuItem); sort.add(sortGroupMenuItem); sort.add(sortPairwiseMenuItem); @@ -1303,7 +1315,7 @@ public class GAlignFrame { } - protected void closeMenuItem_actionPerformed(ActionEvent e) + protected void closeMenuItem_actionPerformed(boolean b) { } @@ -1687,4 +1699,9 @@ public class GAlignFrame { } + + public void newView_actionPerformed(ActionEvent e) + { + + } } diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java index 452db23..3be34c3 100755 --- a/src/jalview/jbgui/GDesktop.java +++ b/src/jalview/jbgui/GDesktop.java @@ -33,7 +33,7 @@ import javax.swing.*; public class GDesktop extends JFrame { protected static JMenu windowMenu = new JMenu(); - JMenuBar DesktopMenubar = new JMenuBar(); + JMenuBar desktopMenubar = new JMenuBar(); JMenu FileMenu = new JMenu(); JMenu HelpMenu = new JMenu(); protected JMenu VamsasMenu = new JMenu(); @@ -48,7 +48,7 @@ public class GDesktop extends JFrame JMenuItem preferences = new JMenuItem(); JMenuItem saveState = new JMenuItem(); JMenuItem loadState = new JMenuItem(); - JMenu jMenu1 = new JMenu(); + JMenu inputMenu = new JMenu(); protected JMenuItem vamsasLoad = new JMenuItem(); JMenuItem inputSequence = new JMenuItem(); protected JMenuItem vamsasStop = new JMenuItem(); @@ -61,12 +61,25 @@ public class GDesktop extends JFrame try { jbInit(); - this.setJMenuBar(DesktopMenubar); + this.setJMenuBar(desktopMenubar); } catch (Exception e) { e.printStackTrace(); } + + if (!System.getProperty("os.name").startsWith("Mac")) + { + FileMenu.setMnemonic('F'); + inputLocalFileMenuItem.setMnemonic('L'); + VamsasMenu.setMnemonic('V'); + inputURLMenuItem.setMnemonic('U'); + inputTextboxMenuItem.setMnemonic('C'); + quit.setMnemonic('Q'); + saveState.setMnemonic('S'); + loadState.setMnemonic('L'); + inputMenu.setMnemonic('I'); + } } /** @@ -76,13 +89,10 @@ public class GDesktop extends JFrame */ private void jbInit() throws Exception { - FileMenu.setMnemonic('F'); FileMenu.setText("File"); HelpMenu.setText("Help"); VamsasMenu.setText("Vamsas"); - VamsasMenu.setMnemonic('V'); VamsasMenu.setToolTipText("Share data with other vamsas applications."); - inputLocalFileMenuItem.setMnemonic('L'); inputLocalFileMenuItem.setText("from File"); inputLocalFileMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_O, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); @@ -93,7 +103,6 @@ public class GDesktop extends JFrame inputLocalFileMenuItem_actionPerformed(null); } }); - inputURLMenuItem.setMnemonic('U'); inputURLMenuItem.setText("from URL"); inputURLMenuItem.addActionListener(new java.awt.event.ActionListener() { @@ -102,7 +111,6 @@ public class GDesktop extends JFrame inputURLMenuItem_actionPerformed(null); } }); - inputTextboxMenuItem.setMnemonic('C'); inputTextboxMenuItem.setText("from Textbox"); inputTextboxMenuItem.addActionListener(new java.awt.event.ActionListener() { @@ -111,7 +119,6 @@ public class GDesktop extends JFrame inputTextboxMenuItem_actionPerformed(null); } }); - quit.setMnemonic('Q'); quit.setText("Quit"); quit.addActionListener(new java.awt.event.ActionListener() { @@ -147,7 +154,6 @@ public class GDesktop extends JFrame } }); toolsMenu.setText("Tools"); - saveState.setMnemonic('S'); saveState.setText("Save Project"); saveState.addActionListener(new ActionListener() { @@ -156,7 +162,6 @@ public class GDesktop extends JFrame saveState_actionPerformed(e); } }); - loadState.setMnemonic('L'); loadState.setText("Load Project"); loadState.addActionListener(new ActionListener() { @@ -165,8 +170,7 @@ public class GDesktop extends JFrame loadState_actionPerformed(e); } }); - jMenu1.setMnemonic('I'); - jMenu1.setText("Input Alignment"); + inputMenu.setText("Input Alignment"); vamsasLoad.setText("Start Vamsas Session..."); vamsasLoad.setVisible(false); vamsasLoad.addActionListener(new ActionListener() @@ -192,28 +196,29 @@ public class GDesktop extends JFrame { vamsasStop_actionPerformed(e); } - }); DesktopMenubar.add(FileMenu); - DesktopMenubar.add(toolsMenu); - VamsasMenu.setVisible(false); - DesktopMenubar.add(VamsasMenu); - DesktopMenubar.add(HelpMenu); - DesktopMenubar.add(windowMenu); - FileMenu.add(jMenu1); + }); + desktopMenubar.add(FileMenu); + desktopMenubar.add(toolsMenu); + VamsasMenu.setVisible(false); + desktopMenubar.add(VamsasMenu); + desktopMenubar.add(HelpMenu); + desktopMenubar.add(windowMenu); + FileMenu.add(inputMenu); FileMenu.add(inputSequence); FileMenu.addSeparator(); - FileMenu.add(saveState); - FileMenu.add(loadState); - FileMenu.addSeparator(); - FileMenu.add(quit); - HelpMenu.add(aboutMenuItem); - HelpMenu.add(documentationMenuItem); - VamsasMenu.add(vamsasLoad); - VamsasMenu.add(vamsasStop); - toolsMenu.add(preferences); - jMenu1.add(inputLocalFileMenuItem); - jMenu1.add(inputURLMenuItem); - jMenu1.add(inputTextboxMenuItem); - // jMenu1.add(vamsasLoad); + FileMenu.add(saveState); + FileMenu.add(loadState); + FileMenu.addSeparator(); + FileMenu.add(quit); + HelpMenu.add(aboutMenuItem); + HelpMenu.add(documentationMenuItem); + VamsasMenu.add(vamsasLoad); + VamsasMenu.add(vamsasStop); + toolsMenu.add(preferences); + inputMenu.add(inputLocalFileMenuItem); + inputMenu.add(inputURLMenuItem); + inputMenu.add(inputTextboxMenuItem); + // inputMenu.add(vamsasLoad); } /** -- 1.7.10.2