X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTextColourChooser.java;h=e7a182f10c59d840b2581c46cf4c1c4048740af0;hb=838e4f91d4a53dd315640dbc9ff6ef7a815ee576;hp=2f9422ae37a951d34c1ec0b44ada412fb7f90e6b;hpb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;p=jalview.git
diff --git a/src/jalview/gui/TextColourChooser.java b/src/jalview/gui/TextColourChooser.java
index 2f9422a..e7a182f 100644
--- a/src/jalview/gui/TextColourChooser.java
+++ b/src/jalview/gui/TextColourChooser.java
@@ -1,31 +1,43 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
+ * Copyright (C) 2015 The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
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;
@@ -40,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
{
@@ -67,9 +79,10 @@ public class TextColourChooser
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"),
- BorderLayout.NORTH);
+ ""
+ + MessageManager
+ .getString("label.select_dark_light_set_thereshold")
+ + ""), BorderLayout.NORTH);
panel.add(col1);
panel.add(slider);
panel.add(col2);
@@ -79,7 +92,8 @@ 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);
@@ -93,7 +107,8 @@ 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);
@@ -110,18 +125,22 @@ public class TextColourChooser
}
});
- int reply = JOptionPane.showInternalOptionDialog(ap, bigpanel,
- "Adjust Foreground Text Colour Threshold",
- JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE,
- null, null, null);
+ int reply = JOptionPane
+ .showInternalOptionDialog(
+ ap,
+ bigpanel,
+ MessageManager
+ .getString("label.adjunst_foreground_text_colour_thereshold"),
+ JOptionPane.OK_CANCEL_OPTION,
+ JOptionPane.QUESTION_MESSAGE, null, null, null);
if (reply == JOptionPane.CANCEL_OPTION)
{
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
{
@@ -136,7 +155,7 @@ public class TextColourChooser
{
if (sg == null)
{
- ap.av.textColour = col;
+ ap.av.setTextColour(col);
if (ap.av.getColourAppliesToAllGroups())
{
setGroupTextColour();
@@ -154,7 +173,7 @@ public class TextColourChooser
{
if (sg == null)
{
- ap.av.textColour2 = col;
+ ap.av.setTextColour2(col);
if (ap.av.getColourAppliesToAllGroups())
{
setGroupTextColour();
@@ -172,7 +191,7 @@ public class TextColourChooser
{
if (sg == null)
{
- ap.av.thresholdTextColour = value;
+ ap.av.setThresholdTextColour(value);
if (ap.av.getColourAppliesToAllGroups())
{
setGroupTextColour();
@@ -195,9 +214,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();
}
}