X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTextColourChooser.java;h=c8a4a083ce3d9887dadea7d8bb7dc544db250d43;hb=fd34ac70f21e8d47cc60154519ded224f4da7a66;hp=dc705b2ba63f70134940e042a0609bafa7227783;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git diff --git a/src/jalview/gui/TextColourChooser.java b/src/jalview/gui/TextColourChooser.java index dc705b2..c8a4a08 100644 --- a/src/jalview/gui/TextColourChooser.java +++ b/src/jalview/gui/TextColourChooser.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -20,14 +20,24 @@ */ package jalview.gui; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.event.*; - -import jalview.datamodel.*; +import jalview.datamodel.SequenceGroup; import jalview.util.MessageManager; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + +import javax.swing.BorderFactory; +import javax.swing.JColorChooser; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JSlider; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; + public class TextColourChooser { AlignmentPanel ap; @@ -42,9 +52,9 @@ public class TextColourChooser int original1, original2, originalThreshold; if (sg == null) { - original1 = ap.av.textColour.getRGB(); - original2 = ap.av.textColour2.getRGB(); - originalThreshold = ap.av.thresholdTextColour; + original1 = ap.av.getTextColour().getRGB(); + original2 = ap.av.getTextColour2().getRGB(); + originalThreshold = ap.av.getThresholdTextColour(); } else { @@ -68,9 +78,7 @@ public class TextColourChooser JPanel panel = new JPanel(); bigpanel.add(panel, BorderLayout.CENTER); bigpanel.add( - new JLabel( - "Select a dark and light text colour, then set the threshold to" - + "
switch between colours, based on background colour"), + new JLabel(""+MessageManager.getString("label.select_dark_light_set_thereshold")+""), BorderLayout.NORTH); panel.add(col1); panel.add(slider); @@ -81,7 +89,7 @@ public class TextColourChooser public void mousePressed(MouseEvent e) { Color col = JColorChooser.showDialog(bigpanel, - "Select Colour for Text", col1.getBackground()); + MessageManager.getString("label.select_colour_for_text"), col1.getBackground()); if (col != null) { colour1Changed(col); @@ -95,7 +103,7 @@ public class TextColourChooser public void mousePressed(MouseEvent e) { Color col = JColorChooser.showDialog(bigpanel, - "Select Colour for Text", col2.getBackground()); + MessageManager.getString("label.select_colour_for_text"), col2.getBackground()); if (col != null) { colour2Changed(col); @@ -113,7 +121,7 @@ public class TextColourChooser }); int reply = JOptionPane.showInternalOptionDialog(ap, bigpanel, - "Adjust Foreground Text Colour Threshold", + MessageManager.getString("label.adjunst_foreground_text_colour_thereshold"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, null, null); @@ -121,9 +129,9 @@ public class TextColourChooser { if (sg == null) { - ap.av.textColour = new Color(original1); - ap.av.textColour2 = new Color(original2); - ap.av.thresholdTextColour = originalThreshold; + ap.av.setTextColour(new Color(original1)); + ap.av.setTextColour2(new Color(original2)); + ap.av.setThresholdTextColour(originalThreshold); } else { @@ -138,7 +146,7 @@ public class TextColourChooser { if (sg == null) { - ap.av.textColour = col; + ap.av.setTextColour(col); if (ap.av.getColourAppliesToAllGroups()) { setGroupTextColour(); @@ -156,7 +164,7 @@ public class TextColourChooser { if (sg == null) { - ap.av.textColour2 = col; + ap.av.setTextColour2(col); if (ap.av.getColourAppliesToAllGroups()) { setGroupTextColour(); @@ -174,7 +182,7 @@ public class TextColourChooser { if (sg == null) { - ap.av.thresholdTextColour = value; + ap.av.setThresholdTextColour(value); if (ap.av.getColourAppliesToAllGroups()) { setGroupTextColour(); @@ -197,9 +205,9 @@ public class TextColourChooser for (SequenceGroup sg : ap.av.getAlignment().getGroups()) { - sg.textColour = ap.av.textColour; - sg.textColour2 = ap.av.textColour2; - sg.thresholdTextColour = ap.av.thresholdTextColour; + sg.textColour = ap.av.getTextColour(); + sg.textColour2 = ap.av.getTextColour2(); + sg.thresholdTextColour = ap.av.getThresholdTextColour(); } }