JAL-934 - refactor to use label font functions

JAL-234 - default button to reset min/max colours and debugged dialog layout

diff --git a/src/jalview/gui/AnnotationColourChooser.java b/src/jalview/gui/AnnotationColourChooser.java
index 49f356d..b0379aa 100755 (executable)
--- a/src/jalview/gui/AnnotationColourChooser.java
+++ b/src/jalview/gui/AnnotationColourChooser.java
@@ -21,9 +21,12 @@ import java.util.*;
 
 import java.awt.*;
 import java.awt.event.*;
+
 import javax.swing.*;
 import javax.swing.event.*;
 
+import net.miginfocom.swing.MigLayout;
+
 import jalview.bin.Cache;
 import jalview.datamodel.*;
 import jalview.schemes.*;
@@ -67,7 +70,7 @@ public class AnnotationColourChooser extends JPanel
     frame = new JInternalFrame();
     frame.setContentPane(this);
     frame.setLayer(JLayeredPane.PALETTE_LAYER);
-    Desktop.addInternalFrame(frame, "Colour by Annotation", 480, 145);
+    Desktop.addInternalFrame(frame, "Colour by Annotation", 520, 215);
 
     slider.addChangeListener(new ChangeListener()
     {
@@ -94,9 +97,8 @@ public class AnnotationColourChooser extends JPanel
     }
 
     // Always get default shading from preferences.
-    minColour.setBackground(Cache.getDefaultColour("ANNOTATIONCOLOUR_MIN", Color.orange));
-    maxColour.setBackground(Cache.getDefaultColour("ANNOTATIONCOLOUR_MAX", Color.red));
-
+    setDefaultMinMax();
+    
     if (oldcs instanceof AnnotationColourGradient)
     {
       AnnotationColourGradient acg = (AnnotationColourGradient) oldcs;
@@ -161,6 +163,12 @@ public class AnnotationColourChooser extends JPanel
 
   }
 
+  private void setDefaultMinMax()
+  {
+    minColour.setBackground(Cache.getDefaultColour("ANNOTATIONCOLOUR_MIN", Color.orange));
+    maxColour.setBackground(Cache.getDefaultColour("ANNOTATIONCOLOUR_MAX", Color.red));
+  }
+
   public AnnotationColourChooser()
   {
     try
@@ -174,7 +182,7 @@ public class AnnotationColourChooser extends JPanel
 
   private void jbInit() throws Exception
   {
-    minColour.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
+    minColour.setFont(JvSwingUtils.getLabelFont());
     minColour.setBorder(BorderFactory.createEtchedBorder());
     minColour.setPreferredSize(new Dimension(40, 20));
     minColour.setToolTipText("Minimum Colour");
@@ -188,7 +196,7 @@ public class AnnotationColourChooser extends JPanel
         }
       }
     });
-    maxColour.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
+    maxColour.setFont(JvSwingUtils.getLabelFont());
     maxColour.setBorder(BorderFactory.createEtchedBorder());
     maxColour.setPreferredSize(new Dimension(40, 20));
     maxColour.setToolTipText("Maximum Colour");
@@ -220,8 +228,19 @@ public class AnnotationColourChooser extends JPanel
         cancel_actionPerformed(e);
       }
     });
-    this.setLayout(borderLayout1);
-    jPanel2.setLayout(flowLayout1);
+    defColours.setOpaque(false);
+    defColours.setText("Defaults");
+    defColours.setToolTipText("Reset min and max colours to defaults from user preferences.");
+    defColours.addActionListener(new ActionListener()
+    {
+      
+      @Override
+      public void actionPerformed(ActionEvent arg0)
+      {
+        resetColours_actionPerformed(arg0);
+      }
+    });
+    
     annotations.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -229,8 +248,6 @@ public class AnnotationColourChooser extends JPanel
         annotations_actionPerformed(e);
       }
     });
-    jPanel1.setBackground(Color.white);
-    jPanel2.setBackground(Color.white);
     threshold.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -238,7 +255,6 @@ public class AnnotationColourChooser extends JPanel
         threshold_actionPerformed(e);
       }
     });
-    jPanel3.setLayout(flowLayout2);
     thresholdValue.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -254,8 +270,7 @@ public class AnnotationColourChooser extends JPanel
     slider.setPreferredSize(new Dimension(100, 32));
     thresholdValue.setEnabled(false);
     thresholdValue.setColumns(7);
-    jPanel3.setBackground(Color.white);
-    currentColours.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
+    currentColours.setFont(JvSwingUtils.getLabelFont());
     currentColours.setOpaque(false);
     currentColours.setText("Use Original Colours");
     currentColours.addActionListener(new ActionListener()
@@ -266,6 +281,7 @@ public class AnnotationColourChooser extends JPanel
       }
     });
     thresholdIsMin.setBackground(Color.white);
+    thresholdIsMin.setFont(JvSwingUtils.getLabelFont());
     thresholdIsMin.setText("Threshold is Min/Max");
     thresholdIsMin.addActionListener(new ActionListener()
     {
@@ -274,19 +290,34 @@ public class AnnotationColourChooser extends JPanel
         thresholdIsMin_actionPerformed(actionEvent);
       }
     });
+    this.setLayout(borderLayout1);
+    jPanel2.setLayout(new MigLayout("","[left][center][right]","[][][]"));
+    jPanel1.setBackground(Color.white);
+    jPanel2.setBackground(Color.white);
+
     jPanel1.add(ok);
     jPanel1.add(cancel);
     jPanel2.add(annotations);
     jPanel2.add(currentColours);
-    jPanel2.add(minColour);
-    jPanel2.add(maxColour);
-    this.add(jPanel3, java.awt.BorderLayout.CENTER);
-    jPanel3.add(threshold);
-    jPanel3.add(slider);
-    jPanel3.add(thresholdValue);
-    jPanel3.add(thresholdIsMin);
+    JPanel colpanel = new JPanel(new FlowLayout());
+    colpanel.setBackground(Color.white);
+    colpanel.add(minColour);
+    colpanel.add(maxColour);
+    jPanel2.add(colpanel, "wrap");
+    
+    jPanel2.add(threshold);
+    jPanel2.add(defColours,"skip 1, wrap");
+    jPanel2.add(thresholdIsMin);
+    jPanel2.add(slider, "grow");
+    jPanel2.add(thresholdValue, "grow");
     this.add(jPanel1, java.awt.BorderLayout.SOUTH);
-    this.add(jPanel2, java.awt.BorderLayout.NORTH);
+    this.add(jPanel2, java.awt.BorderLayout.CENTER);
+  }
+
+  protected void resetColours_actionPerformed(ActionEvent arg0)
+  {
+    setDefaultMinMax();
+    changeColour();
   }
 
   JComboBox annotations;
@@ -294,24 +325,18 @@ public class AnnotationColourChooser extends JPanel
   JPanel minColour = new JPanel();
 
   JPanel maxColour = new JPanel();
-
+  JButton defColours = new JButton();
   JButton ok = new JButton();
 
   JButton cancel = new JButton();
 
   JPanel jPanel1 = new JPanel();
-
   JPanel jPanel2 = new JPanel();
-
+  
   BorderLayout borderLayout1 = new BorderLayout();
 
   JComboBox threshold = new JComboBox();
 
-  FlowLayout flowLayout1 = new FlowLayout();
-
-  JPanel jPanel3 = new JPanel();
-
-  FlowLayout flowLayout2 = new FlowLayout();
 
   JSlider slider = new JSlider();
 
@@ -368,12 +393,14 @@ public class AnnotationColourChooser extends JPanel
 
     slider.setEnabled(true);
     thresholdValue.setEnabled(true);
+    thresholdIsMin.setEnabled(true);
 
     if (aboveThreshold == AnnotationColourGradient.NO_THRESHOLD)
     {
       slider.setEnabled(false);
       thresholdValue.setEnabled(false);
       thresholdValue.setText("");
+      thresholdIsMin.setEnabled(false);
     }
     else if (aboveThreshold != AnnotationColourGradient.NO_THRESHOLD
             && currentAnnotation.threshold == null)
@@ -468,6 +495,8 @@ public class AnnotationColourChooser extends JPanel
   public void cancel_actionPerformed(ActionEvent e)
   {
     reset();
+    // ensure all original colouring is propagated to listeners. 
+    ap.paintAlignment(true);
     try
     {
       frame.setClosed(true);