run halt hidden, help moved to menu item for stupid mac users

diff --git a/src/jalview/gui/ScriptWindow.java b/src/jalview/gui/ScriptWindow.java
index ba8570e..fc2d849 100644 (file)
--- 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;\r
   private JButton historyButton;\r
   private JButton stateButton;\r
-  private JButton helpButton;\r
-  JmolViewer viewer;\r
+   JmolViewer viewer;\r
   AppJMol appJmol;\r
 \r
   public ScriptWindow(AppJMol appJmol)\r
@@ -73,13 +72,13 @@ public final class ScriptWindow extends JPanel
     add(buttonPanel, BorderLayout.SOUTH);\r
 \r
     runButton = new JButton(GT._("Run"));\r
+    haltButton = new JButton(GT._("Halt"));\r
+    /*\r
     runButton.addActionListener(this);\r
     buttonPanel.add(runButton);\r
-\r
-    haltButton = new JButton(GT._("Halt"));\r
     haltButton.addActionListener(this);\r
     buttonPanel.add(haltButton);\r
-    haltButton.setEnabled(false);\r
+    haltButton.setEnabled(false);*/\r
 \r
     clearButton = new JButton(GT._("Clear"));\r
     clearButton.addActionListener(this);\r
@@ -93,18 +92,14 @@ public final class ScriptWindow extends JPanel
     stateButton.addActionListener(this);\r
     buttonPanel.add(stateButton);\r
 \r
-    helpButton = new JButton(GT._("Help"));\r
-    helpButton.addActionListener(this);\r
-    buttonPanel.add(helpButton);\r
-\r
     closeButton = new JButton(GT._("Close"));\r
     closeButton.addActionListener(this);\r
     buttonPanel.add(closeButton);\r
 \r
     for(int i=0; i<buttonPanel.getComponentCount(); i++)\r
     {\r
-      ((JButton)buttonPanel.getComponent(i))\r
-          .setMargin(new Insets(0, 0, 0, 0));\r
+    //  ((JButton)buttonPanel.getComponent(i))\r
+    //      .setMargin(new Insets(0, 0, 0, 0));\r
     }\r
 \r
   }\r
@@ -242,12 +237,6 @@ public final class ScriptWindow extends JPanel
       console.clearContent(viewer.getStateInfo());\r
     } else if (source == haltButton) {\r
       viewer.haltScriptExecution();\r
-    } else if (source == helpButton) {\r
-        try{\r
-          jalview.util.BrowserLauncher.openURL(\r
-              "http://jmol.sourceforge.net/docs/JmolUserGuide/ch04.html");\r
-        }catch(Exception ex){}\r
-\r
     }\r
     console.grabFocus(); // always grab the focus (e.g., after clear)\r
   }\r

diff --git a/src/jalview/jbgui/GStructureViewer.java b/src/jalview/jbgui/GStructureViewer.java
index 2d558de..3616a79 100644 (file)
--- a/src/jalview/jbgui/GStructureViewer.java
+++ b/src/jalview/jbgui/GStructureViewer.java
@@ -78,7 +78,7 @@ public class GStructureViewer  extends JInternalFrame
     });\r
     viewMenu.setText("View");\r
     chainMenu.setText("Show Chain");\r
-    jMenu2.setText("Colours");\r
+    colourMenu.setText("Colours");\r
     backGround.setText("Background Colour...");\r
     backGround.addActionListener(new ActionListener()\r
     {\r
@@ -176,27 +176,38 @@ public class GStructureViewer  extends JInternalFrame
         userColour_actionPerformed(actionEvent);\r
       }\r
     });\r
+    helpMenu.setText("Help");\r
+    jmolHelp.setText("Jmol Help");\r
+    jmolHelp.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent actionEvent)\r
+      {\r
+        jmolHelp_actionPerformed(actionEvent);\r
+      }\r
+    });\r
     menuBar.add(fileMenu);\r
     menuBar.add(viewMenu);\r
-    menuBar.add(jMenu2);\r
+    menuBar.add(colourMenu);\r
+    menuBar.add(helpMenu);\r
     fileMenu.add(savemenu);\r
     fileMenu.add(viewMapping);\r
     savemenu.add(pdbFile);\r
     savemenu.add(png);\r
     savemenu.add(eps);\r
     viewMenu.add(chainMenu);\r
-    jMenu2.add(seqColour);\r
-    jMenu2.add(chainColour);\r
-    jMenu2.add(chargeColour);\r
-    jMenu2.add(zappoColour);\r
-    jMenu2.add(taylorColour);\r
-    jMenu2.add(hydroColour);\r
-    jMenu2.add(helixColour);\r
-    jMenu2.add(strandColour);\r
-    jMenu2.add(turnColour);\r
-    jMenu2.add(buriedColour);\r
-    jMenu2.add(userColour);\r
-    jMenu2.add(backGround);\r
+    colourMenu.add(seqColour);\r
+    colourMenu.add(chainColour);\r
+    colourMenu.add(chargeColour);\r
+    colourMenu.add(zappoColour);\r
+    colourMenu.add(taylorColour);\r
+    colourMenu.add(hydroColour);\r
+    colourMenu.add(helixColour);\r
+    colourMenu.add(strandColour);\r
+    colourMenu.add(turnColour);\r
+    colourMenu.add(buriedColour);\r
+    colourMenu.add(userColour);\r
+    colourMenu.add(backGround);\r
+    helpMenu.add(jmolHelp);\r
   }\r
 \r
   JMenuBar menuBar = new JMenuBar();\r
@@ -209,7 +220,7 @@ public class GStructureViewer  extends JInternalFrame
   JMenu viewMenu = new JMenu();\r
   protected JMenu chainMenu = new JMenu();\r
   JMenu jMenu1 = new JMenu();\r
-  JMenu jMenu2 = new JMenu();\r
+  JMenu colourMenu = new JMenu();\r
   JMenuItem backGround = new JMenuItem();\r
   protected JCheckBoxMenuItem seqColour = new JCheckBoxMenuItem();\r
   JMenuItem chainColour = new JMenuItem();\r
@@ -222,6 +233,8 @@ public class GStructureViewer  extends JInternalFrame
   JMenuItem turnColour = new JMenuItem();\r
   JMenuItem buriedColour = new JMenuItem();\r
   JMenuItem userColour = new JMenuItem();\r
+  JMenu helpMenu = new JMenu();\r
+  JMenuItem jmolHelp = new JMenuItem();\r
   public void pdbFile_actionPerformed(ActionEvent actionEvent)\r
   {\r
 \r
@@ -301,4 +314,9 @@ public class GStructureViewer  extends JInternalFrame
   {\r
 \r
   }\r
+\r
+  public void jmolHelp_actionPerformed(ActionEvent actionEvent)\r
+  {\r
+\r
+  }\r
 }\r