Merge branch 'develop' into feature/JAL-1713_overviewInProject

[jalview.git] / src / jalview / jbgui / GFinder.java

diff --git a/src/jalview/jbgui/GFinder.java b/src/jalview/jbgui/GFinder.java
index c5488f0..9ed2127 100755 (executable)
--- a/src/jalview/jbgui/GFinder.java
+++ b/src/jalview/jbgui/GFinder.java
@@ -20,13 +20,6 @@
  */
 package jalview.jbgui;
 
-import jalview.datamodel.AlignmentI;
-import jalview.io.DataSourceType;
-import jalview.io.FileFormat;
-import jalview.io.FormatAdapter;
-import jalview.io.cache.JvCacheableInputBox;
-import jalview.util.MessageManager;
-
 import java.awt.BorderLayout;
 import java.awt.Font;
 import java.awt.GridLayout;
@@ -44,6 +37,13 @@ import javax.swing.SwingUtilities;
 import javax.swing.event.CaretEvent;
 import javax.swing.event.CaretListener;
 
+import jalview.datamodel.AlignmentI;
+import jalview.io.DataSourceType;
+import jalview.io.FileFormat;
+import jalview.io.FormatAdapter;
+import jalview.io.cache.JvCacheableInputBox;
+import jalview.util.MessageManager;
+
 public class GFinder extends JPanel
 {
   private static final java.awt.Font VERDANA_12 = new Font("Verdana",
@@ -59,12 +59,16 @@ public class GFinder extends JPanel
 
   protected JButton createFeatures;
 
+  protected JButton copyToClipboard;
+
   protected JvCacheableInputBox<String> searchBox;
 
   protected JCheckBox caseSensitive;
 
   protected JCheckBox searchDescription;
 
+  protected JCheckBox searchFeatures;
+
   protected JCheckBox ignoreHidden;
 
   public GFinder()
@@ -152,6 +156,10 @@ public class GFinder extends JPanel
     searchDescription
             .setText(MessageManager.getString("label.include_description"));
 
+    searchFeatures = new JCheckBox();
+    searchFeatures
+            .setText(MessageManager.getString("label.include_features"));
+
     ignoreHidden = new JCheckBox();
     ignoreHidden.setText(MessageManager.getString("label.ignore_hidden"));
     ignoreHidden.setToolTipText(
@@ -159,6 +167,7 @@ public class GFinder extends JPanel
 
     centrePanel.add(caseSensitive);
     centrePanel.add(searchDescription);
+    centrePanel.add(searchFeatures);
     centrePanel.add(ignoreHidden);
 
     /*
@@ -198,9 +207,26 @@ public class GFinder extends JPanel
         createFeatures_actionPerformed();
       }
     });
+    copyToClipboard = new JButton();
+    copyToClipboard.setEnabled(false);
+    copyToClipboard.setFont(VERDANA_12);
+    copyToClipboard.setText(MessageManager.getString("label.copy"));
+    copyToClipboard.addActionListener(new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        copyToClipboard_actionPerformed();
+      }
+    });
     eastPanel.add(findNext);
     eastPanel.add(findAll);
     eastPanel.add(createFeatures);
+    eastPanel.add(copyToClipboard);
+  }
+
+  protected void copyToClipboard_actionPerformed()
+  {
   }
 
   protected void textfield_keyPressed(KeyEvent e)