From: amwaterhouse <Andrew Waterhouse>
Date: Mon, 27 Nov 2006 12:05:38 +0000 (+0000)
Subject: Allow new window from output sequences
X-Git-Tag: Release_2_2~26
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4b3b10e22e7c22b9cfaecbd831e1e6bb9ba539a2;p=jalview.git

Allow new window from output sequences
---

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