/*\r
* Jalview - A Sequence Alignment Editor and Viewer\r
-* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+* Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
*\r
* This program is free software; you can redistribute it and/or\r
* modify it under the terms of the GNU General Public License\r
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
JMenuItem inputLocalFileMenuItem = new JMenuItem();\r
JMenuItem inputURLMenuItem = new JMenuItem();\r
JMenuItem inputTextboxMenuItem = new JMenuItem();\r
JMenuItem preferences = new JMenuItem();\r
JMenuItem saveState = new JMenuItem();\r
JMenuItem loadState = new JMenuItem();\r
- JMenu jMenu1 = new JMenu();\r
- JMenuItem vamsasLoad = new JMenuItem();\r
+ JMenu inputMenu = new JMenu();\r
+ protected JMenuItem vamsasLoad = new JMenuItem();\r
JMenuItem inputSequence = new JMenuItem();\r
+ protected JMenuItem vamsasStop = new JMenuItem();\r
+ JMenuItem closeAll = new JMenuItem();\r
+ JMenuItem raiseRelated = new JMenuItem();\r
+ JMenuItem minimizeAssociated = new JMenuItem();\r
\r
/**\r
* Creates a new GDesktop object.\r
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
*/\r
private void jbInit() throws Exception\r
{\r
- FileMenu.setMnemonic('F');\r
FileMenu.setText("File");\r
HelpMenu.setText("Help");\r
- inputLocalFileMenuItem.setMnemonic('L');\r
+ VamsasMenu.setText("Vamsas");\r
+ VamsasMenu.setToolTipText("Share data with other vamsas applications.");\r
inputLocalFileMenuItem.setText("from File");\r
- inputLocalFileMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+ inputLocalFileMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
+ java.awt.event.KeyEvent.VK_O, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
+ inputLocalFileMenuItem.addActionListener(new java.awt.event.ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
{\r
inputLocalFileMenuItem_actionPerformed(null);\r
}\r
});\r
- inputURLMenuItem.setMnemonic('U');\r
inputURLMenuItem.setText("from URL");\r
inputURLMenuItem.addActionListener(new java.awt.event.ActionListener()\r
{\r
inputURLMenuItem_actionPerformed(null);\r
}\r
});\r
- inputTextboxMenuItem.setMnemonic('C');\r
inputTextboxMenuItem.setText("from Textbox");\r
inputTextboxMenuItem.addActionListener(new java.awt.event.ActionListener()\r
{\r
inputTextboxMenuItem_actionPerformed(null);\r
}\r
});\r
- quit.setMnemonic('Q');\r
quit.setText("Quit");\r
quit.addActionListener(new java.awt.event.ActionListener()\r
{\r
}\r
});\r
toolsMenu.setText("Tools");\r
- saveState.setMnemonic('S');\r
saveState.setText("Save Project");\r
saveState.addActionListener(new ActionListener()\r
{\r
saveState_actionPerformed(e);\r
}\r
});\r
- loadState.setMnemonic('L');\r
loadState.setText("Load Project");\r
loadState.addActionListener(new ActionListener()\r
{\r
loadState_actionPerformed(e);\r
}\r
});\r
- jMenu1.setMnemonic('I');\r
- jMenu1.setText("Input Alignment");\r
- vamsasLoad.setText("Vamsas");\r
+ inputMenu.setText("Input Alignment");\r
+ vamsasLoad.setText("Start Vamsas Session...");\r
vamsasLoad.setVisible(false);\r
vamsasLoad.addActionListener(new ActionListener()\r
{\r
inputSequence_actionPerformed(e);\r
}\r
});\r
- DesktopMenubar.add(FileMenu);\r
- DesktopMenubar.add(toolsMenu);\r
- DesktopMenubar.add(HelpMenu);\r
- DesktopMenubar.add(windowMenu);\r
- FileMenu.addSeparator();\r
- FileMenu.add(jMenu1);\r
+ vamsasStop.setText("Stop Vamsas Session");\r
+ vamsasStop.setVisible(false);\r
+ vamsasStop.addActionListener(new ActionListener()\r
+ {\r
+ public void actionPerformed(ActionEvent e)\r
+ {\r
+ vamsasStop_actionPerformed(e);\r
+ }\r
+ });\r
+ closeAll.setText("Close All");\r
+ closeAll.addActionListener(new ActionListener()\r
+ {\r
+ public void actionPerformed(ActionEvent e)\r
+ {\r
+ closeAll_actionPerformed(e);\r
+ }\r
+ });\r
+ raiseRelated.setText("Raise Associated Windows");\r
+ raiseRelated.addActionListener(new ActionListener()\r
+ {\r
+ public void actionPerformed(ActionEvent e)\r
+ {\r
+ raiseRelated_actionPerformed(e);\r
+ }\r
+ });\r
+ minimizeAssociated.setText("Minimize Associated Windows");\r
+ minimizeAssociated.addActionListener(new ActionListener()\r
+ {\r
+ public void actionPerformed(ActionEvent e)\r
+ {\r
+ minimizeAssociated_actionPerformed(e);\r
+ }\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
- 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
+ windowMenu.add(closeAll);\r
+ windowMenu.add(raiseRelated);\r
+ windowMenu.add(minimizeAssociated);\r
+ windowMenu.addSeparator();\r
+ // inputMenu.add(vamsasLoad);\r
}\r
\r
/**\r
{\r
\r
}\r
+ public void vamsasStop_actionPerformed(ActionEvent e)\r
+ {\r
+\r
+ }\r
+\r
+ public void closeAll_actionPerformed(ActionEvent e)\r
+ {\r
+\r
+ }\r
+\r
+ public void raiseRelated_actionPerformed(ActionEvent e)\r
+ {\r
+\r
+ }\r
+\r
+ public void minimizeAssociated_actionPerformed(ActionEvent e)\r
+ {\r
+\r
+ }\r
}\r
git://source.jalview.org / jalview.git / blobdiff