X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGDesktop.java;h=b6408b8cb2e3f30185b8cca69c6a762dad0c8f59;hb=3da878124135ff033f42d19d8733891b09e953cd;hp=1c37e86604aa5519627512bad5fb3cb1745c3177;hpb=c86442e455c858f4a092fbb2e9394faa3e161a89;p=jalview.git diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java index 1c37e86..b6408b8 100755 --- a/src/jalview/jbgui/GDesktop.java +++ b/src/jalview/jbgui/GDesktop.java @@ -21,7 +21,9 @@ package jalview.jbgui; import jalview.api.AlignmentViewPanel; +import jalview.io.FileFormatException; import jalview.util.MessageManager; +import jalview.util.Platform; import java.awt.FlowLayout; import java.awt.Toolkit; @@ -42,6 +44,23 @@ import javax.swing.JMenuItem; */ public 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(); JMenuBar desktopMenubar = new JMenuBar(); @@ -74,8 +93,10 @@ 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(); @@ -98,16 +119,22 @@ public class GDesktop extends JFrame JMenuItem garbageCollect = new JMenuItem(); + protected JMenuItem groovyShell; + + protected JCheckBoxMenuItem experimentalFeatures; + protected JCheckBoxMenuItem showConsole = new JCheckBoxMenuItem(); protected JCheckBoxMenuItem showNews = new JCheckBoxMenuItem(); - + protected JMenuItem snapShotWindow = new JMenuItem(); + /** * Creates a new GDesktop object. */ public GDesktop() { + super(); try { jbInit(); @@ -117,11 +144,13 @@ public class GDesktop extends JFrame e.printStackTrace(); } - if (!new jalview.util.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,16 +175,18 @@ public class GDesktop extends JFrame 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() { + @Override public void actionPerformed(ActionEvent e) { inputLocalFileMenuItem_actionPerformed(null); @@ -164,16 +195,24 @@ public class GDesktop extends JFrame inputURLMenuItem.setText(MessageManager.getString("label.from_url")); inputURLMenuItem.addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(ActionEvent e) { - inputURLMenuItem_actionPerformed(null); + try + { + inputURLMenuItem_actionPerformed(null); + } catch (FileFormatException e1) + { + System.err.println("Error loading from URL: " + e1.getMessage()); + } } }); - inputTextboxMenuItem.setText(MessageManager - .getString("label.from_textbox")); + inputTextboxMenuItem + .setText(MessageManager.getString("label.from_textbox")); inputTextboxMenuItem .addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(ActionEvent e) { inputTextboxMenuItem_actionPerformed(null); @@ -182,6 +221,7 @@ public class GDesktop extends JFrame quit.setText(MessageManager.getString("action.quit")); quit.addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(ActionEvent e) { quit(); @@ -190,21 +230,23 @@ public class GDesktop extends JFrame aboutMenuItem.setText(MessageManager.getString("label.about")); aboutMenuItem.addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(ActionEvent e) { 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 .addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(ActionEvent e) { - documentationMenuItem_actionPerformed(e); + documentationMenuItem_actionPerformed(); } }); this.getContentPane().setLayout(flowLayout1); @@ -212,6 +254,7 @@ public class GDesktop extends JFrame preferences.setText(MessageManager.getString("label.preferences")); preferences.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { preferences_actionPerformed(e); @@ -221,64 +264,80 @@ public class GDesktop extends JFrame saveState.setText(MessageManager.getString("action.save_project")); saveState.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) + { + saveState_actionPerformed(); + } + }); + saveAsState.setText(MessageManager.getString("action.save_project_as")); + saveAsState.addActionListener(new ActionListener() + { + @Override public void actionPerformed(ActionEvent e) { - saveState_actionPerformed(e); + saveAsState_actionPerformed(e); } }); loadState.setText(MessageManager.getString("action.load_project")); loadState.addActionListener(new ActionListener() { + @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() { + @Override public void actionPerformed(ActionEvent e) { 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() { + @Override public void actionPerformed(ActionEvent e) { 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() { + @Override public void actionPerformed(ActionEvent e) { vamsasSave_actionPerformed(e); } }); - inputSequence.setText(MessageManager - .getString("action.fetch_sequences")); + inputSequence + .setText(MessageManager.getString("action.fetch_sequences")); inputSequence.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { 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() { + @Override public void actionPerformed(ActionEvent e) { vamsasStop_actionPerformed(e); @@ -287,42 +346,47 @@ public class GDesktop extends JFrame closeAll.setText(MessageManager.getString("action.close_all")); closeAll.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { closeAll_actionPerformed(e); } }); - raiseRelated.setText(MessageManager - .getString("action.raise_associated_windows")); + raiseRelated.setText( + MessageManager.getString("action.raise_associated_windows")); raiseRelated.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { raiseRelated_actionPerformed(e); } }); - minimizeAssociated.setText(MessageManager - .getString("action.minimize_associated_windows")); + minimizeAssociated.setText( + MessageManager.getString("action.minimize_associated_windows")); minimizeAssociated.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { minimizeAssociated_actionPerformed(e); } }); - garbageCollect.setText(MessageManager - .getString("label.collect_garbage")); + garbageCollect + .setText(MessageManager.getString("label.collect_garbage")); garbageCollect.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { garbageCollect_actionPerformed(e); } }); - showMemusage.setText(MessageManager - .getString("label.show_memory_usage")); + showMemusage + .setText(MessageManager.getString("label.show_memory_usage")); showMemusage.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { showMemusage_actionPerformed(e); @@ -332,6 +396,7 @@ public class GDesktop extends JFrame .setText(MessageManager.getString("label.show_java_console")); showConsole.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { showConsole_actionPerformed(e); @@ -340,20 +405,46 @@ public class GDesktop extends JFrame showNews.setText(MessageManager.getString("label.show_jalview_news")); showNews.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { showNews_actionPerformed(e); } }); + groovyShell = new JMenuItem(); + groovyShell.setText(MessageManager.getString("label.groovy_console")); + groovyShell.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + groovyShell_actionPerformed(); + } + }); + experimentalFeatures = new JCheckBoxMenuItem(); + experimentalFeatures + .setText(MessageManager.getString("label.show_experimental")); + experimentalFeatures.setToolTipText( + MessageManager.getString("label.show_experimental_tip")); + experimentalFeatures.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + showExperimental_actionPerformed(experimentalFeatures.isSelected()); + } + }); + snapShotWindow.setText(MessageManager.getString("label.take_snapshot")); snapShotWindow.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { snapShotWindow_actionPerformed(e); } }); - + desktopMenubar.add(FileMenu); desktopMenubar.add(toolsMenu); VamsasMenu.setVisible(false); @@ -364,6 +455,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); @@ -376,10 +468,18 @@ 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); + 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); inputMenu.add(inputURLMenuItem); @@ -391,10 +491,18 @@ public class GDesktop extends JFrame // inputMenu.add(vamsasLoad); } + protected void showExperimental_actionPerformed(boolean selected) + { + } + + protected void groovyShell_actionPerformed() + { + } + protected void snapShotWindow_actionPerformed(ActionEvent e) { // TODO Auto-generated method stub - + } protected void showConsole_actionPerformed(ActionEvent e) @@ -445,9 +553,10 @@ public class GDesktop extends JFrame * * @param e * DOCUMENT ME! + * @throws FileFormatException */ protected void inputURLMenuItem_actionPerformed( - jalview.gui.AlignViewport av) + jalview.gui.AlignViewport av) throws FileFormatException { } @@ -457,7 +566,8 @@ public class GDesktop extends JFrame * @param e * DOCUMENT ME! */ - protected void inputTextboxMenuItem_actionPerformed(AlignmentViewPanel avp) + protected void inputTextboxMenuItem_actionPerformed( + AlignmentViewPanel avp) { } @@ -478,13 +588,7 @@ public class GDesktop extends JFrame { } - /** - * DOCUMENT ME! - * - * @param e - * DOCUMENT ME! - */ - protected void documentationMenuItem_actionPerformed(ActionEvent e) + protected void documentationMenuItem_actionPerformed() { } @@ -494,7 +598,7 @@ public class GDesktop extends JFrame * @param e * DOCUMENT ME! */ - public void SaveState_actionPerformed(ActionEvent e) + protected void preferences_actionPerformed(ActionEvent e) { } @@ -504,17 +608,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) { } @@ -524,7 +622,7 @@ public class GDesktop extends JFrame * @param e * DOCUMENT ME! */ - public void loadState_actionPerformed(ActionEvent e) + public void loadState_actionPerformed() { }