PDBViewer available if necessary

[jalview.git] / src / jalview / gui / ScriptWindow.java

diff --git a/src/jalview/gui/ScriptWindow.java b/src/jalview/gui/ScriptWindow.java
index a3a3f42..8e69584 100644 (file)
--- a/src/jalview/gui/ScriptWindow.java
+++ b/src/jalview/gui/ScriptWindow.java
@@ -40,7 +40,7 @@ import org.jmol.i18n.GT;
 import org.jmol.util.Logger;\r
 import org.jmol.util.CommandHistory;\r
 \r
-public final class ScriptWindow extends JInternalFrame\r
+public final class ScriptWindow extends JPanel\r
     implements ActionListener, EnterListener{\r
 \r
   private ConsoleTextPane console;\r
@@ -50,32 +50,33 @@ public final class ScriptWindow extends JInternalFrame
   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(JmolViewer viewer)\r
+  public ScriptWindow(AppJmol appJmol)\r
   {\r
-    this.viewer = viewer;\r
+    this.viewer = appJmol.viewer;\r
+    this.appJmol = appJmol;\r
+\r
 \r
-    getContentPane().setLayout(new BorderLayout());\r
+    setLayout(new BorderLayout());\r
 \r
     console = new ConsoleTextPane(this);\r
 \r
 \r
     console.setPrompt();\r
-    getContentPane().add(new JScrollPane(console)\r
+    add(new JScrollPane(console)\r
                          , BorderLayout.CENTER);\r
 \r
     JPanel buttonPanel = new JPanel();\r
-    getContentPane().add(buttonPanel, BorderLayout.SOUTH);\r
+    add(buttonPanel, BorderLayout.SOUTH);\r
 \r
     runButton = new JButton(GT._("Run"));\r
-    runButton.addActionListener(this);\r
-    buttonPanel.add(runButton);\r
-\r
     haltButton = new JButton(GT._("Halt"));\r
+    runButton.addActionListener(this);\r
+   // buttonPanel.add(runButton);\r
     haltButton.addActionListener(this);\r
-    buttonPanel.add(haltButton);\r
+  //  buttonPanel.add(haltButton);\r
     haltButton.setEnabled(false);\r
 \r
     clearButton = new JButton(GT._("Clear"));\r
@@ -90,14 +91,16 @@ public final class ScriptWindow extends JInternalFrame
     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
+    }\r
+\r
   }\r
 \r
   public void sendConsoleEcho(String strEcho) {\r
@@ -222,7 +225,7 @@ public final class ScriptWindow extends JInternalFrame
   public void actionPerformed(ActionEvent e) {\r
     Object source = e.getSource();\r
     if (source == closeButton) {\r
-      hide();\r
+      appJmol.showConsole(false);\r
     } else if (source == runButton) {\r
       executeCommandAsThread();\r
     } else if (source == clearButton) {\r
@@ -233,12 +236,6 @@ public final class ScriptWindow extends JInternalFrame
       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