X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGDesktop.java;h=051bac7016ce1b1c9897408087188184fa1d36e6;hb=970956e40635fd5a86d46e399532abda64ccdf92;hp=3e3691c5dd925acbbd6b9b304800dde997457a31;hpb=136c0793b90b72b928c4d77dc109dd5c644e00d3;p=jalview.git diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java index 3e3691c..051bac7 100755 --- a/src/jalview/jbgui/GDesktop.java +++ b/src/jalview/jbgui/GDesktop.java @@ -21,6 +21,7 @@ package jalview.jbgui; import jalview.api.AlignmentViewPanel; +import jalview.bin.Jalview; import jalview.io.FileFormatException; import jalview.util.MessageManager; import jalview.util.Platform; @@ -37,14 +38,14 @@ import javax.swing.JMenuBar; 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 { - protected static JMenu windowMenu = new JMenu(); + + public JMenu windowMenu = new JMenu(); // BH 2019.05.07 was static JMenuBar desktopMenubar = new JMenuBar(); @@ -76,6 +77,8 @@ public class GDesktop extends JFrame JMenuItem saveState = new JMenuItem(); + JMenuItem saveAsState = new JMenuItem(); + JMenuItem loadState = new JMenuItem(); JMenu inputMenu = new JMenu(); @@ -106,7 +109,7 @@ public class GDesktop extends JFrame protected JCheckBoxMenuItem showConsole = new JCheckBoxMenuItem(); - protected JCheckBoxMenuItem showNews = new JCheckBoxMenuItem(); + public JCheckBoxMenuItem showNews = new JCheckBoxMenuItem(); protected JMenuItem snapShotWindow = new JMenuItem(); @@ -124,11 +127,13 @@ public class GDesktop extends JFrame e.printStackTrace(); } - if (!Platform.isAMac()) + 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'); @@ -146,20 +151,21 @@ public class GDesktop extends JFrame */ private void jbInit() throws Exception { - + setName(Jalview.getAppID("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)); + 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 .addActionListener(new java.awt.event.ActionListener() { @@ -184,8 +190,8 @@ public class GDesktop extends JFrame } } }); - inputTextboxMenuItem.setText(MessageManager - .getString("label.from_textbox")); + inputTextboxMenuItem + .setText(MessageManager.getString("label.from_textbox")); inputTextboxMenuItem .addActionListener(new java.awt.event.ActionListener() { @@ -213,8 +219,8 @@ public class GDesktop extends JFrame aboutMenuItem_actionPerformed(e); } }); - documentationMenuItem.setText(MessageManager - .getString("label.documentation")); + documentationMenuItem + .setText(MessageManager.getString("label.documentation")); documentationMenuItem.setAccelerator(javax.swing.KeyStroke .getKeyStroke(java.awt.event.KeyEvent.VK_F1, 0, false)); documentationMenuItem @@ -223,7 +229,7 @@ public class GDesktop extends JFrame @Override public void actionPerformed(ActionEvent e) { - documentationMenuItem_actionPerformed(e); + documentationMenuItem_actionPerformed(); } }); this.getContentPane().setLayout(flowLayout1); @@ -244,7 +250,16 @@ public class GDesktop extends JFrame @Override public void actionPerformed(ActionEvent e) { - saveState_actionPerformed(e); + saveState_actionPerformed(); + } + }); + saveAsState.setText(MessageManager.getString("action.save_project_as")); + saveAsState.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + saveAsState_actionPerformed(e); } }); loadState.setText(MessageManager.getString("action.load_project")); @@ -253,12 +268,12 @@ public class GDesktop extends JFrame @Override public void actionPerformed(ActionEvent e) { - loadState_actionPerformed(e); + loadState_actionPerformed(); } }); inputMenu.setText(MessageManager.getString("label.input_alignment")); - vamsasStart.setText(MessageManager - .getString("label.new_vamsas_session")); + vamsasStart + .setText(MessageManager.getString("label.new_vamsas_session")); vamsasStart.setVisible(false); vamsasStart.addActionListener(new ActionListener() { @@ -268,8 +283,8 @@ public class GDesktop extends JFrame vamsasStart_actionPerformed(e); } }); - vamsasImport.setText(MessageManager - .getString("action.load_vamsas_session")); + vamsasImport.setText( + MessageManager.getString("action.load_vamsas_session")); vamsasImport.setVisible(false); vamsasImport.addActionListener(new ActionListener() { @@ -279,8 +294,8 @@ public class GDesktop extends JFrame vamsasImport_actionPerformed(e); } }); - vamsasSave.setText(MessageManager - .getString("action.save_vamsas_session")); + vamsasSave.setText( + MessageManager.getString("action.save_vamsas_session")); vamsasSave.setVisible(false); vamsasSave.addActionListener(new ActionListener() { @@ -290,8 +305,8 @@ public class GDesktop extends JFrame vamsasSave_actionPerformed(e); } }); - inputSequence.setText(MessageManager - .getString("action.fetch_sequences")); + inputSequence + .setText(MessageManager.getString("action.fetch_sequences")); inputSequence.addActionListener(new ActionListener() { @Override @@ -300,8 +315,8 @@ public class GDesktop extends JFrame inputSequence_actionPerformed(e); } }); - vamsasStop.setText(MessageManager - .getString("label.stop_vamsas_session")); + vamsasStop + .setText(MessageManager.getString("label.stop_vamsas_session")); vamsasStop.setVisible(false); vamsasStop.addActionListener(new ActionListener() { @@ -320,8 +335,8 @@ public class GDesktop extends JFrame closeAll_actionPerformed(e); } }); - raiseRelated.setText(MessageManager - .getString("action.raise_associated_windows")); + raiseRelated.setText( + MessageManager.getString("action.raise_associated_windows")); raiseRelated.addActionListener(new ActionListener() { @Override @@ -330,8 +345,8 @@ public class GDesktop extends JFrame raiseRelated_actionPerformed(e); } }); - minimizeAssociated.setText(MessageManager - .getString("action.minimize_associated_windows")); + minimizeAssociated.setText( + MessageManager.getString("action.minimize_associated_windows")); minimizeAssociated.addActionListener(new ActionListener() { @Override @@ -340,8 +355,8 @@ public class GDesktop extends JFrame minimizeAssociated_actionPerformed(e); } }); - garbageCollect.setText(MessageManager - .getString("label.collect_garbage")); + garbageCollect + .setText(MessageManager.getString("label.collect_garbage")); garbageCollect.addActionListener(new ActionListener() { @Override @@ -350,8 +365,8 @@ public class GDesktop extends JFrame garbageCollect_actionPerformed(e); } }); - showMemusage.setText(MessageManager - .getString("label.show_memory_usage")); + showMemusage + .setText(MessageManager.getString("label.show_memory_usage")); showMemusage.addActionListener(new ActionListener() { @Override @@ -390,10 +405,10 @@ public class GDesktop extends JFrame } }); experimentalFeatures = new JCheckBoxMenuItem(); - experimentalFeatures.setText(MessageManager - .getString("label.show_experimental")); - experimentalFeatures.setToolTipText(MessageManager - .getString("label.show_experimental_tip")); + experimentalFeatures + .setText(MessageManager.getString("label.show_experimental")); + experimentalFeatures.setToolTipText( + MessageManager.getString("label.show_experimental_tip")); experimentalFeatures.addActionListener(new ActionListener() { @Override @@ -423,6 +438,7 @@ public class GDesktop extends JFrame FileMenu.add(inputSequence); FileMenu.addSeparator(); FileMenu.add(saveState); + FileMenu.add(saveAsState); FileMenu.add(loadState); FileMenu.addSeparator(); FileMenu.add(quit); @@ -435,11 +451,17 @@ public class GDesktop extends JFrame VamsasMenu.add(vamsasSave); VamsasMenu.add(vamsasStop); toolsMenu.add(preferences); - toolsMenu.add(showMemusage); - toolsMenu.add(showConsole); - toolsMenu.add(showNews); - toolsMenu.add(garbageCollect); - toolsMenu.add(groovyShell); + if (!Platform.isJS()) + { + toolsMenu.add(showMemusage); + toolsMenu.add(showConsole); + } + if (!Platform.isJS()) + { + toolsMenu.add(showNews); + toolsMenu.add(garbageCollect); + toolsMenu.add(groovyShell); + } toolsMenu.add(experimentalFeatures); // toolsMenu.add(snapShotWindow); inputMenu.add(inputLocalFileMenuItem); @@ -527,7 +549,8 @@ public class GDesktop extends JFrame * @param e * DOCUMENT ME! */ - protected void inputTextboxMenuItem_actionPerformed(AlignmentViewPanel avp) + protected void inputTextboxMenuItem_actionPerformed( + AlignmentViewPanel avp) { } @@ -548,13 +571,7 @@ public class GDesktop extends JFrame { } - /** - * DOCUMENT ME! - * - * @param e - * DOCUMENT ME! - */ - protected void documentationMenuItem_actionPerformed(ActionEvent e) + protected void documentationMenuItem_actionPerformed() { } @@ -564,7 +581,7 @@ public class GDesktop extends JFrame * @param e * DOCUMENT ME! */ - public void SaveState_actionPerformed(ActionEvent e) + protected void preferences_actionPerformed(ActionEvent e) { } @@ -574,17 +591,11 @@ public class GDesktop extends JFrame * @param e * DOCUMENT ME! */ - protected void preferences_actionPerformed(ActionEvent e) + public void saveState_actionPerformed() { } - /** - * DOCUMENT ME! - * - * @param e - * DOCUMENT ME! - */ - public void saveState_actionPerformed(ActionEvent e) + public void saveAsState_actionPerformed(ActionEvent e) { } @@ -594,7 +605,7 @@ public class GDesktop extends JFrame * @param e * DOCUMENT ME! */ - public void loadState_actionPerformed(ActionEvent e) + public void loadState_actionPerformed() { }