JAL-3186 reorder popup menu slightly

[jalview.git] / src / jalview / gui / FeatureTypeSettings.java

diff --git a/src/jalview/gui/FeatureTypeSettings.java b/src/jalview/gui/FeatureTypeSettings.java
index a6b986e..1ba24b5 100644 (file)
--- a/src/jalview/gui/FeatureTypeSettings.java
+++ b/src/jalview/gui/FeatureTypeSettings.java
@@ -112,7 +112,7 @@ public class FeatureTypeSettings extends JalviewDialog
    */
   final AlignmentViewPanel ap;
 
-  private final String featureType;
+  final String featureType;
 
   /*
    * the colour and filters to reset to on Cancel
@@ -239,7 +239,7 @@ public class FeatureTypeSettings extends JalviewDialog
     String title = MessageManager
             .formatMessage("label.display_settings_for", new String[]
             { theType });
-    initDialogFrame(this, true, false, title, 500, 500);
+    initDialogFrame(this, true, false, title, 580, 500);
     waitForInput();
   }
 
@@ -485,6 +485,7 @@ public class FeatureTypeSettings extends JalviewDialog
     graduatedColour = new JRadioButton(
             MessageManager.getString("label.by_range_of") + COLON);
     graduatedColour.setPreferredSize(new Dimension(RADIO_WIDTH, 20));
+    graduatedColour.setOpaque(false);
     graduatedColour.addItemListener(new ItemListener()
     {
       @Override
@@ -536,7 +537,8 @@ public class FeatureTypeSettings extends JalviewDialog
       {
         if (minColour.isEnabled())
         {
-          showColourChooser(minColour, "label.select_colour_minimum_value");
+          String ttl = MessageManager.getString("label.select_colour_minimum_value");
+          showColourChooser(minColour, ttl);
         }
       }
     });
@@ -552,7 +554,8 @@ public class FeatureTypeSettings extends JalviewDialog
       {
         if (maxColour.isEnabled())
         {
-          showColourChooser(maxColour, "label.select_colour_maximum_value");
+          String ttl = MessageManager.getString("label.select_colour_maximum_value");
+          showColourChooser(maxColour, ttl);
         }
       }
     });
@@ -728,6 +731,7 @@ public class FeatureTypeSettings extends JalviewDialog
     simpleColour = new JRadioButton(
             MessageManager.getString("label.simple_colour"));
     simpleColour.setPreferredSize(new Dimension(RADIO_WIDTH, 20));
+    simpleColour.setOpaque(false);
     simpleColour.addItemListener(new ItemListener()
     {
       @Override
@@ -760,7 +764,8 @@ public class FeatureTypeSettings extends JalviewDialog
       {
         if (simpleColour.isSelected())
         {
-          showColourChooser(singleColour, "label.select_colour");
+          String ttl = MessageManager.formatMessage("label.select_colour_for",  featureType);
+          showColourChooser(singleColour, ttl);
         }
       }
     });
@@ -778,6 +783,7 @@ public class FeatureTypeSettings extends JalviewDialog
     byCategory = new JRadioButton(
             MessageManager.getString("label.by_text_of") + COLON);
     byCategory.setPreferredSize(new Dimension(RADIO_WIDTH, 20));
+    byCategory.setOpaque(false);
     byCategory.addItemListener(new ItemListener()
     {
       @Override
@@ -828,10 +834,9 @@ public class FeatureTypeSettings extends JalviewDialog
    * 
    * @param colourPanel
    *          the panel whose background colour is being picked
-   * @param key
-   *          message bundle key for the dialog title
+   * @param title
    */
-  void showColourChooser(JPanel colourPanel, String key)
+  void showColourChooser(JPanel colourPanel, String title)
   {
     ColourChooserListener listener = new ColourChooserListener()
     {
@@ -844,9 +849,8 @@ public class FeatureTypeSettings extends JalviewDialog
         colourChanged(true);
       }
     };
-    JalviewColourChooser.showColourChooser(this,
-            MessageManager.getString(key), colourPanel.getBackground(),
-            listener);
+       JalviewColourChooser.showColourChooser(this, title, 
+         colourPanel.getBackground(), listener);
   }
 
   /**
@@ -1191,6 +1195,8 @@ public class FeatureTypeSettings extends JalviewDialog
     andOrPanel.setBackground(Color.white);
     andFilters = new JRadioButton(MessageManager.getString("label.and"));
     orFilters = new JRadioButton(MessageManager.getString("label.or"));
+    andFilters.setOpaque(false);
+    orFilters.setOpaque(false);
     ActionListener actionListener = new ActionListener()
     {
       @Override