X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGDesktop.java;h=daea610268b4e1d039001652098f6e5097612f50;hb=d587f1aa61946dc14f6f089cf1dc2a3116cfb773;hp=16b4950877514ef4d992857edc99a9076cb84d15;hpb=0b23947e2cdcd704d3f313b23ba271e43d097344;p=jalview.git

diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java
index 16b4950..daea610 100755
--- a/src/jalview/jbgui/GDesktop.java
+++ b/src/jalview/jbgui/GDesktop.java
@@ -33,7 +33,7 @@ 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();
@@ -48,10 +48,13 @@ 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();
 
   /**
      * Creates a new GDesktop object.
@@ -61,12 +64,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');
+        }
     }
 
     /**
@@ -76,16 +92,13 @@ public class GDesktop extends JFrame
      */
     private void jbInit() throws Exception
     {
-        FileMenu.setMnemonic('F');
         FileMenu.setText("File");
         HelpMenu.setText("Help");
         VamsasMenu.setText("Vamsas");
-        VamsasMenu.setMnemonic('V');
         VamsasMenu.setToolTipText("Share data with other vamsas applications.");
-        inputLocalFileMenuItem.setMnemonic('L');
         inputLocalFileMenuItem.setText("from File");
     inputLocalFileMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
-        java.awt.event.KeyEvent.VK_O, java.awt.event.KeyEvent.CTRL_MASK, false));
+        java.awt.event.KeyEvent.VK_O, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));
     inputLocalFileMenuItem.addActionListener(new java.awt.event.ActionListener()
             {
                 public void actionPerformed(ActionEvent e)
@@ -93,7 +106,6 @@ public class GDesktop extends JFrame
                     inputLocalFileMenuItem_actionPerformed(null);
                 }
             });
-        inputURLMenuItem.setMnemonic('U');
         inputURLMenuItem.setText("from URL");
         inputURLMenuItem.addActionListener(new java.awt.event.ActionListener()
             {
@@ -102,7 +114,6 @@ public class GDesktop extends JFrame
                     inputURLMenuItem_actionPerformed(null);
                 }
             });
-        inputTextboxMenuItem.setMnemonic('C');
         inputTextboxMenuItem.setText("from Textbox");
         inputTextboxMenuItem.addActionListener(new java.awt.event.ActionListener()
             {
@@ -111,7 +122,6 @@ public class GDesktop extends JFrame
                     inputTextboxMenuItem_actionPerformed(null);
                 }
             });
-        quit.setMnemonic('Q');
         quit.setText("Quit");
         quit.addActionListener(new java.awt.event.ActionListener()
             {
@@ -129,7 +139,9 @@ public class GDesktop extends JFrame
                 }
             });
         documentationMenuItem.setText("Documentation");
-        documentationMenuItem.addActionListener(new java.awt.event.ActionListener()
+    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)
                 {
@@ -147,7 +159,6 @@ public class GDesktop extends JFrame
                 }
             });
         toolsMenu.setText("Tools");
-        saveState.setMnemonic('S');
         saveState.setText("Save Project");
         saveState.addActionListener(new ActionListener()
             {
@@ -156,7 +167,6 @@ public class GDesktop extends JFrame
                     saveState_actionPerformed(e);
                 }
             });
-        loadState.setMnemonic('L');
         loadState.setText("Load Project");
         loadState.addActionListener(new ActionListener()
             {
@@ -165,8 +175,7 @@ public class GDesktop extends JFrame
                     loadState_actionPerformed(e);
                 }
             });
-        jMenu1.setMnemonic('I');
-        jMenu1.setText("Input Alignment");
+        inputMenu.setText("Input Alignment");
     vamsasLoad.setText("Start Vamsas Session...");
     vamsasLoad.setVisible(false);
     vamsasLoad.addActionListener(new ActionListener()
@@ -192,28 +201,57 @@ public class GDesktop extends JFrame
       {
         vamsasStop_actionPerformed(e);
       }
-    });    DesktopMenubar.add(FileMenu);
-        DesktopMenubar.add(toolsMenu);
-        VamsasMenu.setVisible(false);
-        DesktopMenubar.add(VamsasMenu);
-        DesktopMenubar.add(HelpMenu);
-        DesktopMenubar.add(windowMenu);
-    FileMenu.add(jMenu1);
+    });
+    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);
-        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);
+    windowMenu.add(closeAll);
+    windowMenu.add(raiseRelated);
+    windowMenu.add(minimizeAssociated);
+    windowMenu.addSeparator();
+    //    inputMenu.add(vamsasLoad);
   }
 
     /**
@@ -325,5 +363,20 @@ public class GDesktop extends JFrame
   public void vamsasStop_actionPerformed(ActionEvent e)
   {
 
-	}
+  }
+
+  public void closeAll_actionPerformed(ActionEvent e)
+  {
+
+  }
+
+  public void raiseRelated_actionPerformed(ActionEvent e)
+  {
+
+  }
+
+  public void minimizeAssociated_actionPerformed(ActionEvent e)
+  {
+
+  }
 }