X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGDesktop.java;h=e1224c2c56fc2b3b0c70a14ff875f1983badbee8;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=0b0ce1bff6716fe0ed30761be597fb39c63b771c;hpb=545a83a3607f98d0a1337cdf5954d6215be8cf94;p=jalview.git diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java index 0b0ce1b..e1224c2 100755 --- a/src/jalview/jbgui/GDesktop.java +++ b/src/jalview/jbgui/GDesktop.java @@ -21,13 +21,11 @@ package jalview.jbgui; import jalview.api.AlignmentViewPanel; -import jalview.bin.Jalview; import jalview.io.FileFormatException; import jalview.util.MessageManager; import jalview.util.Platform; import java.awt.FlowLayout; -import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -43,8 +41,10 @@ import javax.swing.JMenuItem; * @author $author$ * @version $Revision$ */ +@SuppressWarnings("serial") public class GDesktop extends JFrame { + protected static JMenu windowMenu = new JMenu(); JMenuBar desktopMenubar = new JMenuBar(); @@ -53,10 +53,6 @@ public class GDesktop extends JFrame JMenu HelpMenu = new JMenu(); - protected JMenu VamsasMenu = new JMenu(); - - protected JMenu VamsasStMenu = new JMenu(); - JMenuItem inputLocalFileMenuItem = new JMenuItem(); JMenuItem inputURLMenuItem = new JMenuItem(); @@ -77,20 +73,14 @@ public class GDesktop extends JFrame JMenuItem saveState = new JMenuItem(); + JMenuItem saveAsState = new JMenuItem(); + JMenuItem loadState = 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(); @@ -126,11 +116,12 @@ 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'); inputURLMenuItem.setMnemonic('U'); inputTextboxMenuItem.setMnemonic('C'); quit.setMnemonic('Q'); @@ -148,21 +139,18 @@ public class GDesktop extends JFrame */ private void jbInit() throws Exception { - + 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() { @@ -250,49 +238,25 @@ public class GDesktop extends JFrame saveState_actionPerformed(); } }); - loadState.setText(MessageManager.getString("action.load_project")); - loadState.addActionListener(new ActionListener() - { - @Override - public void actionPerformed(ActionEvent e) - { - loadState_actionPerformed(); - } - }); - 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() + saveAsState.setText(MessageManager.getString("action.save_project_as")); + saveAsState.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - vamsasImport_actionPerformed(e); + saveAsState_actionPerformed(e); } }); - vamsasSave.setText( - MessageManager.getString("action.save_vamsas_session")); - vamsasSave.setVisible(false); - vamsasSave.addActionListener(new ActionListener() + loadState.setText(MessageManager.getString("action.load_project")); + loadState.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - vamsasSave_actionPerformed(e); + loadState_actionPerformed(); } }); + inputMenu.setText(MessageManager.getString("label.input_alignment")); inputSequence .setText(MessageManager.getString("action.fetch_sequences")); inputSequence.addActionListener(new ActionListener() @@ -303,17 +267,6 @@ public class GDesktop extends JFrame 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() { @@ -416,38 +369,32 @@ public class GDesktop extends JFrame } }); + 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); - if (!Jalview.isJS()) - { - FileMenu.addSeparator(); - FileMenu.add(saveState); - FileMenu.add(loadState); - } + FileMenu.addSeparator(); + // 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 (!Jalview.isJS()) + if (!Platform.isAMacAndNotJS() || specversion < 11) { - toolsMenu.add(showMemusage); - toolsMenu.add(showConsole); + toolsMenu.add(preferences); } - if (!Jalview.isJS()) + if (!Platform.isJS()) { + toolsMenu.add(showMemusage); + toolsMenu.add(showConsole); toolsMenu.add(showNews); toolsMenu.add(garbageCollect); toolsMenu.add(groovyShell); @@ -549,6 +496,7 @@ public class GDesktop extends JFrame */ protected void quit() { + // System.out.println("********** GDesktop.quit()"); } /** @@ -571,7 +519,7 @@ public class GDesktop extends JFrame * @param e * DOCUMENT ME! */ - public void SaveState_actionPerformed(ActionEvent e) + protected void preferences_actionPerformed(ActionEvent e) { } @@ -581,18 +529,34 @@ public class GDesktop extends JFrame * @param e * DOCUMENT ME! */ - protected void preferences_actionPerformed(ActionEvent e) + public void saveState_actionPerformed() { } - public void saveState_actionPerformed() + public void saveAsState_actionPerformed(ActionEvent e) { } + /** + * DOCUMENT ME! + * + * @param e + * DOCUMENT ME! + */ public void loadState_actionPerformed() { } + /** + * DOCUMENT ME! + * + * @param e + * DOCUMENT ME! + */ + public void loadJalviewAlign_actionPerformed(ActionEvent e) + { + } + public void vamsasStart_actionPerformed(ActionEvent e) {