X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGDesktop.java;h=daea610268b4e1d039001652098f6e5097612f50;hb=ae83cc59079dc5374a41402889b6f4192f66e9e2;hp=06340c323e8ef1051999294d432c955ba3e63685;hpb=588042b69abf8e60bcc950b24c283933c7dd422f;p=jalview.git

diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java
index 06340c3..daea610 100755
--- a/src/jalview/jbgui/GDesktop.java
+++ b/src/jalview/jbgui/GDesktop.java
@@ -1,6 +1,6 @@
 /*
 * Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+* Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -24,11 +24,19 @@ import java.awt.event.*;
 import javax.swing.*;
 
 
-public class GDesktop extends JFrame {
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+public class GDesktop extends JFrame
+{
     protected static JMenu windowMenu = new JMenu();
-    JMenuBar DesktopMenubar = new JMenuBar();
+    JMenuBar desktopMenubar = new JMenuBar();
     JMenu FileMenu = new JMenu();
     JMenu HelpMenu = new JMenu();
+    protected JMenu VamsasMenu = new JMenu();
     JMenuItem inputLocalFileMenuItem = new JMenuItem();
     JMenuItem inputURLMenuItem = new JMenuItem();
     JMenuItem inputTextboxMenuItem = new JMenuItem();
@@ -40,135 +48,335 @@ public class GDesktop extends JFrame {
     JMenuItem preferences = new JMenuItem();
     JMenuItem saveState = new JMenuItem();
     JMenuItem loadState = new JMenuItem();
-    JMenu jMenu1 = new JMenu();
+    JMenu inputMenu = new JMenu();
+  protected JMenuItem vamsasLoad = new JMenuItem();
+  JMenuItem inputSequence = new JMenuItem();
+  protected JMenuItem vamsasStop = new JMenuItem();
+  JMenuItem closeAll = new JMenuItem();
+  JMenuItem raiseRelated = new JMenuItem();
+  JMenuItem minimizeAssociated = new JMenuItem();
 
-    public GDesktop() {
-        try {
+  /**
+     * Creates a new GDesktop object.
+     */
+    public GDesktop()
+    {
+        try
+        {
             jbInit();
-            this.setJMenuBar(DesktopMenubar);
-        } catch (Exception e) {
+            this.setJMenuBar(desktopMenubar);
+        }
+        catch (Exception e)
+        {
             e.printStackTrace();
         }
+
+        if (!System.getProperty("os.name").startsWith("Mac"))
+        {
+          FileMenu.setMnemonic('F');
+          inputLocalFileMenuItem.setMnemonic('L');
+          VamsasMenu.setMnemonic('V');
+          inputURLMenuItem.setMnemonic('U');
+          inputTextboxMenuItem.setMnemonic('C');
+          quit.setMnemonic('Q');
+          saveState.setMnemonic('S');
+          loadState.setMnemonic('L');
+          inputMenu.setMnemonic('I');
+        }
     }
 
-    private void jbInit() throws Exception {
-        FileMenu.setMnemonic('F');
+    /**
+     * DOCUMENT ME!
+     *
+     * @throws Exception DOCUMENT ME!
+     */
+    private void jbInit() throws Exception
+    {
         FileMenu.setText("File");
         HelpMenu.setText("Help");
-        inputLocalFileMenuItem.setMnemonic('L');
+        VamsasMenu.setText("Vamsas");
+        VamsasMenu.setToolTipText("Share data with other vamsas applications.");
         inputLocalFileMenuItem.setText("from File");
-        inputLocalFileMenuItem.addActionListener(new java.awt.event.ActionListener() {
-                public void actionPerformed(ActionEvent e) {
-                    inputLocalFileMenuItem_actionPerformed(e);
+    inputLocalFileMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
+        java.awt.event.KeyEvent.VK_O, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));
+    inputLocalFileMenuItem.addActionListener(new java.awt.event.ActionListener()
+            {
+                public void actionPerformed(ActionEvent e)
+                {
+                    inputLocalFileMenuItem_actionPerformed(null);
                 }
             });
-        inputURLMenuItem.setMnemonic('U');
         inputURLMenuItem.setText("from URL");
-        inputURLMenuItem.addActionListener(new java.awt.event.ActionListener() {
-                public void actionPerformed(ActionEvent e) {
-                    inputURLMenuItem_actionPerformed(e);
+        inputURLMenuItem.addActionListener(new java.awt.event.ActionListener()
+            {
+                public void actionPerformed(ActionEvent e)
+                {
+                    inputURLMenuItem_actionPerformed(null);
                 }
             });
-        inputTextboxMenuItem.setMnemonic('C');
         inputTextboxMenuItem.setText("from Textbox");
-        inputTextboxMenuItem.addActionListener(new java.awt.event.ActionListener() {
-                public void actionPerformed(ActionEvent e) {
-                    inputTextboxMenuItem_actionPerformed(e);
+        inputTextboxMenuItem.addActionListener(new java.awt.event.ActionListener()
+            {
+                public void actionPerformed(ActionEvent e)
+                {
+                    inputTextboxMenuItem_actionPerformed(null);
                 }
             });
-        quit.setMnemonic('Q');
         quit.setText("Quit");
-        quit.addActionListener(new java.awt.event.ActionListener() {
-                public void actionPerformed(ActionEvent e) {
-                    quit_actionPerformed(e);
+        quit.addActionListener(new java.awt.event.ActionListener()
+            {
+                public void actionPerformed(ActionEvent e)
+                {
+                    quit();
                 }
             });
         aboutMenuItem.setText("About");
-        aboutMenuItem.addActionListener(new java.awt.event.ActionListener() {
-                public void actionPerformed(ActionEvent e) {
+        aboutMenuItem.addActionListener(new java.awt.event.ActionListener()
+            {
+                public void actionPerformed(ActionEvent e)
+                {
                     aboutMenuItem_actionPerformed(e);
                 }
             });
         documentationMenuItem.setText("Documentation");
-        documentationMenuItem.addActionListener(new java.awt.event.ActionListener() {
-                public void actionPerformed(ActionEvent e) {
+    documentationMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
+        java.awt.event.KeyEvent.VK_F1, 0, false));
+    documentationMenuItem.addActionListener(new java.awt.event.ActionListener()
+            {
+                public void actionPerformed(ActionEvent e)
+                {
                     documentationMenuItem_actionPerformed(e);
                 }
             });
         this.getContentPane().setLayout(flowLayout1);
         windowMenu.setText("Window");
         preferences.setText("Preferences...");
-        preferences.addActionListener(new ActionListener() {
-                public void actionPerformed(ActionEvent e) {
+        preferences.addActionListener(new ActionListener()
+            {
+                public void actionPerformed(ActionEvent e)
+                {
                     preferences_actionPerformed(e);
                 }
             });
         toolsMenu.setText("Tools");
-        saveState.setMnemonic('S');
         saveState.setText("Save Project");
-        saveState.addActionListener(new ActionListener() {
-                public void actionPerformed(ActionEvent e) {
+        saveState.addActionListener(new ActionListener()
+            {
+                public void actionPerformed(ActionEvent e)
+                {
                     saveState_actionPerformed(e);
                 }
             });
-        loadState.setMnemonic('L');
         loadState.setText("Load Project");
-        loadState.addActionListener(new ActionListener() {
-                public void actionPerformed(ActionEvent e) {
+        loadState.addActionListener(new ActionListener()
+            {
+                public void actionPerformed(ActionEvent e)
+                {
                     loadState_actionPerformed(e);
                 }
             });
-        jMenu1.setMnemonic('I');
-        jMenu1.setText("Input Alignment");
-        DesktopMenubar.add(FileMenu);
-        DesktopMenubar.add(toolsMenu);
-        DesktopMenubar.add(HelpMenu);
-        DesktopMenubar.add(windowMenu);
-        FileMenu.addSeparator();
-        FileMenu.add(jMenu1);
-        FileMenu.addSeparator();
-        FileMenu.add(saveState);
-        FileMenu.add(loadState);
-        FileMenu.addSeparator();
-        FileMenu.add(quit);
-        HelpMenu.add(aboutMenuItem);
-        HelpMenu.add(documentationMenuItem);
-        toolsMenu.add(preferences);
-        jMenu1.add(inputLocalFileMenuItem);
-        jMenu1.add(inputURLMenuItem);
-        jMenu1.add(inputTextboxMenuItem);
-    }
+        inputMenu.setText("Input Alignment");
+    vamsasLoad.setText("Start Vamsas Session...");
+    vamsasLoad.setVisible(false);
+    vamsasLoad.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        vamsasLoad_actionPerformed(e);
+      }
+    });
+    inputSequence.setText("Fetch Sequence(s)...");
+    inputSequence.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        inputSequence_actionPerformed(e);
+      }
+    });
+    vamsasStop.setText("Stop Vamsas Session");
+    vamsasStop.setVisible(false);
+    vamsasStop.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        vamsasStop_actionPerformed(e);
+      }
+    });
+    closeAll.setText("Close All");
+    closeAll.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        closeAll_actionPerformed(e);
+      }
+    });
+    raiseRelated.setText("Raise Associated Windows");
+    raiseRelated.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        raiseRelated_actionPerformed(e);
+      }
+    });
+    minimizeAssociated.setText("Minimize Associated Windows");
+    minimizeAssociated.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        minimizeAssociated_actionPerformed(e);
+      }
+    });
+    desktopMenubar.add(FileMenu);
+    desktopMenubar.add(toolsMenu);
+    VamsasMenu.setVisible(false);
+    desktopMenubar.add(VamsasMenu);
+    desktopMenubar.add(HelpMenu);
+    desktopMenubar.add(windowMenu);
+    FileMenu.add(inputMenu);
+    FileMenu.add(inputSequence);
+    FileMenu.addSeparator();
+    FileMenu.add(saveState);
+    FileMenu.add(loadState);
+    FileMenu.addSeparator();
+    FileMenu.add(quit);
+    HelpMenu.add(aboutMenuItem);
+    HelpMenu.add(documentationMenuItem);
+    VamsasMenu.add(vamsasLoad);
+    VamsasMenu.add(vamsasStop);
+    toolsMenu.add(preferences);
+    inputMenu.add(inputLocalFileMenuItem);
+    inputMenu.add(inputURLMenuItem);
+    inputMenu.add(inputTextboxMenuItem);
+    windowMenu.add(closeAll);
+    windowMenu.add(raiseRelated);
+    windowMenu.add(minimizeAssociated);
+    windowMenu.addSeparator();
+    //    inputMenu.add(vamsasLoad);
+  }
 
-    protected void inputLocalFileMenuItem_actionPerformed(ActionEvent e) {
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    protected void inputLocalFileMenuItem_actionPerformed(jalview.gui.AlignViewport av)
+    {
     }
 
-    protected void inputURLMenuItem_actionPerformed(ActionEvent e) {
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    protected void inputURLMenuItem_actionPerformed(jalview.gui.AlignViewport av)
+    {
     }
 
-    protected void inputTextboxMenuItem_actionPerformed(ActionEvent e) {
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    protected void inputTextboxMenuItem_actionPerformed(jalview.gui.AlignViewport av)
+    {
     }
 
-    protected void quit_actionPerformed(ActionEvent e) {
+    /**
+     * DOCUMENT ME!
+     */
+    protected void quit()
+    {
     }
 
-    protected void aboutMenuItem_actionPerformed(ActionEvent e) {
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    protected void aboutMenuItem_actionPerformed(ActionEvent e)
+    {
     }
 
-    protected void documentationMenuItem_actionPerformed(ActionEvent e) {
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    protected void documentationMenuItem_actionPerformed(ActionEvent e)
+    {
     }
 
-    public void SaveState_actionPerformed(ActionEvent e) {
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void SaveState_actionPerformed(ActionEvent e)
+    {
     }
 
-    protected void preferences_actionPerformed(ActionEvent e) {
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    protected void preferences_actionPerformed(ActionEvent e)
+    {
     }
 
-    public void saveState_actionPerformed(ActionEvent e) {
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void saveState_actionPerformed(ActionEvent e)
+    {
     }
 
-    public void loadState_actionPerformed(ActionEvent e) {
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void loadState_actionPerformed(ActionEvent e)
+    {
     }
 
-    public void loadJalviewAlign_actionPerformed(ActionEvent e) {
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void loadJalviewAlign_actionPerformed(ActionEvent e)
+    {
     }
+
+  public void vamsasLoad_actionPerformed(ActionEvent e)
+  {
+
+  }
+
+  public void inputSequence_actionPerformed(ActionEvent e)
+  {
+
+  }
+  public void vamsasStop_actionPerformed(ActionEvent e)
+  {
+
+  }
+
+  public void closeAll_actionPerformed(ActionEvent e)
+  {
+
+  }
+
+  public void raiseRelated_actionPerformed(ActionEvent e)
+  {
+
+  }
+
+  public void minimizeAssociated_actionPerformed(ActionEvent e)
+  {
+
+  }
 }