import javax.swing.JMenuItem;
/**
- * DOCUMENT ME!
+ * abstract class super to jalview.gui.Desktop
*
- * @author $author$
- * @version $Revision$
*/
-public class GDesktop extends JFrame
+@SuppressWarnings("serial")
+public abstract class GDesktop extends JFrame
{
- public static javax.swing.JTabbedPane createTabbedPane()
- {
- // now just always return JTabbedPane
- return new javax.swing.JTabbedPane();
-// // BH 2018 coercing jalview.jbgui.swing.JTabbedPane() for now
-// if (/** @j2sNative false && */
-// true)
-// {
-// // Java
-// return new javax.swing.JTabbedPane();
-// }
-// // JavaScript
-// return (javax.swing.JTabbedPane) (Object) new jalview.jbgui.swing.JTabbedPane();
- }
-
-
- protected static JMenu windowMenu = new JMenu();
+ public JMenu windowMenu = new JMenu(); // BH 2019.05.07 was static
JMenuBar desktopMenubar = new JMenuBar();
JMenuItem saveState = new JMenuItem();
+ JMenuItem saveAsState = new JMenuItem();
+
JMenuItem loadState = new JMenuItem();
JMenu inputMenu = new JMenu();
protected JCheckBoxMenuItem showConsole = new JCheckBoxMenuItem();
- protected JCheckBoxMenuItem showNews = new JCheckBoxMenuItem();
+ public JCheckBoxMenuItem showNews = new JCheckBoxMenuItem();
protected JMenuItem snapShotWindow = new JMenuItem();
*/
public GDesktop()
{
- super();
try
{
jbInit();
e.printStackTrace();
}
- if (Platform.isWin()) //!Platform.isAMacAndNotJS())
+ if (Platform.allowMnemonics())
{
+ //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');
+ VamsasMenu.setMnemonic('V');
inputURLMenuItem.setMnemonic('U');
inputTextboxMenuItem.setMnemonic('C');
quit.setMnemonic('Q');
*/
private void jbInit() throws Exception
{
-
+ setName(Jalview.getAppID("desktop"));
FileMenu.setText(MessageManager.getString("action.file"));
HelpMenu.setText(MessageManager.getString("action.help"));
VamsasMenu.setText("Vamsas");
@Override
public void actionPerformed(ActionEvent e)
{
- saveState_actionPerformed(true);
+ saveState_actionPerformed();
}
});
- JMenuItem saveAsJaxb = new JMenuItem("Save Project as JAXB");
- saveAsJaxb.addActionListener(new ActionListener()
+ saveAsState.setText(MessageManager.getString("action.save_project_as"));
+ saveAsState.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
{
- saveState_actionPerformed(false);
+ saveAsState_actionPerformed(e);
}
});
loadState.setText(MessageManager.getString("action.load_project"));
@Override
public void actionPerformed(ActionEvent e)
{
- loadState_actionPerformed(true);
- }
- });
- JMenuItem loadAsJaxb = new JMenuItem("Load Project as JAXB");
- loadAsJaxb.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- loadState_actionPerformed(false);
+ loadState_actionPerformed();
}
});
inputMenu.setText(MessageManager.getString("label.input_alignment"));
FileMenu.add(inputMenu);
FileMenu.add(inputSequence);
FileMenu.addSeparator();
- FileMenu.add(saveAsJaxb);
- FileMenu.add(loadAsJaxb);
- if (!Jalview.isJS())
- {
- FileMenu.add(saveState);
- FileMenu.add(loadState);
- }
+ FileMenu.add(saveState);
+ FileMenu.add(saveAsState);
+ FileMenu.add(loadState);
FileMenu.addSeparator();
FileMenu.add(quit);
HelpMenu.add(aboutMenuItem);
VamsasMenu.add(vamsasSave);
VamsasMenu.add(vamsasStop);
toolsMenu.add(preferences);
- if (!Jalview.isJS())
+ if (!Platform.isJS())
{
toolsMenu.add(showMemusage);
toolsMenu.add(showConsole);
}
- if (!Jalview.isJS())
+ if (!Platform.isJS())
{
toolsMenu.add(showNews);
toolsMenu.add(garbageCollect);
* @param e
* DOCUMENT ME!
*/
- public void SaveState_actionPerformed(ActionEvent e)
+ protected void preferences_actionPerformed(ActionEvent e)
{
}
* @param e
* DOCUMENT ME!
*/
- protected void preferences_actionPerformed(ActionEvent e)
+ public void saveState_actionPerformed()
{
}
- /**
- * DOCUMENT ME!
- *
- * @param e
- * DOCUMENT ME!
- */
- public void saveState_actionPerformed(boolean asCastor)
+ public void saveAsState_actionPerformed(ActionEvent e)
{
}
* @param e
* DOCUMENT ME!
*/
- public void loadState_actionPerformed(boolean asCastor)
+ public void loadState_actionPerformed()
{
}