X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGUserDefinedColours.java;h=359f787f5f22a90243244ebecaaf9879785b8e1f;hb=a7169b1c72607f3c9357195b4999869650a2a891;hp=6f836639cf97282e74d602a1fdb8eac7d92394ee;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git
diff --git a/src/jalview/jbgui/GUserDefinedColours.java b/src/jalview/jbgui/GUserDefinedColours.java
index 6f83663..359f787 100755
--- a/src/jalview/jbgui/GUserDefinedColours.java
+++ b/src/jalview/jbgui/GUserDefinedColours.java
@@ -1,25 +1,49 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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.jbgui;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import jalview.bin.Jalview;
+import jalview.gui.JvSwingUtils;
+import jalview.util.MessageManager;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.GridBagLayout;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JColorChooser;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.SwingConstants;
+import javax.swing.colorchooser.AbstractColorChooserPanel;
/**
* DOCUMENT ME!
@@ -51,7 +75,7 @@ public class GUserDefinedColours extends JPanel
JLabel jLabel1 = new JLabel();
- protected JTextField schemeName = new JTextField();
+ public JTextField schemeName = new JTextField();
BorderLayout borderLayout1 = new BorderLayout();
@@ -79,9 +103,11 @@ public class GUserDefinedColours extends JPanel
protected JPanel casePanel = new JPanel();
- protected JCheckBox caseSensitive = new JCheckBox();
+ public JCheckBox caseSensitive = new JCheckBox();
+
+ public JCheckBox lcaseColour = new JCheckBox();
- protected JButton lcaseColour = new JButton();
+ protected List selectedButtons;
/**
* Creates a new GUserDefinedColours object.
@@ -111,61 +137,66 @@ public class GUserDefinedColours extends JPanel
gridLayout.setColumns(4);
gridLayout.setRows(5);
okButton.setFont(new java.awt.Font("Verdana", 0, 11));
- okButton.setText("OK");
- okButton.addActionListener(new java.awt.event.ActionListener()
+ okButton.setText(MessageManager.getString("action.ok"));
+ okButton.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
- okButton_actionPerformed(e);
+ okButton_actionPerformed();
}
});
applyButton.setFont(new java.awt.Font("Verdana", 0, 11));
- applyButton.setText("Apply");
- applyButton.addActionListener(new java.awt.event.ActionListener()
+ applyButton.setText(MessageManager.getString("action.apply"));
+ applyButton.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
- applyButton_actionPerformed(e);
+ applyButton_actionPerformed();
}
});
loadbutton.setFont(new java.awt.Font("Verdana", 0, 11));
- loadbutton.setText("Load scheme");
- loadbutton.addActionListener(new java.awt.event.ActionListener()
+ loadbutton.setText(MessageManager.getString("action.load_scheme"));
+ loadbutton.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
- loadbutton_actionPerformed(e);
+ loadbutton_actionPerformed();
}
});
savebutton.setFont(new java.awt.Font("Verdana", 0, 11));
- savebutton.setText("Save scheme");
- savebutton.addActionListener(new java.awt.event.ActionListener()
+ savebutton.setText(MessageManager.getString("action.save_scheme"));
+ savebutton.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
- savebutton_actionPerformed(e);
+ savebutton_actionPerformed();
}
});
- cancelButton.setFont(new java.awt.Font("Verdana", 0, 11));
- cancelButton.setText("Cancel");
- cancelButton.addActionListener(new java.awt.event.ActionListener()
+ cancelButton.setFont(JvSwingUtils.getLabelFont());
+ cancelButton.setText(MessageManager.getString("action.cancel"));
+ cancelButton.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
- cancelButton_actionPerformed(e);
+ cancelButton_actionPerformed();
}
});
this.setBackground(new Color(212, 208, 223));
lowerPanel.setOpaque(false);
lowerPanel.setLayout(borderLayout3);
colorChooser.setOpaque(false);
- jLabel1.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
- jLabel1.setText("Name");
+ jLabel1.setFont(JvSwingUtils.getLabelFont());
+ jLabel1.setText(MessageManager.getString("label.name"));
namePanel.setMinimumSize(new Dimension(300, 31));
namePanel.setOpaque(false);
namePanel.setPreferredSize(new Dimension(240, 25));
namePanel.setLayout(borderLayout1);
- schemeName.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
+ schemeName.setFont(JvSwingUtils.getLabelFont());
schemeName.setPreferredSize(new Dimension(105, 21));
schemeName.setText("");
schemeName.setHorizontalAlignment(SwingConstants.CENTER);
@@ -177,25 +208,23 @@ public class GUserDefinedColours extends JPanel
label.setFont(new java.awt.Font("Verdana", Font.ITALIC, 10));
label.setOpaque(false);
label.setPreferredSize(new Dimension(260, 34));
- label
- .setText("Save your colour scheme with a unique name and it will be added "
- + "to the Colour menu.");
- caseSensitive.setText("Case Sensitive");
+ label.setText(
+ MessageManager.formatMessage("label.html_content", new String[]
+ { MessageManager.getString(
+ "label.save_colour_scheme_with_unique_name_added_to_colour_menu") }));
+ caseSensitive.setText(MessageManager.getString("label.case_sensitive"));
caseSensitive.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
- caseSensitive_actionPerformed(e);
- }
- });
- lcaseColour.setText("Lower Case Colour");
- lcaseColour.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- lcaseColour_actionPerformed(e);
+ caseSensitive_actionPerformed();
}
});
+ lcaseColour
+ .setText(MessageManager.getString("label.lower_case_colour"));
+ lcaseColour.setToolTipText(
+ MessageManager.getString("label.lower_case_tip"));
saveLoadPanel.add(savebutton);
saveLoadPanel.add(loadbutton);
@@ -218,25 +247,33 @@ public class GUserDefinedColours extends JPanel
jPanel4.add(panel1, java.awt.BorderLayout.CENTER);
this.add(jPanel4, java.awt.BorderLayout.CENTER);
this.add(colorChooser, java.awt.BorderLayout.EAST);
+
+ AbstractColorChooserPanel[] choosers = colorChooser.getChooserPanels();
+ // JAL-1360 larger JColorChooser in Java 7 overwrites AA panel; restrict to
+ // swatch picker only
+ if (choosers.length > 3)
+ {
+ // Java 7 default has 5 options rather than 3 for choosing colours; keep
+ // the first only
+ colorChooser
+ .setChooserPanels(new AbstractColorChooserPanel[]
+ { choosers[0] });
+ }
+
+ selectedButtons = new ArrayList();
}
/**
* DOCUMENT ME!
- *
- * @param e
- * DOCUMENT ME!
*/
- protected void okButton_actionPerformed(ActionEvent e)
+ protected void okButton_actionPerformed()
{
}
/**
* DOCUMENT ME!
- *
- * @param e
- * DOCUMENT ME!
*/
- protected void applyButton_actionPerformed(ActionEvent e)
+ protected void applyButton_actionPerformed()
{
}
@@ -246,17 +283,11 @@ public class GUserDefinedColours extends JPanel
* @param e
* DOCUMENT ME!
*/
- protected void loadbutton_actionPerformed(ActionEvent e)
+ protected void loadbutton_actionPerformed()
{
}
- /**
- * DOCUMENT ME!
- *
- * @param e
- * DOCUMENT ME!
- */
- protected void savebutton_actionPerformed(ActionEvent e)
+ protected void savebutton_actionPerformed()
{
}
@@ -266,16 +297,16 @@ public class GUserDefinedColours extends JPanel
* @param e
* DOCUMENT ME!
*/
- protected void cancelButton_actionPerformed(ActionEvent e)
+ protected void cancelButton_actionPerformed()
{
}
- public void caseSensitive_actionPerformed(ActionEvent e)
+ public void caseSensitive_actionPerformed()
{
}
- public void lcaseColour_actionPerformed(ActionEvent e)
+ public void lcaseColour_actionPerformed()
{
}