X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGUserDefinedColours.java;h=7a485fda8d23543d82e12f02e976f25bf278acc3;hb=ad5029edaf36ceaafb4e269f2e00b0e1e0d7ffc4;hp=f79359c75a3bb6bfa61a32edc86de7009720e585;hpb=2de8acfae59aced665e4c37ad0f7dcc2ed68818e;p=jalview.git diff --git a/src/jalview/jbgui/GUserDefinedColours.java b/src/jalview/jbgui/GUserDefinedColours.java index f79359c..7a485fd 100755 --- a/src/jalview/jbgui/GUserDefinedColours.java +++ b/src/jalview/jbgui/GUserDefinedColours.java @@ -1,26 +1,33 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1) - * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) + * Copyright (C) 2014 The Jalview Authors * - * This program 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 2 - * of the License, or (at your option) any later version. + * This file is part of Jalview. * - * This program 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. + * 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. + * + * 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 this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * 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! @@ -103,7 +110,7 @@ public class GUserDefinedColours extends JPanel * DOCUMENT ME! * * @throws Exception - * DOCUMENT ME! + * DOCUMENT ME! */ private void jbInit() throws Exception { @@ -112,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) @@ -121,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) @@ -130,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) @@ -139,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) @@ -147,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) @@ -160,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); @@ -178,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) @@ -189,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) @@ -219,13 +229,20 @@ 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]}); + } } /** * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ protected void okButton_actionPerformed(ActionEvent e) { @@ -235,7 +252,7 @@ public class GUserDefinedColours extends JPanel * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ protected void applyButton_actionPerformed(ActionEvent e) { @@ -245,7 +262,7 @@ public class GUserDefinedColours extends JPanel * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ protected void loadbutton_actionPerformed(ActionEvent e) { @@ -255,7 +272,7 @@ public class GUserDefinedColours extends JPanel * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ protected void savebutton_actionPerformed(ActionEvent e) { @@ -265,7 +282,7 @@ public class GUserDefinedColours extends JPanel * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ protected void cancelButton_actionPerformed(ActionEvent e) {