From 70c13443ed352d9b3de815fdab2bd920c243c6eb Mon Sep 17 00:00:00 2001
From: amwaterhouse <Andrew Waterhouse>
Date: Fri, 23 Mar 2007 10:46:47 +0000
Subject: [PATCH] run halt hidden, help moved to menu item for stupid mac
 users

---
 src/jalview/gui/ScriptWindow.java       |   23 ++++-----------
 src/jalview/jbgui/GStructureViewer.java |   48 +++++++++++++++++++++----------
 2 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/src/jalview/gui/ScriptWindow.java b/src/jalview/gui/ScriptWindow.java
index ba8570e..fc2d849 100644
--- a/src/jalview/gui/ScriptWindow.java
+++ b/src/jalview/gui/ScriptWindow.java
@@ -50,8 +50,7 @@ public final class ScriptWindow extends JPanel
   private JButton clearButton;
   private JButton historyButton;
   private JButton stateButton;
-  private JButton helpButton;
-  JmolViewer viewer;
+   JmolViewer viewer;
   AppJMol appJmol;
 
   public ScriptWindow(AppJMol appJmol)
@@ -73,13 +72,13 @@ public final class ScriptWindow extends JPanel
     add(buttonPanel, BorderLayout.SOUTH);
 
     runButton = new JButton(GT._("Run"));
+    haltButton = new JButton(GT._("Halt"));
+    /*
     runButton.addActionListener(this);
     buttonPanel.add(runButton);
-
-    haltButton = new JButton(GT._("Halt"));
     haltButton.addActionListener(this);
     buttonPanel.add(haltButton);
-    haltButton.setEnabled(false);
+    haltButton.setEnabled(false);*/
 
     clearButton = new JButton(GT._("Clear"));
     clearButton.addActionListener(this);
@@ -93,18 +92,14 @@ public final class ScriptWindow extends JPanel
     stateButton.addActionListener(this);
     buttonPanel.add(stateButton);
 
-    helpButton = new JButton(GT._("Help"));
-    helpButton.addActionListener(this);
-    buttonPanel.add(helpButton);
-
     closeButton = new JButton(GT._("Close"));
     closeButton.addActionListener(this);
     buttonPanel.add(closeButton);
 
     for(int i=0; i<buttonPanel.getComponentCount(); i++)
     {
-      ((JButton)buttonPanel.getComponent(i))
-          .setMargin(new Insets(0, 0, 0, 0));
+    //  ((JButton)buttonPanel.getComponent(i))
+    //      .setMargin(new Insets(0, 0, 0, 0));
     }
 
   }
@@ -242,12 +237,6 @@ public final class ScriptWindow extends JPanel
       console.clearContent(viewer.getStateInfo());
     } else if (source == haltButton) {
       viewer.haltScriptExecution();
-    } else if (source == helpButton) {
-        try{
-          jalview.util.BrowserLauncher.openURL(
-              "http://jmol.sourceforge.net/docs/JmolUserGuide/ch04.html");
-        }catch(Exception ex){}
-
     }
     console.grabFocus(); // always grab the focus (e.g., after clear)
   }
diff --git a/src/jalview/jbgui/GStructureViewer.java b/src/jalview/jbgui/GStructureViewer.java
index 2d558de..3616a79 100644
--- a/src/jalview/jbgui/GStructureViewer.java
+++ b/src/jalview/jbgui/GStructureViewer.java
@@ -78,7 +78,7 @@ public class GStructureViewer  extends JInternalFrame
     });
     viewMenu.setText("View");
     chainMenu.setText("Show Chain");
-    jMenu2.setText("Colours");
+    colourMenu.setText("Colours");
     backGround.setText("Background Colour...");
     backGround.addActionListener(new ActionListener()
     {
@@ -176,27 +176,38 @@ public class GStructureViewer  extends JInternalFrame
         userColour_actionPerformed(actionEvent);
       }
     });
+    helpMenu.setText("Help");
+    jmolHelp.setText("Jmol Help");
+    jmolHelp.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent actionEvent)
+      {
+        jmolHelp_actionPerformed(actionEvent);
+      }
+    });
     menuBar.add(fileMenu);
     menuBar.add(viewMenu);
-    menuBar.add(jMenu2);
+    menuBar.add(colourMenu);
+    menuBar.add(helpMenu);
     fileMenu.add(savemenu);
     fileMenu.add(viewMapping);
     savemenu.add(pdbFile);
     savemenu.add(png);
     savemenu.add(eps);
     viewMenu.add(chainMenu);
-    jMenu2.add(seqColour);
-    jMenu2.add(chainColour);
-    jMenu2.add(chargeColour);
-    jMenu2.add(zappoColour);
-    jMenu2.add(taylorColour);
-    jMenu2.add(hydroColour);
-    jMenu2.add(helixColour);
-    jMenu2.add(strandColour);
-    jMenu2.add(turnColour);
-    jMenu2.add(buriedColour);
-    jMenu2.add(userColour);
-    jMenu2.add(backGround);
+    colourMenu.add(seqColour);
+    colourMenu.add(chainColour);
+    colourMenu.add(chargeColour);
+    colourMenu.add(zappoColour);
+    colourMenu.add(taylorColour);
+    colourMenu.add(hydroColour);
+    colourMenu.add(helixColour);
+    colourMenu.add(strandColour);
+    colourMenu.add(turnColour);
+    colourMenu.add(buriedColour);
+    colourMenu.add(userColour);
+    colourMenu.add(backGround);
+    helpMenu.add(jmolHelp);
   }
 
   JMenuBar menuBar = new JMenuBar();
@@ -209,7 +220,7 @@ public class GStructureViewer  extends JInternalFrame
   JMenu viewMenu = new JMenu();
   protected JMenu chainMenu = new JMenu();
   JMenu jMenu1 = new JMenu();
-  JMenu jMenu2 = new JMenu();
+  JMenu colourMenu = new JMenu();
   JMenuItem backGround = new JMenuItem();
   protected JCheckBoxMenuItem seqColour = new JCheckBoxMenuItem();
   JMenuItem chainColour = new JMenuItem();
@@ -222,6 +233,8 @@ public class GStructureViewer  extends JInternalFrame
   JMenuItem turnColour = new JMenuItem();
   JMenuItem buriedColour = new JMenuItem();
   JMenuItem userColour = new JMenuItem();
+  JMenu helpMenu = new JMenu();
+  JMenuItem jmolHelp = new JMenuItem();
   public void pdbFile_actionPerformed(ActionEvent actionEvent)
   {
 
@@ -301,4 +314,9 @@ public class GStructureViewer  extends JInternalFrame
   {
 
   }
+
+  public void jmolHelp_actionPerformed(ActionEvent actionEvent)
+  {
+
+  }
 }
-- 
1.7.10.2