X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGDesktop.java;h=3be34c3000c79f400156023e81c2658f0c9fb999;hb=7f7fc2e5533f7b00c86465f964e37c55bcf12fd7;hp=5505e692f0586fddadd1e867dcf6ead0d6a92135;hpb=55e2e9b22b133db8b9ff0979b0338a33081fc8fd;p=jalview.git

diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java
index 5505e69..3be34c3 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
@@ -33,9 +33,10 @@ import javax.swing.*;
 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();
@@ -47,9 +48,10 @@ public class GDesktop extends JFrame
     JMenuItem preferences = new JMenuItem();
     JMenuItem saveState = new JMenuItem();
     JMenuItem loadState = new JMenuItem();
-    JMenu jMenu1 = new JMenu();
-  JMenuItem vamsasLoad = new JMenuItem();
+    JMenu inputMenu = new JMenu();
+  protected JMenuItem vamsasLoad = new JMenuItem();
   JMenuItem inputSequence = new JMenuItem();
+  protected JMenuItem vamsasStop = new JMenuItem();
 
   /**
      * Creates a new GDesktop object.
@@ -59,12 +61,25 @@ public class GDesktop extends JFrame
         try
         {
             jbInit();
-            this.setJMenuBar(DesktopMenubar);
+            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');
+        }
     }
 
     /**
@@ -74,37 +89,36 @@ public class GDesktop extends JFrame
      */
     private void jbInit() throws Exception
     {
-        FileMenu.setMnemonic('F');
         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()
+    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(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_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_actionPerformed(null);
                 }
             });
-        quit.setMnemonic('Q');
         quit.setText("Quit");
         quit.addActionListener(new java.awt.event.ActionListener()
             {
@@ -140,7 +154,6 @@ public class GDesktop extends JFrame
                 }
             });
         toolsMenu.setText("Tools");
-        saveState.setMnemonic('S');
         saveState.setText("Save Project");
         saveState.addActionListener(new ActionListener()
             {
@@ -149,7 +162,6 @@ public class GDesktop extends JFrame
                     saveState_actionPerformed(e);
                 }
             });
-        loadState.setMnemonic('L');
         loadState.setText("Load Project");
         loadState.addActionListener(new ActionListener()
             {
@@ -158,9 +170,8 @@ public class GDesktop extends JFrame
                     loadState_actionPerformed(e);
                 }
             });
-        jMenu1.setMnemonic('I');
-        jMenu1.setText("Input Alignment");
-    vamsasLoad.setText("Vamsas");
+        inputMenu.setText("Input Alignment");
+    vamsasLoad.setText("Start Vamsas Session...");
     vamsasLoad.setVisible(false);
     vamsasLoad.addActionListener(new ActionListener()
     {
@@ -169,7 +180,7 @@ public class GDesktop extends JFrame
         vamsasLoad_actionPerformed(e);
       }
     });
-    inputSequence.setText("Fetch Sequence...");
+    inputSequence.setText("Fetch Sequence(s)...");
     inputSequence.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -177,25 +188,37 @@ public class GDesktop extends JFrame
         inputSequence_actionPerformed(e);
       }
     });
-    DesktopMenubar.add(FileMenu);
-        DesktopMenubar.add(toolsMenu);
-        DesktopMenubar.add(HelpMenu);
-        DesktopMenubar.add(windowMenu);
-        FileMenu.addSeparator();
-        FileMenu.add(jMenu1);
+    vamsasStop.setText("Stop Vamsas Session");
+    vamsasStop.setVisible(false);
+    vamsasStop.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        vamsasStop_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);
-        toolsMenu.add(preferences);
-        jMenu1.add(inputLocalFileMenuItem);
-        jMenu1.add(inputURLMenuItem);
-        jMenu1.add(inputTextboxMenuItem);
-    jMenu1.add(vamsasLoad);
+    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);
+	//    inputMenu.add(vamsasLoad);
   }
 
     /**
@@ -203,7 +226,7 @@ public class GDesktop extends JFrame
      *
      * @param e DOCUMENT ME!
      */
-    protected void inputLocalFileMenuItem_actionPerformed(ActionEvent e)
+    protected void inputLocalFileMenuItem_actionPerformed(jalview.gui.AlignViewport av)
     {
     }
 
@@ -212,7 +235,7 @@ public class GDesktop extends JFrame
      *
      * @param e DOCUMENT ME!
      */
-    protected void inputURLMenuItem_actionPerformed(ActionEvent e)
+    protected void inputURLMenuItem_actionPerformed(jalview.gui.AlignViewport av)
     {
     }
 
@@ -221,7 +244,7 @@ public class GDesktop extends JFrame
      *
      * @param e DOCUMENT ME!
      */
-    protected void inputTextboxMenuItem_actionPerformed(ActionEvent e)
+    protected void inputTextboxMenuItem_actionPerformed(jalview.gui.AlignViewport av)
     {
     }
 
@@ -304,4 +327,8 @@ public class GDesktop extends JFrame
   {
 
   }
+  public void vamsasStop_actionPerformed(ActionEvent e)
+  {
+
+	}
 }