Allow new window from output sequences
authoramwaterhouse <Andrew Waterhouse>
Mon, 27 Nov 2006 12:05:38 +0000 (12:05 +0000)
committeramwaterhouse <Andrew Waterhouse>
Mon, 27 Nov 2006 12:05:38 +0000 (12:05 +0000)
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/CutAndPasteTransfer.java
src/jalview/appletgui/Finder.java

index de19fd8..91de052 100755 (executable)
@@ -1749,7 +1749,7 @@ public void itemStateChanged(ItemEvent evt)
   {\r
       CutAndPasteTransfer cap = new CutAndPasteTransfer(true, this);\r
       cap.setText("Paste your Newick tree file here.");\r
-      cap.treeImport = true;\r
+      cap.setTreeImport();\r
       Frame frame = new Frame();\r
       frame.add(cap);\r
       jalview.bin.JalviewLite.addFrame(frame, "Paste Newick file ", 400, 300);\r
index d908f20..86f55b8 100755 (executable)
@@ -44,6 +44,7 @@ public class CutAndPasteTransfer extends Panel implements ActionListener, MouseL
 \r
     if (!forImport)\r
     {\r
+\r
       buttonPanel.setVisible(false);\r
     }\r
   }\r
@@ -64,6 +65,12 @@ public class CutAndPasteTransfer extends Panel implements ActionListener, MouseL
     pdbImport = true;\r
   }\r
 \r
+  public void setTreeImport()\r
+  {\r
+    treeImport = true;\r
+    ok.setLabel("Accept");\r
+  }\r
+\r
 \r
   public void actionPerformed(ActionEvent evt)\r
   {\r
@@ -162,9 +169,9 @@ public class CutAndPasteTransfer extends Panel implements ActionListener, MouseL
       textarea.setText("Paste your alignment file here");\r
       textarea.addMouseListener(this);\r
       this.setLayout(borderLayout1);\r
-      ok.setLabel("OK");\r
+      ok.setLabel("New Window");\r
       ok.addActionListener(this);\r
-      cancel.setLabel("Cancel");\r
+      cancel.setLabel("Close");\r
       cancel.addActionListener(this);\r
       this.add(buttonPanel, BorderLayout.SOUTH);\r
       buttonPanel.add(ok, null);\r
index db46177..52be802 100755 (executable)
@@ -86,6 +86,7 @@ public class Finder extends Panel implements ActionListener
   {\r
 \r
     CutAndPasteTransfer cap = new CutAndPasteTransfer(true, null);\r
+    cap.ok.setLabel("Accept");\r
     Dialog dialog = new Dialog(ap.alignFrame, "Enter New Feature Name", true);\r
     dialog.add(cap);\r
 \r