X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGDesktop.java;h=1e51541e271cddb359258b8e5c1d7e67011463ec;hb=7abb00c4c412101c88d28fa1770c16c0600362f8;hp=0b9d7794b6a3c2dc7be5c23b1c3ff4674d4006dc;hpb=7ab5d6b0ba5fec1ea4a4239e79c476d841622485;p=jalview.git diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java index 0b9d779..1e51541 100755 --- a/src/jalview/jbgui/GDesktop.java +++ b/src/jalview/jbgui/GDesktop.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -20,12 +20,21 @@ */ package jalview.jbgui; +import jalview.api.AlignmentViewPanel; +import jalview.io.FileFormatException; import jalview.util.MessageManager; +import jalview.util.Platform; -import java.awt.*; -import java.awt.event.*; +import java.awt.FlowLayout; +import java.awt.Toolkit; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; -import javax.swing.*; +import javax.swing.JCheckBoxMenuItem; +import javax.swing.JFrame; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; /** * DOCUMENT ME! @@ -91,10 +100,16 @@ 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. */ @@ -109,7 +124,7 @@ public class GDesktop extends JFrame e.printStackTrace(); } - if (!new jalview.util.Platform().isAMac()) + if (!Platform.isAMac()) { FileMenu.setMnemonic('F'); inputLocalFileMenuItem.setMnemonic('L'); @@ -138,16 +153,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); @@ -156,16 +173,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); @@ -174,6 +199,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(); @@ -182,18 +208,20 @@ 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); @@ -201,10 +229,10 @@ public class GDesktop extends JFrame }); this.getContentPane().setLayout(flowLayout1); windowMenu.setText(MessageManager.getString("label.window")); - preferences.setText(MessageManager.getString("label.preferences") - + "..."); + preferences.setText(MessageManager.getString("label.preferences")); preferences.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { preferences_actionPerformed(e); @@ -214,6 +242,7 @@ public class GDesktop extends JFrame saveState.setText(MessageManager.getString("action.save_project")); saveState.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { saveState_actionPerformed(e); @@ -222,56 +251,62 @@ public class GDesktop extends JFrame loadState.setText(MessageManager.getString("action.load_project")); loadState.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { loadState_actionPerformed(e); } }); 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("label.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("label.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("label.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); @@ -280,42 +315,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); @@ -325,6 +365,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); @@ -333,11 +374,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 +440,9 @@ public class GDesktop extends JFrame toolsMenu.add(showConsole); toolsMenu.add(showNews); toolsMenu.add(garbageCollect); + toolsMenu.add(groovyShell); + toolsMenu.add(experimentalFeatures); + // toolsMenu.add(snapShotWindow); inputMenu.add(inputLocalFileMenuItem); inputMenu.add(inputURLMenuItem); inputMenu.add(inputTextboxMenuItem); @@ -374,6 +453,20 @@ 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) { // TODO Auto-generated method stub @@ -422,9 +515,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 { } @@ -435,7 +529,7 @@ public class GDesktop extends JFrame * DOCUMENT ME! */ protected void inputTextboxMenuItem_actionPerformed( - jalview.gui.AlignViewport av) + AlignmentViewPanel avp) { } @@ -444,6 +538,7 @@ public class GDesktop extends JFrame */ protected void quit() { + System.out.println("********** GDesktop.quit()"); } /**