From 2e18e422cead591bd9a1df295f1897b3e346a480 Mon Sep 17 00:00:00 2001 From: gmungoc Date: Thu, 2 Mar 2017 10:06:13 +0000 Subject: [PATCH] JAL-2295 tweak order and wording of Superpose menu items and tooltip --- resources/lang/Messages.properties | 4 ++-- src/jalview/gui/StructureViewerBase.java | 8 ++++---- src/jalview/jbgui/GStructureViewer.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties index 25f65ab..138cf89 100644 --- a/resources/lang/Messages.properties +++ b/resources/lang/Messages.properties @@ -515,7 +515,7 @@ label.retrieve_parse_sequence_database_records_alignment_or_selected_sequences = label.standard_databases = Standard Databases label.fetch_embl_uniprot = Fetch from EMBL/EMBLCDS or Uniprot/PDB and any selected DAS sources label.reset_min_max_colours_to_defaults = Reset min and max colours to defaults from user preferences. -label.align_structures_using_linked_alignment_views = Align structures using {0} linked alignment views +label.align_structures_using_linked_alignment_views = Superpose structures using selected alignment view label.connect_to_session = Connect to session {0} label.threshold_feature_display_by_score = Threshold the feature display by score. label.threshold_feature_no_threshold = No Threshold @@ -715,7 +715,7 @@ label.link_name = Link Name label.pdb_file = PDB file label.colour_with_jmol = Colour with Jmol label.colour_with_chimera = Colour with Chimera -label.align_structures = Align Structures +label.superpose_structures = Superpose Structures label.jmol = Jmol label.chimera = Chimera label.create_chimera_attributes = Write Jalview features diff --git a/src/jalview/gui/StructureViewerBase.java b/src/jalview/gui/StructureViewerBase.java index 808150f..44a429c 100644 --- a/src/jalview/gui/StructureViewerBase.java +++ b/src/jalview/gui/StructureViewerBase.java @@ -747,16 +747,16 @@ public abstract class StructureViewerBase extends GStructureViewer public void itemStateChanged(ItemEvent e) { alignStructs.setEnabled(!_alignwith.isEmpty()); - alignStructs.setToolTipText(MessageManager.formatMessage( - "label.align_structures_using_linked_alignment_views", - new String[] { String.valueOf(_alignwith.size()) })); + alignStructs + .setToolTipText(MessageManager + .getString("label.align_structures_using_linked_alignment_views")); } }; viewSelectionMenu = new ViewSelectionMenu( MessageManager.getString("label.superpose_with"), this, _alignwith, handler); handler.itemStateChanged(null); - viewerActionMenu.add(viewSelectionMenu); + viewerActionMenu.add(viewSelectionMenu, 0); viewerActionMenu.addMenuListener(new MenuListener() { @Override diff --git a/src/jalview/jbgui/GStructureViewer.java b/src/jalview/jbgui/GStructureViewer.java index cee8b93..5c7a31a 100644 --- a/src/jalview/jbgui/GStructureViewer.java +++ b/src/jalview/jbgui/GStructureViewer.java @@ -170,8 +170,8 @@ public abstract class GStructureViewer extends JInternalFrame implements } }); alignStructs = new JMenuItem(); - alignStructs - .setText(MessageManager.getString("label.align_structures")); + alignStructs.setText(MessageManager + .getString("label.superpose_structures")); alignStructs.addActionListener(new ActionListener() { @Override -- 1.7.10.2