/*
- * 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.2)
+ * Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* 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 <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.appletgui;
MenuItem unGroupMenuItem = new MenuItem();
+ MenuItem createGroupMenuItem = new MenuItem();
+
MenuItem nucleotideMenuItem = new MenuItem();
Menu colourMenu = new Menu();
Menu editMenu = new Menu(MessageManager.getString("action.edit"));
- MenuItem copy = new MenuItem(MessageManager.getString("label.jalview_copy"));
+ MenuItem copy = new MenuItem(
+ MessageManager.getString("label.jalview_copy"));
MenuItem cut = new MenuItem(MessageManager.getString("label.jalview_cut"));
- MenuItem toUpper = new MenuItem(MessageManager.getString("label.to_upper_case"));
+ MenuItem toUpper = new MenuItem(
+ MessageManager.getString("label.to_upper_case"));
- MenuItem toLower = new MenuItem(MessageManager.getString("label.to_lower_case"));
+ MenuItem toLower = new MenuItem(
+ MessageManager.getString("label.to_lower_case"));
- MenuItem toggleCase = new MenuItem(MessageManager.getString("label.toggle_case"));
+ MenuItem toggleCase = new MenuItem(
+ MessageManager.getString("label.toggle_case"));
Menu outputmenu = new Menu();
MenuItem repGroup = new MenuItem();
- MenuItem sequenceName = new MenuItem(MessageManager.getString("label.edit_name_description"));
+ MenuItem sequenceName = new MenuItem(
+ MessageManager.getString("label.edit_name_description"));
- MenuItem sequenceFeature = new MenuItem(MessageManager.getString("label.create_sequence_feature"));
+ MenuItem sequenceFeature = new MenuItem(
+ MessageManager.getString("label.create_sequence_feature"));
- MenuItem editSequence = new MenuItem(MessageManager.getString("label.edit_sequence"));
+ MenuItem editSequence = new MenuItem(
+ MessageManager.getString("label.edit_sequence"));
- MenuItem sequenceDetails = new MenuItem(MessageManager.getString("label.sequence_details") + "...");
+ MenuItem sequenceDetails = new MenuItem(
+ MessageManager.getString("label.sequence_details") + "...");
- MenuItem selSeqDetails = new MenuItem(MessageManager.getString("label.sequence_details") + "...");
+ MenuItem selSeqDetails = new MenuItem(
+ MessageManager.getString("label.sequence_details") + "...");
Sequence seq;
if (sg != null && sg.getSize() > 0)
{
- editGroupName.setLabel(MessageManager.formatMessage("label.name_param", new String[]{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);
+ }
}
else
if (seq != null)
{
seqMenu.setLabel(seq.getName());
- repGroup.setLabel(MessageManager.formatMessage("label.represent_group_with", new String[]{seq.getName()}));
+ repGroup.setLabel(MessageManager.formatMessage(
+ "label.represent_group_with", new String[]
+ { seq.getName() }));
}
else
{
unGroupMenuItem_actionPerformed();
}
+ else if (source == createGroupMenuItem)
+ {
+ createGroupMenuItem_actionPerformed();
+ }
+
else if (source == sequenceName)
{
editName();
Frame frame = new Frame();
frame.add(cap);
- jalview.bin.JalviewLite.addFrame(frame,
- MessageManager.formatMessage("label.selection_output_command", new String[]{e.getActionCommand()}),600, 500);
+ jalview.bin.JalviewLite.addFrame(frame, 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
StringBuffer contents = new StringBuffer();
for (SequenceI seq : sequences)
{
- contents.append(MessageManager.formatMessage("label.annotation_for_displayid",new String[]{seq.getDisplayId(true)}));
+ contents.append(MessageManager.formatMessage(
+ "label.annotation_for_displayid", new String[]
+ { seq.getDisplayId(true) }));
new SequenceAnnotationReport(null)
.createSequenceAnnotationReport(
contents,
jalview.bin.JalviewLite.addFrame(frame, "Sequence Details for "
+ (sequences.length == 1 ? sequences[0].getDisplayId(true)
: "Selection"), 600, 500);
- cap.setText(MessageManager.formatMessage("label.html_content", new String[]{contents.toString()}));
+ cap.setText(MessageManager.formatMessage("label.html_content",
+ new String[]
+ { contents.toString() }));
}
void editName()
cap.setPDBImport(seq);
Frame frame = new Frame();
frame.add(cap);
- jalview.bin.JalviewLite.addFrame(frame,
- MessageManager.formatMessage("label.paste_pdb_file_for_sequence", new String[]{seq.getName()}), 400, 300);
+ jalview.bin.JalviewLite.addFrame(frame, MessageManager.formatMessage(
+ "label.paste_pdb_file_for_sequence", new String[]
+ { seq.getName() }), 400, 300);
}
}
private void jbInit() throws Exception
{
- groupMenu.setLabel(MessageManager.getString("label.group"));
groupMenu.setLabel(MessageManager.getString("label.selection"));
sequenceFeature.addActionListener(this);
editGroupName.addActionListener(this);
- unGroupMenuItem.setLabel(MessageManager.getString("action.remove_group"));
+ unGroupMenuItem.setLabel(MessageManager
+ .getString("action.remove_group"));
unGroupMenuItem.addActionListener(this);
- nucleotideMenuItem.setLabel(MessageManager.getString("label.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(MessageManager.getString("label.group_colour"));
- showBoxes.setLabel(MessageManager.getString("label.boxes"));
+ showBoxes.setLabel(MessageManager.getString("action.boxes"));
showBoxes.setState(true);
showBoxes.addItemListener(this);
sequenceName.addActionListener(this);
sequenceDetails.addActionListener(this);
selSeqDetails.addActionListener(this);
- displayNonconserved.setLabel(MessageManager.getString("label.show_non_conversed"));
+ displayNonconserved.setLabel(MessageManager
+ .getString("label.show_non_conversed"));
displayNonconserved.setState(false);
displayNonconserved.addItemListener(this);
- showText.setLabel(MessageManager.getString("label.text"));
+ showText.setLabel(MessageManager.getString("action.text"));
showText.addItemListener(this);
showColourText.setLabel(MessageManager.getString("label.colour_text"));
showColourText.addItemListener(this);
seqMenu.setLabel(MessageManager.getString("label.sequence"));
pdb.setLabel(MessageManager.getString("label.view_pdb_structure"));
hideSeqs.setLabel(MessageManager.getString("action.hide_sequences"));
- repGroup.setLabel(MessageManager.getString("label.represent_group_with"));
+ 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"));
+ 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);
seqMenu.add(pdb);
}
seqMenu.add(repGroup);
- menu1.add(unGroupMenuItem);
+ menu1.add(editGroupName);
menu1.add(colourMenu);
menu1.add(showBoxes);
menu1.add(showText);
ap.paintAlignment(true);
}
+ void createGroupMenuItem_actionPerformed()
+ {
+ getGroup(); // implicitly create group
+ refresh();
+ }
+
public void showColourText_itemStateChanged()
{
getGroup().setColourText(showColourText.getState());
git://source.jalview.org / jalview.git / blobdiff