From da8ae730f171f46648872305c3690a980967ffcc Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Wed, 8 Dec 2021 15:59:38 +0000 Subject: [PATCH] JAL-3616 update messages/tooltips/menu items to use getViewerName() for chimera/x/pymol --- resources/lang/Messages.properties | 6 +++--- src/jalview/gui/ChimeraViewFrame.java | 6 +++--- src/jalview/gui/PymolViewer.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties index 46ebb73..9e492b2 100644 --- a/resources/lang/Messages.properties +++ b/resources/lang/Messages.properties @@ -625,8 +625,8 @@ label.editing = Editing label.web_services = Web Services label.right_click_to_edit_currently_selected_parameter = Right click to edit currently selected parameter. label.let_jmol_manage_structure_colours = Let Jmol manage structure colours -label.fetch_chimera_attributes = Fetch Chimera attributes -label.fetch_chimera_attributes_tip = Copy Chimera attribute to Jalview feature +label.fetch_viewer_attributes = Fetch {0} attributes +label.fetch_viewer_attributes_tip = Copy {0} attribute to Jalview feature label.marks_leaves_tree_not_associated_with_sequence = Marks leaves of tree not associated with a sequence label.index_web_services_menu_by_host_site = Index web services in menu by the host site label.option_want_informed_web_service_URL_cannot_be_accessed_jalview_when_starts_up = Check this option if you want to be informed
when a web service URL cannot be accessed by Jalview
when it starts up @@ -718,7 +718,7 @@ error.superposition_failed = Superposition failed: {0} label.insufficient_residues = Not enough aligned residues ({0}) to perform superposition label.create_viewer_attributes = Write Jalview features label.create_viewer_attributes_tip = Set structure residue attributes for Jalview features -label.attributes_set = {0} attribute values set on Chimera +label.attributes_set = {0} attribute values set on {1} label.sort_alignment_by_tree = Sort Alignment By Tree label.mark_unlinked_leaves = Mark Unlinked Leaves label.associate_leaves_with = Associate Leaves With diff --git a/src/jalview/gui/ChimeraViewFrame.java b/src/jalview/gui/ChimeraViewFrame.java index 364a3b4..8dd0174 100644 --- a/src/jalview/gui/ChimeraViewFrame.java +++ b/src/jalview/gui/ChimeraViewFrame.java @@ -102,9 +102,9 @@ public class ChimeraViewFrame extends StructureViewerBase viewerActionMenu.add(writeFeatures); fetchAttributes = new JMenu( - MessageManager.getString("label.fetch_chimera_attributes")); + MessageManager.formatMessage("label.fetch_viewer_attributes",getViewerName())); fetchAttributes.setToolTipText( - MessageManager.getString("label.fetch_chimera_attributes_tip")); + MessageManager.formatMessage("label.fetch_viewer_attributes_tip",getViewerName())); fetchAttributes.addMouseListener(new MouseAdapter() { @@ -164,7 +164,7 @@ public class ChimeraViewFrame extends StructureViewerBase // todo pull up? int count = jmb.sendFeaturesToViewer(getAlignmentPanel()); statusBar.setText( - MessageManager.formatMessage("label.attributes_set", count)); + MessageManager.formatMessage("label.attributes_set", count, getViewerName())); } /** diff --git a/src/jalview/gui/PymolViewer.java b/src/jalview/gui/PymolViewer.java index 8dd2fc0..d7b4236 100644 --- a/src/jalview/gui/PymolViewer.java +++ b/src/jalview/gui/PymolViewer.java @@ -383,7 +383,7 @@ public class PymolViewer extends StructureViewerBase { int count = binding.sendFeaturesToViewer(getAlignmentPanel()); statusBar.setText( - MessageManager.formatMessage("label.attributes_set", count)); + MessageManager.formatMessage("label.attributes_set", count, getViewerName())); } } -- 1.7.10.2