X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fjbgui%2FGUserDefinedColours.java;h=8b20939fb570beea857dc44afec40e5f9133220a;hb=a23cc416cd520ac6dec6052591575b264f5d25bc;hp=6f836639cf97282e74d602a1fdb8eac7d92394ee;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git
diff --git a/src/jalview/jbgui/GUserDefinedColours.java b/src/jalview/jbgui/GUserDefinedColours.java
index 6f83663..8b20939 100755
--- a/src/jalview/jbgui/GUserDefinedColours.java
+++ b/src/jalview/jbgui/GUserDefinedColours.java
@@ -1,25 +1,33 @@
/*
- * 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 jalview.gui.JvSwingUtils;
+import jalview.util.MessageManager;
+
import java.awt.*;
import java.awt.event.*;
+
import javax.swing.*;
+import javax.swing.colorchooser.AbstractColorChooserPanel;
/**
* DOCUMENT ME!
@@ -111,7 +119,7 @@ public class GUserDefinedColours extends JPanel
gridLayout.setColumns(4);
gridLayout.setRows(5);
okButton.setFont(new java.awt.Font("Verdana", 0, 11));
- okButton.setText("OK");
+ okButton.setText(MessageManager.getString("action.ok"));
okButton.addActionListener(new java.awt.event.ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -120,7 +128,7 @@ public class GUserDefinedColours extends JPanel
}
});
applyButton.setFont(new java.awt.Font("Verdana", 0, 11));
- applyButton.setText("Apply");
+ applyButton.setText(MessageManager.getString("action.apply"));
applyButton.addActionListener(new java.awt.event.ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -129,7 +137,7 @@ public class GUserDefinedColours extends JPanel
}
});
loadbutton.setFont(new java.awt.Font("Verdana", 0, 11));
- loadbutton.setText("Load scheme");
+ loadbutton.setText(MessageManager.getString("action.load_scheme"));
loadbutton.addActionListener(new java.awt.event.ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -138,7 +146,7 @@ public class GUserDefinedColours extends JPanel
}
});
savebutton.setFont(new java.awt.Font("Verdana", 0, 11));
- savebutton.setText("Save scheme");
+ savebutton.setText(MessageManager.getString("action.save_scheme"));
savebutton.addActionListener(new java.awt.event.ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -146,8 +154,8 @@ public class GUserDefinedColours extends JPanel
savebutton_actionPerformed(e);
}
});
- cancelButton.setFont(new java.awt.Font("Verdana", 0, 11));
- cancelButton.setText("Cancel");
+ cancelButton.setFont(JvSwingUtils.getLabelFont());
+ cancelButton.setText(MessageManager.getString("action.cancel"));
cancelButton.addActionListener(new java.awt.event.ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -159,13 +167,13 @@ public class GUserDefinedColours extends JPanel
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,10 +185,12 @@ 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()
{
public void actionPerformed(ActionEvent e)
@@ -188,7 +198,8 @@ public class GUserDefinedColours extends JPanel
caseSensitive_actionPerformed(e);
}
});
- lcaseColour.setText("Lower Case Colour");
+ lcaseColour
+ .setText(MessageManager.getString("label.lower_case_colour"));
lcaseColour.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -218,6 +229,13 @@ 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]});
+ }
}
/**