X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFeatureColourChooser.java;h=6b28937336ff480f467f2cd61c088e9a0ecef2dc;hb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;hp=9943df9fe0b5416ac2d338a1f22ea0dfe4221348;hpb=0b98ba19a0f12809fc43899cf299e0408d30d587;p=jalview.git diff --git a/src/jalview/gui/FeatureColourChooser.java b/src/jalview/gui/FeatureColourChooser.java index 9943df9..6b28937 100644 --- a/src/jalview/gui/FeatureColourChooser.java +++ b/src/jalview/gui/FeatureColourChooser.java @@ -1,19 +1,20 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6) - * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1) + * Copyright (C) 2014 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. - * + * * 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 . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.gui; @@ -27,6 +28,8 @@ import javax.swing.event.*; import jalview.datamodel.*; import jalview.schemes.*; +import jalview.util.MessageManager; + import java.awt.Dimension; public class FeatureColourChooser extends JalviewDialog @@ -75,7 +78,8 @@ public class FeatureColourChooser extends JalviewDialog this.fr = frender; this.type = type; ap = fr.ap; - initDialogFrame(this,true, block,"Graduated Feature Colour for " + type, 480, 185); + initDialogFrame(this, true, block, "Graduated Feature Colour for " + + type, 480, 185); // frame.setLayer(JLayeredPane.PALETTE_LAYER); // Desktop.addInternalFrame(frame, "Graduated Feature Colour for "+type, // 480, 145); @@ -177,10 +181,10 @@ public class FeatureColourChooser extends JalviewDialog private void jbInit() throws Exception { - minColour.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + minColour.setFont(JvSwingUtils.getLabelFont()); minColour.setBorder(BorderFactory.createLineBorder(Color.black)); minColour.setPreferredSize(new Dimension(40, 20)); - minColour.setToolTipText("Minimum Colour"); + minColour.setToolTipText(MessageManager.getString("label.min_colour")); minColour.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent e) @@ -191,10 +195,10 @@ public class FeatureColourChooser extends JalviewDialog } } }); - maxColour.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + maxColour.setFont(JvSwingUtils.getLabelFont()); maxColour.setBorder(BorderFactory.createLineBorder(Color.black)); maxColour.setPreferredSize(new Dimension(40, 20)); - maxColour.setToolTipText("Maximum Colour"); + maxColour.setToolTipText(MessageManager.getString("label.max_colour")); maxColour.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent e) @@ -206,10 +210,10 @@ public class FeatureColourChooser extends JalviewDialog } }); maxColour.setBorder(new LineBorder(Color.black)); - minText.setText("Min:"); - minText.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); - maxText.setText("Max:"); - maxText.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + minText.setText(MessageManager.getString("label.min")); + minText.setFont(JvSwingUtils.getLabelFont()); + maxText.setText(MessageManager.getString("label.max")); + maxText.setFont(JvSwingUtils.getLabelFont()); this.setLayout(borderLayout1); jPanel2.setLayout(flowLayout1); jPanel1.setBackground(Color.white); @@ -221,10 +225,10 @@ public class FeatureColourChooser extends JalviewDialog threshold_actionPerformed(e); } }); - threshold.setToolTipText("Threshold the feature display by score."); - threshold.addItem("No Threshold"); // index 0 - threshold.addItem("Above Threshold"); // index 1 - threshold.addItem("Below Threshold"); // index 2 + threshold.setToolTipText(MessageManager.getString("label.threshold_feature_display_by_score")); + threshold.addItem(MessageManager.getString("label.threshold_feature_no_thereshold")); // index 0 + threshold.addItem(MessageManager.getString("label.threshold_feature_above_thereshold")); // index 1 + threshold.addItem(MessageManager.getString("label.threshold_feature_below_thereshold")); // index 2 jPanel3.setLayout(flowLayout2); thresholdValue.addActionListener(new ActionListener() { @@ -239,14 +243,14 @@ public class FeatureColourChooser extends JalviewDialog slider.setEnabled(false); slider.setOpaque(false); slider.setPreferredSize(new Dimension(100, 32)); - slider.setToolTipText("Adjust threshold"); + slider.setToolTipText(MessageManager.getString("label.adjust_thereshold")); thresholdValue.setEnabled(false); thresholdValue.setColumns(7); jPanel3.setBackground(Color.white); thresholdIsMin.setBackground(Color.white); - thresholdIsMin.setText("Threshold is Min/Max"); + thresholdIsMin.setText(MessageManager.getString("label.threshold_minmax")); thresholdIsMin - .setToolTipText("Toggle between absolute and relative display threshold."); + .setToolTipText(MessageManager.getString("label.toggle_absolute_relative_display_threshold")); thresholdIsMin.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -255,9 +259,9 @@ public class FeatureColourChooser extends JalviewDialog } }); colourByLabel.setBackground(Color.white); - colourByLabel.setText("Colour by Label"); + colourByLabel.setText(MessageManager.getString("label.colour_by_label")); colourByLabel - .setToolTipText("Display features of the same type with a different label using a different colour. (e.g. domain features)"); + .setToolTipText(MessageManager.getString("label.display_features_same_type_different_label_using_different_colour")); colourByLabel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -327,7 +331,7 @@ public class FeatureColourChooser extends JalviewDialog public void minColour_actionPerformed() { Color col = JColorChooser.showDialog(this, - "Select Colour for Minimum Value", minColour.getBackground()); + MessageManager.getString("label.select_colour_minimum_value"), minColour.getBackground()); if (col != null) { minColour.setBackground(col); @@ -340,7 +344,7 @@ public class FeatureColourChooser extends JalviewDialog public void maxColour_actionPerformed() { Color col = JColorChooser.showDialog(this, - "Select Colour for Maximum Value", maxColour.getBackground()); + MessageManager.getString("label.select_colour_maximum_value"), maxColour.getBackground()); if (col != null) { maxColour.setBackground(col); @@ -359,11 +363,11 @@ public class FeatureColourChooser extends JalviewDialog } int aboveThreshold = AnnotationColourGradient.NO_THRESHOLD; - if (threshold.getSelectedItem().equals("Above Threshold")) + if (threshold.getSelectedIndex()==1) { aboveThreshold = AnnotationColourGradient.ABOVE_THRESHOLD; } - else if (threshold.getSelectedItem().equals("Below Threshold")) + else if (threshold.getSelectedIndex()==2) { aboveThreshold = AnnotationColourGradient.BELOW_THRESHOLD; } @@ -472,7 +476,6 @@ public class FeatureColourChooser extends JalviewDialog changeColour(); } - public void cancelPressed() { reset();