X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGDesktop.java;h=3343c8879338cb001c5f6d1e1f15b20a1507ee68;hb=b364e1e6d199002069dab615d1007799b5bb71e1;hp=17f36cbfc57bdcc9189b5c588a27c6184d890167;hpb=fab0afc9e1e7a5ca460f0cbd48545536f989a435;p=jalview.git diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java index 17f36cb..3343c88 100755 --- a/src/jalview/jbgui/GDesktop.java +++ b/src/jalview/jbgui/GDesktop.java @@ -20,14 +20,7 @@ */ 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; @@ -37,31 +30,23 @@ import javax.swing.JMenu; import javax.swing.JMenuBar; import javax.swing.JMenuItem; +import jalview.api.AlignmentViewPanel; +import jalview.bin.Cache; +import jalview.gui.Desktop; +import jalview.io.FileFormatException; +import jalview.util.MessageManager; +import jalview.util.Platform; + /** * DOCUMENT ME! * * @author $author$ * @version $Revision$ */ +@SuppressWarnings("serial") 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(); @@ -70,10 +55,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(); @@ -94,20 +75,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(); @@ -143,11 +118,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'); @@ -165,21 +141,38 @@ public class GDesktop extends JFrame */ private void jbInit() throws Exception { + boolean apqHandlersSet = false; + /** + * APQHandlers sets handlers for About, Preferences and Quit actions + * peculiar to macOS's application menu. APQHandlers will check to see if a + * handler is supported before setting it. + */ + try + { + apqHandlersSet = APQHandlers.setAPQHandlers(this); + } catch (Exception e) + { + System.out.println("Cannot set APQHandlers"); + // e.printStackTrace(); + } catch (Throwable t) + { + jalview.bin.Console + .warn("Error setting APQHandlers: " + t.toString()); + jalview.bin.Console.trace(Cache.getStackTraceString(t)); + } + 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() { @@ -221,7 +214,8 @@ public class GDesktop extends JFrame @Override public void actionPerformed(ActionEvent e) { - quit(); + if (Desktop.instance != null) + Desktop.instance.desktopQuit(); } }); aboutMenuItem.setText(MessageManager.getString("label.about")); @@ -264,16 +258,16 @@ public class GDesktop extends JFrame @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")); @@ -282,52 +276,10 @@ public class GDesktop extends JFrame @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")); - 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() - { - @Override - public void actionPerformed(ActionEvent e) - { - vamsasImport_actionPerformed(e); - } - }); - 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.addActionListener(new ActionListener() @@ -338,17 +290,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() { @@ -453,39 +394,32 @@ public class GDesktop extends JFrame 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(saveAsState); + FileMenu.add(loadState); + FileMenu.addSeparator(); + if (!APQHandlers.setQuit) { - FileMenu.addSeparator(); - FileMenu.add(saveState); - FileMenu.add(loadState); + FileMenu.add(quit); + } + if (!APQHandlers.setAbout) + { + HelpMenu.add(aboutMenuItem); } - - FileMenu.add(saveAsJaxb); - FileMenu.add(loadAsJaxb); - 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 (!APQHandlers.setPreferences) { - 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); @@ -587,6 +521,7 @@ public class GDesktop extends JFrame */ protected void quit() { + // System.out.println("********** GDesktop.quit()"); } /** @@ -609,7 +544,7 @@ public class GDesktop extends JFrame * @param e * DOCUMENT ME! */ - public void SaveState_actionPerformed(ActionEvent e) + protected void preferences_actionPerformed(ActionEvent e) { } @@ -619,17 +554,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(boolean asCastor) + public void saveAsState_actionPerformed(ActionEvent e) { } @@ -639,7 +568,7 @@ public class GDesktop extends JFrame * @param e * DOCUMENT ME! */ - public void loadState_actionPerformed(boolean asCastor) + public void loadState_actionPerformed() { }