import jalview.schemabinding.version2.Colour;
import jalview.schemabinding.version2.JalviewUserColours;
import jalview.schemes.ColourSchemeI;
+import jalview.schemes.ColourSchemeLoader;
import jalview.schemes.ColourSchemes;
import jalview.schemes.ResidueProperties;
import jalview.schemes.UserColourScheme;
private static final String LAST_DIRECTORY = "LAST_DIRECTORY";
- private static final int MY_FRAME_HEIGHT = 420;
+ private static final int MY_FRAME_HEIGHT = 440;
private static final int MY_FRAME_WIDTH = 810;
{
caseSensitive.setSelected(true);
lcaseColour.setEnabled(true);
- lcaseColour.setForeground(Color.GRAY);
resetButtonPanel(true);
}
else
{
JButton button = null;
final Color newColour = colorChooser.getColor();
- for (int i = 0; i < selectedButtons.size(); i++)
- {
- button = selectedButtons.get(i);
- button.setBackground(newColour);
- button.setForeground(ColorUtils.brighterThan(newColour));
- }
- if (button == lcaseColour)
+ if (lcaseColour.isSelected())
{
- button.setForeground(Color.black);
+ selectedButtons.clear();
for (int i = 0; i < lowerCaseButtons.size(); i++)
{
button = lowerCaseButtons.get(i);
button.setForeground(ColorUtils.brighterThan(button.getBackground()));
}
}
+ for (int i = 0; i < selectedButtons.size(); i++)
+ {
+ button = selectedButtons.get(i);
+ button.setBackground(newColour);
+ button.setForeground(ColorUtils.brighterThan(newColour));
+ }
}
/**
File choice = chooser.getSelectedFile();
Cache.setProperty(LAST_DIRECTORY, choice.getParent());
- UserColourScheme ucs = ColourSchemes.loadColourScheme(choice
+ UserColourScheme ucs = ColourSchemeLoader.loadColourScheme(choice
.getAbsolutePath());
Color[] colors = ucs.getColours();
schemeName.setText(ucs.getSchemeName());
{
caseSensitive.setSelected(true);
lcaseColour.setEnabled(true);
- lcaseColour.setForeground(Color.GRAY);
resetButtonPanel(true);
for (int i = 0; i < lowerCaseButtons.size(); i++)
{
{
colours = colours.substring(0, colours.indexOf("|"));
}
- ret = ColourSchemes.loadColourScheme(colours);
+ ret = ColourSchemeLoader.loadColourScheme(colours);
}
if (ret == null)
boolean selected = caseSensitive.isSelected();
resetButtonPanel(selected);
lcaseColour.setEnabled(selected);
- lcaseColour.setForeground(Color.GRAY);
- }
-
- /**
- * Action on clicking 'Lower case colour', which results in changing colour of
- * all lower-case buttons when a colour is picked. A second click of the
- * button turns off this behaviour.
- */
- @Override
- public void lcaseColour_actionPerformed(ActionEvent e)
- {
- boolean enable = !selectedButtons.contains(lcaseColour);
- selectedButtons.clear();
- if (enable)
- {
- selectedButtons.add(lcaseColour);
- lcaseColour.setForeground(lowerCaseButtons.get(0).getForeground());
- lcaseColour.setForeground(Color.black);
- }
- else
- {
- lcaseColour.setBackground(Color.white);
- lcaseColour.setForeground(Color.gray);
- }
}
}