git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'Release_2_8_0b1_Branch' into try_r20b1_merge
[jalview.git]
/
src
/
jalview
/
gui
/
FeatureColourChooser.java
diff --git
a/src/jalview/gui/FeatureColourChooser.java
b/src/jalview/gui/FeatureColourChooser.java
index
41f7b45
..
9e2cfcb
100644
(file)
--- a/
src/jalview/gui/FeatureColourChooser.java
+++ b/
src/jalview/gui/FeatureColourChooser.java
@@
-28,6
+28,8
@@
import javax.swing.event.*;
import jalview.datamodel.*;
import jalview.schemes.*;
import jalview.datamodel.*;
import jalview.schemes.*;
+import jalview.util.MessageManager;
+
import java.awt.Dimension;
public class FeatureColourChooser extends JalviewDialog
import java.awt.Dimension;
public class FeatureColourChooser extends JalviewDialog
@@
-208,9
+210,9
@@
public class FeatureColourChooser extends JalviewDialog
}
});
maxColour.setBorder(new LineBorder(Color.black));
}
});
maxColour.setBorder(new LineBorder(Color.black));
- minText.setText("Min:");
+ minText.setText(MessageManager.getString("label.min"));
minText.setFont(JvSwingUtils.getLabelFont());
minText.setFont(JvSwingUtils.getLabelFont());
- maxText.setText("Max:");
+ maxText.setText(MessageManager.getString("label.max"));
maxText.setFont(JvSwingUtils.getLabelFont());
this.setLayout(borderLayout1);
jPanel2.setLayout(flowLayout1);
maxText.setFont(JvSwingUtils.getLabelFont());
this.setLayout(borderLayout1);
jPanel2.setLayout(flowLayout1);
@@
-246,7
+248,7
@@
public class FeatureColourChooser extends JalviewDialog
thresholdValue.setColumns(7);
jPanel3.setBackground(Color.white);
thresholdIsMin.setBackground(Color.white);
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.");
thresholdIsMin.addActionListener(new ActionListener()
thresholdIsMin
.setToolTipText("Toggle between absolute and relative display threshold.");
thresholdIsMin.addActionListener(new ActionListener()
@@
-257,7
+259,7
@@
public class FeatureColourChooser extends JalviewDialog
}
});
colourByLabel.setBackground(Color.white);
}
});
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)");
colourByLabel.addActionListener(new ActionListener()
colourByLabel
.setToolTipText("Display features of the same type with a different label using a different colour. (e.g. domain features)");
colourByLabel.addActionListener(new ActionListener()