From: amwaterhouse <Andrew Waterhouse>
Date: Tue, 21 Nov 2006 12:18:15 +0000 (+0000)
Subject: Panels replace colour buttons
X-Git-Tag: Release_2_2~84
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4c843061ffa7a830585172ffe7ff8c9014213a7a;p=jalview.git

Panels replace colour buttons
---

diff --git a/src/jalview/gui/AnnotationColourChooser.java b/src/jalview/gui/AnnotationColourChooser.java
index f499217..b748c85 100755
--- a/src/jalview/gui/AnnotationColourChooser.java
+++ b/src/jalview/gui/AnnotationColourChooser.java
@@ -26,6 +26,8 @@ import jalview.schemes.*;
 import javax.swing.event.*;
 import java.util.*;
 import jalview.datamodel.SequenceGroup;
+import java.awt.Dimension;
+import javax.swing.BorderFactory;
 
 public class AnnotationColourChooser
     extends JPanel
@@ -127,24 +129,27 @@ public class AnnotationColourChooser
       throws Exception
   {
     minColour.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
-    minColour.setToolTipText("");
-    minColour.setMargin(new Insets(2, 2, 2, 2));
-    minColour.setText("Min Colour");
-    minColour.addActionListener(new ActionListener()
+    minColour.setBorder(BorderFactory.createEtchedBorder());
+    minColour.setPreferredSize(new Dimension(40, 20));
+    minColour.setToolTipText("Minimum Colour");
+    minColour.addMouseListener(new MouseAdapter()
     {
-      public void actionPerformed(ActionEvent e)
+      public void mousePressed(MouseEvent e)
       {
-        minColour_actionPerformed(e);
+        if (minColour.isEnabled())
+          minColour_actionPerformed();
       }
     });
     maxColour.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
-    maxColour.setMargin(new Insets(2, 2, 2, 2));
-    maxColour.setText("Max Colour");
-    maxColour.addActionListener(new ActionListener()
+    maxColour.setBorder(BorderFactory.createEtchedBorder());
+    maxColour.setPreferredSize(new Dimension(40, 20));
+    maxColour.setToolTipText("Maximum Colour");
+    maxColour.addMouseListener(new MouseAdapter()
     {
-      public void actionPerformed(ActionEvent e)
+      public void mousePressed(MouseEvent e)
       {
-        maxColour_actionPerformed(e);
+        if (maxColour.isEnabled())
+          maxColour_actionPerformed();
       }
     });
     ok.setOpaque(false);
@@ -225,8 +230,8 @@ public class AnnotationColourChooser
   }
 
   JComboBox annotations = new JComboBox();
-  JButton minColour = new JButton();
-  JButton maxColour = new JButton();
+  JPanel minColour = new JPanel();
+  JPanel maxColour = new JPanel();
   JButton ok = new JButton();
   JButton cancel = new JButton();
   JPanel jPanel1 = new JPanel();
@@ -240,7 +245,7 @@ public class AnnotationColourChooser
   JTextField thresholdValue = new JTextField(20);
   JCheckBox currentColours = new JCheckBox();
 
-  public void minColour_actionPerformed(ActionEvent e)
+  public void minColour_actionPerformed()
   {
     Color col = JColorChooser.showDialog(this,
                                          "Select Colour for Minimum Value",
@@ -251,7 +256,7 @@ public class AnnotationColourChooser
     changeColour();
   }
 
-  public void maxColour_actionPerformed(ActionEvent e)
+  public void maxColour_actionPerformed()
   {
     Color col = JColorChooser.showDialog(this,
                                          "Select Colour for Maximum Value",