From c02e6ac780c5c6be58efbb338e38d0eab5933d62 Mon Sep 17 00:00:00 2001 From: darolmar Date: Fri, 10 Oct 2014 08:20:53 +0200 Subject: [PATCH] JAL-1355 --- resources/lang/Messages.properties | 9 ++++++++- src/jalview/appletgui/AnnotationLabels.java | 14 +++++++------- src/jalview/gui/AnnotationLabels.java | 14 +++++++------- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties index cdbe0f3..47755f3 100644 --- a/resources/lang/Messages.properties +++ b/resources/lang/Messages.properties @@ -1123,4 +1123,11 @@ label.news_from_jalview = News from http://www.jalview.org label.cut_paste_alignmen_file = Cut & Paste Alignment File label.enter_redundancy_thereshold = Enter the redundancy thereshold label.select_dark_light_set_thereshold = Select a dark and light text colour, then set the threshold to
switch between colours, based on background colour -label.select_feature_colour = Select Feature Colour \ No newline at end of file +label.select_feature_colour = Select Feature Colour +label.ignore_gaps_consensus = Ignore Gaps In Consensus +label.show_group_histogram = Show Group Histogram +label.show_group_logo = Show Group Logo +label.normalise_group_logo = Normalise Group Logo +label.show_histogram = Show Histogram +label.show_logo = Show Logo +label.normalise_logo = Normalise Logo \ No newline at end of file diff --git a/src/jalview/appletgui/AnnotationLabels.java b/src/jalview/appletgui/AnnotationLabels.java index ac62c6b..3e81664 100755 --- a/src/jalview/appletgui/AnnotationLabels.java +++ b/src/jalview/appletgui/AnnotationLabels.java @@ -455,7 +455,7 @@ public class AnnotationLabels extends Panel implements ActionListener, { popup.addSeparator(); final CheckboxMenuItem cbmi = new CheckboxMenuItem( - "Ignore Gaps In Consensus", + MessageManager.getString("label.ignore_gaps_consensus"), (aa[selectedRow].groupRef != null) ? aa[selectedRow].groupRef .getIgnoreGapsConsensus() : ap.av .getIgnoreGapsConsensus()); @@ -480,7 +480,7 @@ public class AnnotationLabels extends Panel implements ActionListener, if (aaa.groupRef != null) { final CheckboxMenuItem chist = new CheckboxMenuItem( - "Show Group Histogram", + MessageManager.getString("label.show_group_histogram"), aa[selectedRow].groupRef.isShowConsensusHistogram()); chist.addItemListener(new ItemListener() { @@ -499,7 +499,7 @@ public class AnnotationLabels extends Panel implements ActionListener, }); popup.add(chist); final CheckboxMenuItem cprofl = new CheckboxMenuItem( - "Show Group Logo", + MessageManager.getString("label.show_group_logo"), aa[selectedRow].groupRef.isShowSequenceLogo()); cprofl.addItemListener(new ItemListener() { @@ -519,7 +519,7 @@ public class AnnotationLabels extends Panel implements ActionListener, popup.add(cprofl); final CheckboxMenuItem cprofn = new CheckboxMenuItem( - "Normalise Group Logo", + MessageManager.getString("label.normalise_group_logo"), aa[selectedRow].groupRef.isNormaliseSequenceLogo()); cprofn.addItemListener(new ItemListener() { @@ -542,7 +542,7 @@ public class AnnotationLabels extends Panel implements ActionListener, else { final CheckboxMenuItem chist = new CheckboxMenuItem( - "Show Histogram", av.isShowConsensusHistogram()); + MessageManager.getString("label.show_histogram"), av.isShowConsensusHistogram()); chist.addItemListener(new ItemListener() { public void itemStateChanged(ItemEvent e) @@ -564,7 +564,7 @@ public class AnnotationLabels extends Panel implements ActionListener, }); popup.add(chist); final CheckboxMenuItem cprof = new CheckboxMenuItem( - "Show Logo", av.isShowSequenceLogo()); + MessageManager.getString("label.show_logo"), av.isShowSequenceLogo()); cprof.addItemListener(new ItemListener() { public void itemStateChanged(ItemEvent e) @@ -587,7 +587,7 @@ public class AnnotationLabels extends Panel implements ActionListener, }); popup.add(cprof); final CheckboxMenuItem cprofn = new CheckboxMenuItem( - "Normalise Logo", av.isNormaliseSequenceLogo()); + MessageManager.getString("label.normalise_logo"), av.isNormaliseSequenceLogo()); cprofn.addItemListener(new ItemListener() { public void itemStateChanged(ItemEvent e) diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java index fdb3975..009b807 100755 --- a/src/jalview/gui/AnnotationLabels.java +++ b/src/jalview/gui/AnnotationLabels.java @@ -613,7 +613,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, pop.addSeparator(); // av and sequencegroup need to implement same interface for final JCheckBoxMenuItem cbmi = new JCheckBoxMenuItem( - "Ignore Gaps In Consensus", + MessageManager.getString("label.ignore_gaps_consensus"), (aa[selectedRow].groupRef != null) ? aa[selectedRow].groupRef .getIgnoreGapsConsensus() : ap.av .getIgnoreGapsConsensus()); @@ -639,7 +639,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, if (aaa.groupRef != null) { final JCheckBoxMenuItem chist = new JCheckBoxMenuItem( - "Show Group Histogram", + MessageManager.getString("label.show_group_histogram"), aa[selectedRow].groupRef.isShowConsensusHistogram()); chist.addActionListener(new ActionListener() { @@ -658,7 +658,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, }); pop.add(chist); final JCheckBoxMenuItem cprofl = new JCheckBoxMenuItem( - "Show Group Logo", + MessageManager.getString("label.show_group_logo"), aa[selectedRow].groupRef.isShowSequenceLogo()); cprofl.addActionListener(new ActionListener() { @@ -677,7 +677,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, }); pop.add(cprofl); final JCheckBoxMenuItem cproflnorm = new JCheckBoxMenuItem( - "Normalise Group Logo", + MessageManager.getString("label.normalise_group_logo"), aa[selectedRow].groupRef.isNormaliseSequenceLogo()); cproflnorm.addActionListener(new ActionListener() { @@ -702,7 +702,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, else { final JCheckBoxMenuItem chist = new JCheckBoxMenuItem( - "Show Histogram", av.isShowConsensusHistogram()); + MessageManager.getString("label.show_histogram"), av.isShowConsensusHistogram()); chist.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -721,7 +721,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, }); pop.add(chist); final JCheckBoxMenuItem cprof = new JCheckBoxMenuItem( - "Show Logo", av.isShowSequenceLogo()); + MessageManager.getString("label.show_logo"), av.isShowSequenceLogo()); cprof.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -740,7 +740,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, }); pop.add(cprof); final JCheckBoxMenuItem cprofnorm = new JCheckBoxMenuItem( - "Normalise Logo", av.isNormaliseSequenceLogo()); + MessageManager.getString("label.normalise_logo"), av.isNormaliseSequenceLogo()); cprofnorm.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) -- 1.7.10.2