X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAPopupMenu.java;h=75cb494d628b7728ba81804feda5caaa8e9a3dc3;hb=63a18b71aa3ed6503b6fbb8ec3543b5d66ed3f70;hp=daf5457609f6f1d137465f1c3fde7478d3463da8;hpb=9cbe7b851c119115631c2af7e30ef4a806496bde;p=jalview.git diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java old mode 100755 new mode 100644 index daf5457..75cb494 --- a/src/jalview/appletgui/APopupMenu.java +++ b/src/jalview/appletgui/APopupMenu.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8) - * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1) + * Copyright (C) 2014 The Jalview Authors * * This file is part of Jalview. * @@ -14,6 +14,7 @@ * 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.appletgui; @@ -25,6 +26,7 @@ import jalview.analysis.*; import jalview.commands.*; import jalview.datamodel.*; import jalview.schemes.*; +import jalview.util.MessageManager; import jalview.util.UrlLink; import jalview.io.AppletFormatAdapter; import jalview.io.SequenceAnnotationReport; @@ -68,6 +70,8 @@ public class APopupMenu extends java.awt.PopupMenu implements MenuItem unGroupMenuItem = new MenuItem(); + MenuItem createGroupMenuItem = new MenuItem(); + MenuItem nucleotideMenuItem = new MenuItem(); Menu colourMenu = new Menu(); @@ -80,17 +84,17 @@ public class APopupMenu extends java.awt.PopupMenu implements CheckboxMenuItem displayNonconserved = new CheckboxMenuItem(); - Menu editMenu = new Menu("Edit"); + Menu editMenu = new Menu(MessageManager.getString("action.edit")); - MenuItem copy = new MenuItem("Copy (Jalview Only)"); + MenuItem copy = new MenuItem(MessageManager.getString("label.jalview_copy")); - MenuItem cut = new MenuItem("Cut (Jalview Only)"); + MenuItem cut = new MenuItem(MessageManager.getString("label.jalview_cut")); - MenuItem toUpper = new MenuItem("To Upper Case"); + MenuItem toUpper = new MenuItem(MessageManager.getString("label.to_upper_case")); - MenuItem toLower = new MenuItem("To Lower Case"); + MenuItem toLower = new MenuItem(MessageManager.getString("label.to_lower_case")); - MenuItem toggleCase = new MenuItem("Toggle Case"); + MenuItem toggleCase = new MenuItem(MessageManager.getString("label.toggle_case")); Menu outputmenu = new Menu(); @@ -102,15 +106,15 @@ public class APopupMenu extends java.awt.PopupMenu implements MenuItem repGroup = new MenuItem(); - MenuItem sequenceName = new MenuItem("Edit Name/Description"); + MenuItem sequenceName = new MenuItem(MessageManager.getString("label.edit_name_description")); - MenuItem sequenceFeature = new MenuItem("Create Sequence Feature"); + MenuItem sequenceFeature = new MenuItem(MessageManager.getString("label.create_sequence_feature")); - MenuItem editSequence = new MenuItem("Edit Sequence"); + MenuItem editSequence = new MenuItem(MessageManager.getString("label.edit_sequence")); - MenuItem sequenceDetails = new MenuItem("Sequence Details ..."); + MenuItem sequenceDetails = new MenuItem(MessageManager.getString("label.sequence_details") + "..."); - MenuItem selSeqDetails = new MenuItem("Sequence Details ..."); + MenuItem selSeqDetails = new MenuItem(MessageManager.getString("label.sequence_details") + "..."); MenuItem makeReferenceSeq = new MenuItem(); @@ -160,14 +164,18 @@ public class APopupMenu extends java.awt.PopupMenu implements if (sg != null && sg.getSize() > 0) { - editGroupName.setLabel("Name: " + sg.getName()); + editGroupName.setLabel(MessageManager.formatMessage("label.name_param", new String[]{sg.getName()})); showText.setState(sg.getDisplayText()); showColourText.setState(sg.getColourText()); showBoxes.setState(sg.getDisplayBoxes()); displayNonconserved.setState(sg.getShowNonconserved()); if (!ap.av.getAlignment().getGroups().contains(sg)) { + menu1.setLabel(MessageManager.getString("action.edit_new_group")); groupMenu.remove(unGroupMenuItem); + } else { + menu1.setLabel(MessageManager.getString("action.edit_group")); + groupMenu.remove(createGroupMenuItem); } } @@ -179,7 +187,7 @@ public class APopupMenu extends java.awt.PopupMenu implements if (links != null && links.size() > 0) { - Menu linkMenu = new Menu("Link"); + Menu linkMenu = new Menu(MessageManager.getString("action.link")); String link; for (int i = 0; i < links.size(); i++) { @@ -303,11 +311,11 @@ public class APopupMenu extends java.awt.PopupMenu implements seqMenu.setLabel(seq.getName()); if (seq == ap.av.getAlignment().getSeqrep()) { - makeReferenceSeq.setLabel("Unmark representative"); + makeReferenceSeq.setLabel(MessageManager.getString("action.unmark_as_reference"));// Unmark representative"); } else { - makeReferenceSeq.setLabel("Mark as representative"); + makeReferenceSeq.setLabel(MessageManager.getString("action.set_as_reference")); // ); } - repGroup.setLabel("Represent Group with " + seq.getName()); + repGroup.setLabel(MessageManager.formatMessage("label.represent_group_with", new String[]{seq.getName()})); } else { @@ -464,6 +472,11 @@ public class APopupMenu extends java.awt.PopupMenu implements unGroupMenuItem_actionPerformed(); } + else if (source == createGroupMenuItem) + { + createGroupMenuItem_actionPerformed(); + } + else if (source == sequenceName) { editName(); @@ -646,7 +659,7 @@ public class APopupMenu extends java.awt.PopupMenu implements Frame frame = new Frame(); frame.add(cap); jalview.bin.JalviewLite.addFrame(frame, - "Selection output - " + e.getActionCommand(), 600, 500); + MessageManager.formatMessage("label.selection_output_command", new String[]{e.getActionCommand()}),600, 500); // JBPNote: getSelectionAsNewSequence behaviour has changed - this method // now returns a full copy of sequence data // TODO consider using getSequenceSelection instead here @@ -677,8 +690,7 @@ public class APopupMenu extends java.awt.PopupMenu implements StringBuffer contents = new StringBuffer(); for (SequenceI seq : sequences) { - contents.append("

Annotation for " + seq.getDisplayId(true) - + "

"); + contents.append(MessageManager.formatMessage("label.annotation_for_displayid",new String[]{seq.getDisplayId(true)})); new SequenceAnnotationReport(null) .createSequenceAnnotationReport( contents, @@ -695,7 +707,7 @@ public class APopupMenu extends java.awt.PopupMenu implements jalview.bin.JalviewLite.addFrame(frame, "Sequence Details for " + (sequences.length == 1 ? sequences[0].getDisplayId(true) : "Selection"), 600, 500); - cap.setText("" + contents.toString() + ""); + cap.setText(MessageManager.formatMessage("label.html_content", new String[]{contents.toString()})); } void editName() @@ -730,61 +742,64 @@ public class APopupMenu extends java.awt.PopupMenu implements else { CutAndPasteTransfer cap = new CutAndPasteTransfer(true, ap.alignFrame); - cap.setText("Paste your PDB file here."); + cap.setText(MessageManager.getString("label.paste_pdb_file")); cap.setPDBImport(seq); Frame frame = new Frame(); frame.add(cap); jalview.bin.JalviewLite.addFrame(frame, - "Paste PDB file for sequence " + seq.getName(), 400, 300); + MessageManager.formatMessage("label.paste_pdb_file_for_sequence", new String[]{seq.getName()}), 400, 300); } } private void jbInit() throws Exception { - groupMenu.setLabel("Group"); - groupMenu.setLabel("Selection"); + groupMenu.setLabel(MessageManager.getString("label.selection")); sequenceFeature.addActionListener(this); editGroupName.addActionListener(this); - unGroupMenuItem.setLabel("Remove Group"); + unGroupMenuItem.setLabel(MessageManager.getString("action.remove_group")); unGroupMenuItem.addActionListener(this); - nucleotideMenuItem.setLabel("Nucleotide"); + createGroupMenuItem.setLabel(MessageManager.getString("action.create_group")); + createGroupMenuItem.addActionListener(this); + + nucleotideMenuItem.setLabel(MessageManager.getString("label.nucleotide")); nucleotideMenuItem.addActionListener(this); conservationMenuItem.addItemListener(this); abovePIDColour.addItemListener(this); - colourMenu.setLabel("Group Colour"); - showBoxes.setLabel("Boxes"); + colourMenu.setLabel(MessageManager.getString("label.group_colour")); + showBoxes.setLabel(MessageManager.getString("label.boxes")); showBoxes.setState(true); showBoxes.addItemListener(this); sequenceName.addActionListener(this); sequenceDetails.addActionListener(this); selSeqDetails.addActionListener(this); - displayNonconserved.setLabel("Show Nonconserved"); + displayNonconserved.setLabel(MessageManager.getString("label.show_non_conversed")); displayNonconserved.setState(false); displayNonconserved.addItemListener(this); - showText.setLabel("Text"); + showText.setLabel(MessageManager.getString("label.text")); showText.addItemListener(this); - showColourText.setLabel("Colour Text"); + showColourText.setLabel(MessageManager.getString("label.colour_text")); showColourText.addItemListener(this); - outputmenu.setLabel("Output to Textbox..."); - seqMenu.setLabel("Sequence"); - pdb.setLabel("View PDB Structure"); - hideSeqs.setLabel("Hide Sequences"); - repGroup.setLabel("Represent Group with"); - revealAll.setLabel("Reveal All"); - revealSeq.setLabel("Reveal Sequences"); - menu1.setLabel("Group"); + outputmenu.setLabel(MessageManager.getString("label.out_to_textbox")); + seqMenu.setLabel(MessageManager.getString("label.sequence")); + pdb.setLabel(MessageManager.getString("label.view_pdb_structure")); + hideSeqs.setLabel(MessageManager.getString("action.hide_sequences")); + repGroup.setLabel(MessageManager.formatMessage("label.represent_group_with", new String[]{""})); + revealAll.setLabel(MessageManager.getString("action.reveal_all")); + revealSeq.setLabel(MessageManager.getString("action.reveal_sequences")); + menu1.setLabel(MessageManager.getString("label.group")+":"); add(groupMenu); this.add(seqMenu); this.add(hideSeqs); this.add(revealSeq); this.add(revealAll); // groupMenu.add(selSeqDetails); - groupMenu.add(editGroupName); groupMenu.add(editMenu); groupMenu.add(outputmenu); groupMenu.add(sequenceFeature); + groupMenu.add(createGroupMenuItem); + groupMenu.add(unGroupMenuItem); groupMenu.add(menu1); colourMenu.add(noColourmenuItem); @@ -855,7 +870,7 @@ public class APopupMenu extends java.awt.PopupMenu implements seqMenu.add(pdb); } seqMenu.add(repGroup); - menu1.add(unGroupMenuItem); + menu1.add(editGroupName); menu1.add(colourMenu); menu1.add(showBoxes); menu1.add(showText); @@ -1040,6 +1055,12 @@ public class APopupMenu extends java.awt.PopupMenu implements ap.paintAlignment(true); } + void createGroupMenuItem_actionPerformed() + { + getGroup(); // implicitly create group + refresh(); + } + public void showColourText_itemStateChanged() { getGroup().setColourText(showColourText.getState());