import jalview.util.Platform;
import java.awt.FlowLayout;
-import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
JMenu HelpMenu = new JMenu();
- protected JMenu VamsasMenu = new JMenu();
-
- protected JMenu VamsasStMenu = new JMenu();
-
JMenuItem inputLocalFileMenuItem = new JMenuItem();
JMenuItem inputURLMenuItem = new JMenuItem();
JMenu inputMenu = new JMenu();
- protected JMenuItem vamsasStart = new JMenuItem();
-
- protected JMenuItem vamsasImport = new JMenuItem();
-
- protected JMenuItem vamsasSave = new JMenuItem();
-
JMenuItem inputSequence = new JMenuItem();
- protected JMenuItem vamsasStop = new JMenuItem();
-
JMenuItem closeAll = new JMenuItem();
JMenuItem raiseRelated = new JMenuItem();
e.printStackTrace();
}
- if (Platform.allowMnemonics())
+ if (Platform.allowMnemonics())
{
- //BH was !Platform.isAMacAndNotJS()) i.e. "JS or not Mac"
- // but here we want just not a Mac, period, right?
+ // BH was !Platform.isAMacAndNotJS()) i.e. "JS or not Mac"
+ // but here we want just not a Mac, period, right?
FileMenu.setMnemonic('F');
inputLocalFileMenuItem.setMnemonic('L');
- VamsasMenu.setMnemonic('V');
inputURLMenuItem.setMnemonic('U');
inputTextboxMenuItem.setMnemonic('C');
quit.setMnemonic('Q');
setName("jalview-desktop");
FileMenu.setText(MessageManager.getString("action.file"));
HelpMenu.setText(MessageManager.getString("action.help"));
- VamsasMenu.setText("Vamsas");
- VamsasMenu.setToolTipText(MessageManager
- .getString("label.share_data_vamsas_applications"));
- VamsasStMenu.setText(MessageManager.getString("label.connect_to"));
- VamsasStMenu.setToolTipText(
- MessageManager.getString("label.join_existing_vamsas_session"));
inputLocalFileMenuItem
.setText(MessageManager.getString("label.load_tree_from_file"));
- inputLocalFileMenuItem.setAccelerator(
- javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_O,
- Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(),
- false));
+ inputLocalFileMenuItem
+ .setAccelerator(
+ javax.swing.KeyStroke
+ .getKeyStroke(java.awt.event.KeyEvent.VK_O,
+ jalview.util.ShortcutKeyMaskExWrapper
+ .getMenuShortcutKeyMaskEx(),
+ false));
inputLocalFileMenuItem
.addActionListener(new java.awt.event.ActionListener()
{
}
});
inputMenu.setText(MessageManager.getString("label.input_alignment"));
- vamsasStart
- .setText(MessageManager.getString("label.new_vamsas_session"));
- vamsasStart.setVisible(false);
- vamsasStart.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- vamsasStart_actionPerformed(e);
- }
- });
- vamsasImport.setText(
- MessageManager.getString("action.load_vamsas_session"));
- vamsasImport.setVisible(false);
- vamsasImport.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- vamsasImport_actionPerformed(e);
- }
- });
- vamsasSave.setText(
- MessageManager.getString("action.save_vamsas_session"));
- vamsasSave.setVisible(false);
- vamsasSave.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- vamsasSave_actionPerformed(e);
- }
- });
inputSequence
.setText(MessageManager.getString("action.fetch_sequences"));
inputSequence.addActionListener(new ActionListener()
inputSequence_actionPerformed(e);
}
});
- vamsasStop
- .setText(MessageManager.getString("label.stop_vamsas_session"));
- vamsasStop.setVisible(false);
- vamsasStop.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- vamsasStop_actionPerformed(e);
- }
- });
closeAll.setText(MessageManager.getString("action.close_all"));
closeAll.addActionListener(new ActionListener()
{
}
});
+ Float specversion = Platform.isJS() ? Float.valueOf(8)
+ : Float.parseFloat(
+ System.getProperty("java.specification.version"));
+
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(saveState);
FileMenu.add(saveAsState);
FileMenu.add(loadState);
FileMenu.addSeparator();
FileMenu.add(quit);
HelpMenu.add(aboutMenuItem);
HelpMenu.add(documentationMenuItem);
- VamsasMenu.add(VamsasStMenu);
- VamsasStMenu.setVisible(false);
- VamsasMenu.add(vamsasStart);
- VamsasMenu.add(vamsasImport);
- VamsasMenu.add(vamsasSave);
- VamsasMenu.add(vamsasStop);
- toolsMenu.add(preferences);
- if (!Platform.isJS())
+ if (!Platform.isAMacAndNotJS() || specversion < 11)
{
- toolsMenu.add(showMemusage);
- toolsMenu.add(showConsole);
+ toolsMenu.add(preferences);
}
if (!Platform.isJS())
{
+ toolsMenu.add(showMemusage);
+ toolsMenu.add(showConsole);
toolsMenu.add(showNews);
toolsMenu.add(garbageCollect);
toolsMenu.add(groovyShell);
*/
protected void quit()
{
+ // System.out.println("********** GDesktop.quit()");
}
/**