Now a JPanel, plus some modifications

diff --git a/src/jalview/gui/ScriptWindow.java b/src/jalview/gui/ScriptWindow.java
index a3a3f42..ba8570e 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
@@ -52,22 +52,25 @@ public final class ScriptWindow extends JInternalFrame
   private JButton stateButton;\r
   private JButton helpButton;\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
-    getContentPane().setLayout(new BorderLayout());\r
+\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
@@ -98,6 +101,12 @@ public final class ScriptWindow extends JInternalFrame
     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 +231,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