*/
package jalview.jbgui;
+
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import jalview.io.FileFormatException;
import jalview.util.MessageManager;
import jalview.util.Platform;
-
/**
* DOCUMENT ME!
*
public class GDesktop extends JFrame
{
- protected static JMenu windowMenu = new JMenu();
+ protected JMenu windowMenu = new JMenu();
JMenuBar desktopMenubar = new JMenuBar();
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');
inputURLMenuItem.setMnemonic('U');
*/
private void jbInit() throws Exception
{
+ boolean apqHandlersSet = false;
/**
* APQHandlers sets handlers for About, Preferences and Quit actions
* peculiar to macOS's application menu. APQHandlers will check to see if a
*/
try
{
- APQHandlers.setAPQHandlers(this);
+ // TODO: if (!Platform.isJS()
+ apqHandlersSet = APQHandlers.setAPQHandlers(this);
} catch (Exception e)
{
System.out.println("Cannot set APQHandlers");
jalview.bin.Console.trace(Cache.getStackTraceString(t));
}
- setName("jalview-desktop");
+ setName(Platform.getAppID("desktop"));
FileMenu.setText(MessageManager.getString("action.file"));
HelpMenu.setText(MessageManager.getString("action.help"));
inputLocalFileMenuItem
.setText(MessageManager.getString("label.load_tree_from_file"));
- inputLocalFileMenuItem
- .setAccelerator(
- javax.swing.KeyStroke
- .getKeyStroke(java.awt.event.KeyEvent.VK_O,
- jalview.util.ShortcutKeyMaskExWrapper
- .getMenuShortcutKeyMaskEx(),
- false));
+ inputLocalFileMenuItem.setAccelerator(
+ javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_O,
+ Platform.SHORTCUT_KEY_MASK,
+ false));
inputLocalFileMenuItem
.addActionListener(new java.awt.event.ActionListener()
{
Float specversion = Platform.isJS() ? Float.valueOf(8)
: Float.parseFloat(
System.getProperty("java.specification.version"));
-
+
desktopMenubar.add(FileMenu);
desktopMenubar.add(toolsMenu);
desktopMenubar.add(HelpMenu);
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);
+ if (!APQHandlers.setQuit)
+ {
+ FileMenu.add(quit);
+ }
if (!APQHandlers.setAbout)
{
HelpMenu.add(aboutMenuItem);
*/
protected void quit()
{
- // System.out.println("********** GDesktop.quit()");
+ //System.out.println("********** GDesktop.quit()");
}
/**