X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGAlignFrame.java;h=cd8ad6f3cbb7e819ef6d24b1362ef73eebcf2511;hb=cb5d856b1304448cae13a333cbd9017f81520d90;hp=a89228e585d1736b9e67ee0db1a75943911cff89;hpb=be5a6a44e9eb355110f3b414d6b0fd5419f5936c;p=jalview.git diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java index a89228e..cd8ad6f 100755 --- a/src/jalview/jbgui/GAlignFrame.java +++ b/src/jalview/jbgui/GAlignFrame.java @@ -1,30 +1,53 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1) - * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1) + * Copyright (C) 2014 The Jalview Authors * - * This program 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 2 - * of the License, or (at your option) any later version. + * This file is part of Jalview. * - * This program 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. + * 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. + * + * 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 this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * 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.jbgui; -import java.awt.*; -import java.awt.event.*; - -import javax.swing.*; -import javax.swing.event.*; - -import jalview.schemes.*; +import jalview.schemes.ColourSchemeProperty; +import jalview.util.MessageManager; + +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.GridLayout; +import java.awt.Toolkit; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.FocusAdapter; +import java.awt.event.FocusEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + +import javax.swing.BorderFactory; +import javax.swing.ButtonGroup; +import javax.swing.JCheckBoxMenuItem; +import javax.swing.JInternalFrame; +import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JRadioButtonMenuItem; +import javax.swing.JTabbedPane; +import javax.swing.SwingUtilities; +import javax.swing.event.ChangeEvent; +import javax.swing.event.MenuEvent; +import javax.swing.event.MenuListener; public class GAlignFrame extends JInternalFrame { @@ -114,6 +137,15 @@ public class GAlignFrame extends JInternalFrame protected JRadioButtonMenuItem BLOSUM62Colour = new JRadioButtonMenuItem(); + protected JRadioButtonMenuItem nucleotideColour = new JRadioButtonMenuItem(); + + protected JRadioButtonMenuItem purinePyrimidineColour = new JRadioButtonMenuItem(); + + // protected JRadioButtonMenuItem covariationColour = new + // JRadioButtonMenuItem(); + + protected JRadioButtonMenuItem tcoffeeColour = new JRadioButtonMenuItem(); + JMenuItem njTreeBlosumMenuItem = new JMenuItem(); JMenuItem avDistanceTreeBlosumMenuItem = new JMenuItem(); @@ -122,7 +154,7 @@ public class GAlignFrame extends JInternalFrame public JCheckBoxMenuItem colourTextMenuItem = new JCheckBoxMenuItem(); - public JCheckBoxMenuItem showUnconservedMenuItem = new JCheckBoxMenuItem(); + public JCheckBoxMenuItem showNonconservedMenuItem = new JCheckBoxMenuItem(); JMenuItem htmlMenuItem = new JMenuItem(); @@ -147,11 +179,13 @@ public class GAlignFrame extends JInternalFrame public JCheckBoxMenuItem abovePIDThreshold = new JCheckBoxMenuItem(); public JCheckBoxMenuItem showSeqFeatures = new JCheckBoxMenuItem(); - public JCheckBoxMenuItem showSeqFeaturesHeight = new JCheckBoxMenuItem(); - protected JRadioButtonMenuItem nucleotideColour = new JRadioButtonMenuItem(); + public JCheckBoxMenuItem showSeqFeaturesHeight = new JCheckBoxMenuItem(); JMenuItem deleteGroups = new JMenuItem(); + + JMenuItem createGroup = new JMenuItem(); + JMenuItem unGroup = new JMenuItem(); JMenuItem delete = new JMenuItem(); @@ -196,7 +230,9 @@ public class GAlignFrame extends JInternalFrame JMenu jMenu2 = new JMenu(); protected JCheckBoxMenuItem padGapsMenuitem = new JCheckBoxMenuItem(); + protected JCheckBoxMenuItem showNpFeatsMenuitem = new JCheckBoxMenuItem(); + protected JCheckBoxMenuItem showDbRefsMenuitem = new JCheckBoxMenuItem(); protected ButtonGroup colours = new ButtonGroup(); @@ -209,16 +245,22 @@ public class GAlignFrame extends JInternalFrame protected JMenu showProducts = new JMenu(); - public JMenuItem featureSettings = new JMenuItem(); + public JMenuItem openFeatureSettings = new JMenuItem(); JMenuItem fetchSequence = new JMenuItem(); JMenuItem annotationColour = new JMenuItem(); + protected JMenuItem rnahelicesColour = new JMenuItem(); + JMenuItem associatedData = new JMenuItem(); protected JCheckBoxMenuItem autoCalculate = new JCheckBoxMenuItem(); + protected JCheckBoxMenuItem sortByTree = new JCheckBoxMenuItem(); + + protected JCheckBoxMenuItem listenToViewSelections = new JCheckBoxMenuItem(); + JMenu addSequenceMenu = new JMenu(); JMenuItem addFromFile = new JMenuItem(); @@ -236,7 +278,7 @@ public class GAlignFrame extends JInternalFrame GridLayout gridLayout1 = new GridLayout(); JMenu jMenu3 = new JMenu(); - + JMenuItem showAllSeqs = new JMenuItem(); JMenuItem showAllColumns = new JMenuItem(); @@ -247,6 +289,12 @@ public class GAlignFrame extends JInternalFrame JMenuItem hideSelColumns = new JMenuItem(); + JMenuItem hideAllButSelection = new JMenuItem(); + + JMenuItem hideAllSelection = new JMenuItem(); + + JMenuItem showAllhidden = new JMenuItem(); + protected JCheckBoxMenuItem hiddenMarkers = new JCheckBoxMenuItem(); JMenuItem invertColSel = new JMenuItem(); @@ -270,7 +318,7 @@ public class GAlignFrame extends JInternalFrame protected JCheckBoxMenuItem centreColumnLabelsMenuItem = new JCheckBoxMenuItem(); protected JCheckBoxMenuItem followHighlightMenuItem = new JCheckBoxMenuItem(); - + protected JMenuItem gatherViews = new JMenuItem(); protected JMenuItem expandViews = new JMenuItem(); @@ -278,21 +326,29 @@ public class GAlignFrame extends JInternalFrame JMenuItem pageSetup = new JMenuItem(); JMenuItem alignmentProperties = new JMenuItem(); - + JMenu tooltipSettingsMenu = new JMenu(); - private JMenuItem justifyLeftMenuItem=new JMenuItem(); + private JMenuItem justifyLeftMenuItem = new JMenuItem(); - private JMenuItem justifyRightMenuItem=new JMenuItem(); + private JMenuItem justifyRightMenuItem = new JMenuItem(); JMenu autoAnnMenu = new JMenu(); - protected JCheckBoxMenuItem showGroupConsensus=new JCheckBoxMenuItem(); - protected JCheckBoxMenuItem showGroupConservation=new JCheckBoxMenuItem(); - protected JCheckBoxMenuItem showConsensusHistogram=new JCheckBoxMenuItem(); - protected JCheckBoxMenuItem showConsensusProfile=new JCheckBoxMenuItem(); - protected JCheckBoxMenuItem applyAutoAnnotationSettings=new JCheckBoxMenuItem(); + + protected JCheckBoxMenuItem showGroupConsensus = new JCheckBoxMenuItem(); + + protected JCheckBoxMenuItem showGroupConservation = new JCheckBoxMenuItem(); + + protected JCheckBoxMenuItem showConsensusHistogram = new JCheckBoxMenuItem(); + + protected JCheckBoxMenuItem showSequenceLogo = new JCheckBoxMenuItem(); + + protected JCheckBoxMenuItem normaliseSequenceLogo = new JCheckBoxMenuItem(); + + protected JCheckBoxMenuItem applyAutoAnnotationSettings = new JCheckBoxMenuItem(); private JMenuItem grpsFromSelection = new JMenuItem(); + public GAlignFrame() { try @@ -349,13 +405,12 @@ public class GAlignFrame extends JInternalFrame if (evt.isControlDown() || SwingUtilities.isRightMouseButton(evt)) { - radioItem - .removeActionListener(radioItem.getActionListeners()[0]); + radioItem.removeActionListener(radioItem.getActionListeners()[0]); int option = JOptionPane.showInternalConfirmDialog( jalview.gui.Desktop.desktop, - "Remove from default list?", - "Remove user defined colour", + MessageManager.getString("label.remove_from_default_list"), + MessageManager.getString("label.remove_user_defined_colour"), JOptionPane.YES_NO_OPTION); if (option == JOptionPane.YES_OPTION) { @@ -400,6 +455,9 @@ public class GAlignFrame extends JInternalFrame colours.add(PIDColour); colours.add(BLOSUM62Colour); colours.add(nucleotideColour); + colours.add(purinePyrimidineColour); + // colours.add(covariationColour); + colours.add(tcoffeeColour); setColourSelected(jalview.bin.Cache .getDefault("DEFAULT_COLOUR", "None")); @@ -416,9 +474,6 @@ public class GAlignFrame extends JInternalFrame switch (index) { - case ColourSchemeProperty.NONE: - noColourmenuItem.setSelected(true); - break; case ColourSchemeProperty.CLUSTAL: clustalColour.setSelected(true); @@ -473,10 +528,29 @@ public class GAlignFrame extends JInternalFrame break; + case ColourSchemeProperty.TCOFFEE: + tcoffeeColour.setSelected(true); + break; + + case ColourSchemeProperty.PURINEPYRIMIDINE: + purinePyrimidineColour.setSelected(true); + + break; + /* + * case ColourSchemeProperty.COVARIATION: + * covariationColour.setSelected(true); + * + * break; + */ case ColourSchemeProperty.USER_DEFINED: userDefinedColour.setSelected(true); break; + case ColourSchemeProperty.NONE: + default: + noColourmenuItem.setSelected(true); + break; + } } @@ -484,8 +558,8 @@ public class GAlignFrame extends JInternalFrame private void jbInit() throws Exception { - fileMenu.setText("File"); - saveAs.setText("Save As..."); + fileMenu.setText(MessageManager.getString("action.file")); + saveAs.setText(MessageManager.getString("action.save_as") + "..."); saveAs.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_S, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask() @@ -497,7 +571,7 @@ public class GAlignFrame extends JInternalFrame saveAs_actionPerformed(e); } }); - closeMenuItem.setText("Close"); + closeMenuItem.setText(MessageManager.getString("action.close")); closeMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_W, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -508,12 +582,12 @@ public class GAlignFrame extends JInternalFrame closeMenuItem_actionPerformed(false); } }); - editMenu.setText("Edit"); - viewMenu.setText("View"); - colourMenu.setText("Colour"); - calculateMenu.setText("Calculate"); - webService.setText("Web Service"); - selectAllSequenceMenuItem.setText("Select All"); + editMenu.setText(MessageManager.getString("action.edit")); + viewMenu.setText(MessageManager.getString("action.view")); + colourMenu.setText(MessageManager.getString("action.colour")); + calculateMenu.setText(MessageManager.getString("action.calculate")); + webService.setText(MessageManager.getString("action.web_service")); + selectAllSequenceMenuItem.setText(MessageManager.getString("action.select_all")); selectAllSequenceMenuItem.setAccelerator(javax.swing.KeyStroke .getKeyStroke(java.awt.event.KeyEvent.VK_A, Toolkit .getDefaultToolkit().getMenuShortcutKeyMask(), false)); @@ -525,7 +599,7 @@ public class GAlignFrame extends JInternalFrame selectAllSequenceMenuItem_actionPerformed(e); } }); - deselectAllSequenceMenuItem.setText("Deselect All"); + deselectAllSequenceMenuItem.setText(MessageManager.getString("action.deselect_all")); deselectAllSequenceMenuItem.setAccelerator(javax.swing.KeyStroke .getKeyStroke(java.awt.event.KeyEvent.VK_ESCAPE, 0, false)); deselectAllSequenceMenuItem @@ -536,7 +610,7 @@ public class GAlignFrame extends JInternalFrame deselectAllSequenceMenuItem_actionPerformed(e); } }); - invertSequenceMenuItem.setText("Invert Sequence Selection"); + invertSequenceMenuItem.setText(MessageManager.getString("action.invert_sequence_selection")); invertSequenceMenuItem.setAccelerator(javax.swing.KeyStroke .getKeyStroke(java.awt.event.KeyEvent.VK_I, Toolkit .getDefaultToolkit().getMenuShortcutKeyMask(), false)); @@ -548,16 +622,16 @@ public class GAlignFrame extends JInternalFrame invertSequenceMenuItem_actionPerformed(e); } }); - grpsFromSelection.setText("Make Groups for selection"); + grpsFromSelection.setText(MessageManager.getString("action.make_groups_selection")); grpsFromSelection.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { makeGrpsFromSelection_actionPerformed(e); - } + } }); - remove2LeftMenuItem.setText("Remove Left"); + remove2LeftMenuItem.setText(MessageManager.getString("action.remove_left")); remove2LeftMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_L, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -569,7 +643,7 @@ public class GAlignFrame extends JInternalFrame remove2LeftMenuItem_actionPerformed(e); } }); - remove2RightMenuItem.setText("Remove Right"); + remove2RightMenuItem.setText(MessageManager.getString("action.remove_right")); remove2RightMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_R, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -581,7 +655,7 @@ public class GAlignFrame extends JInternalFrame remove2RightMenuItem_actionPerformed(e); } }); - removeGappedColumnMenuItem.setText("Remove Empty Columns"); + removeGappedColumnMenuItem.setText(MessageManager.getString("action.remove_empty_columns")); removeGappedColumnMenuItem.setAccelerator(javax.swing.KeyStroke .getKeyStroke(java.awt.event.KeyEvent.VK_E, Toolkit .getDefaultToolkit().getMenuShortcutKeyMask(), false)); @@ -593,7 +667,7 @@ public class GAlignFrame extends JInternalFrame removeGappedColumnMenuItem_actionPerformed(e); } }); - removeAllGapsMenuItem.setText("Remove All Gaps"); + removeAllGapsMenuItem.setText(MessageManager.getString("action.remove_all_gaps")); removeAllGapsMenuItem.setAccelerator(javax.swing.KeyStroke .getKeyStroke(java.awt.event.KeyEvent.VK_E, Toolkit .getDefaultToolkit().getMenuShortcutKeyMask() @@ -606,23 +680,25 @@ public class GAlignFrame extends JInternalFrame removeAllGapsMenuItem_actionPerformed(e); } }); - justifyLeftMenuItem.setText("Left Justify Alignment"); - justifyLeftMenuItem.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - justifyLeftMenuItem_actionPerformed(e); - } - }); - justifyRightMenuItem.setText("Right Justify Alignment"); - justifyRightMenuItem.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - justifyRightMenuItem_actionPerformed(e); - } - }); - viewBoxesMenuItem.setText("Boxes"); + justifyLeftMenuItem.setText(MessageManager.getString("action.left_justify_alignment")); + justifyLeftMenuItem + .addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + justifyLeftMenuItem_actionPerformed(e); + } + }); + justifyRightMenuItem.setText(MessageManager.getString("action.right_justify_alignment")); + justifyRightMenuItem + .addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + justifyRightMenuItem_actionPerformed(e); + } + }); + viewBoxesMenuItem.setText(MessageManager.getString("action.boxes")); viewBoxesMenuItem.setState(true); viewBoxesMenuItem.addActionListener(new java.awt.event.ActionListener() { @@ -631,7 +707,7 @@ public class GAlignFrame extends JInternalFrame viewBoxesMenuItem_actionPerformed(e); } }); - viewTextMenuItem.setText("Text"); + viewTextMenuItem.setText(MessageManager.getString("action.text")); viewTextMenuItem.setState(true); viewTextMenuItem.addActionListener(new java.awt.event.ActionListener() { @@ -640,16 +716,17 @@ public class GAlignFrame extends JInternalFrame viewTextMenuItem_actionPerformed(e); } }); - showUnconservedMenuItem.setText("Show Unconserved"); - showUnconservedMenuItem.setState(false); - showUnconservedMenuItem.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - showUnconservedMenuItem_actionPerformed(e); - } - }); - sortPairwiseMenuItem.setText("by Pairwise Identity"); + showNonconservedMenuItem.setText(MessageManager.getString("label.show_non_conversed")); + showNonconservedMenuItem.setState(false); + showNonconservedMenuItem + .addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + showUnconservedMenuItem_actionPerformed(e); + } + }); + sortPairwiseMenuItem.setText(MessageManager.getString("action.by_pairwise_id")); sortPairwiseMenuItem .addActionListener(new java.awt.event.ActionListener() { @@ -658,7 +735,7 @@ public class GAlignFrame extends JInternalFrame sortPairwiseMenuItem_actionPerformed(e); } }); - sortIDMenuItem.setText("by ID"); + sortIDMenuItem.setText(MessageManager.getString("action.by_id")); sortIDMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -666,15 +743,16 @@ public class GAlignFrame extends JInternalFrame sortIDMenuItem_actionPerformed(e); } }); - sortLengthMenuItem.setText("By Length"); - sortLengthMenuItem.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - sortLengthMenuItem_actionPerformed(e); - } - }); - sortGroupMenuItem.setText("by Group"); + sortLengthMenuItem.setText(MessageManager.getString("action.by_length")); + sortLengthMenuItem + .addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + sortLengthMenuItem_actionPerformed(e); + } + }); + sortGroupMenuItem.setText(MessageManager.getString("action.by_group")); sortGroupMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -682,7 +760,7 @@ public class GAlignFrame extends JInternalFrame sortGroupMenuItem_actionPerformed(e); } }); - removeRedundancyMenuItem.setText("Remove Redundancy..."); + removeRedundancyMenuItem.setText(MessageManager.getString("action.remove_redundancy")); removeRedundancyMenuItem.setAccelerator(javax.swing.KeyStroke .getKeyStroke(java.awt.event.KeyEvent.VK_D, Toolkit .getDefaultToolkit().getMenuShortcutKeyMask(), false)); @@ -694,7 +772,7 @@ public class GAlignFrame extends JInternalFrame removeRedundancyMenuItem_actionPerformed(e); } }); - pairwiseAlignmentMenuItem.setText("Pairwise Alignments..."); + pairwiseAlignmentMenuItem.setText(MessageManager.getString("action.pairwise_alignment")); pairwiseAlignmentMenuItem .addActionListener(new java.awt.event.ActionListener() { @@ -703,7 +781,7 @@ public class GAlignFrame extends JInternalFrame pairwiseAlignmentMenuItem_actionPerformed(e); } }); - PCAMenuItem.setText("Principal Component Analysis"); + PCAMenuItem.setText(MessageManager.getString("label.principal_component_analysis")); PCAMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -712,7 +790,7 @@ public class GAlignFrame extends JInternalFrame } }); averageDistanceTreeMenuItem - .setText("Average Distance Using % Identity"); + .setText(MessageManager.getString("label.average_distance_identity")); averageDistanceTreeMenuItem .addActionListener(new java.awt.event.ActionListener() { @@ -721,7 +799,7 @@ public class GAlignFrame extends JInternalFrame averageDistanceTreeMenuItem_actionPerformed(e); } }); - neighbourTreeMenuItem.setText("Neighbour Joining Using % Identity"); + neighbourTreeMenuItem.setText(MessageManager.getString("label.neighbour_joining_identity")); neighbourTreeMenuItem .addActionListener(new java.awt.event.ActionListener() { @@ -735,9 +813,9 @@ public class GAlignFrame extends JInternalFrame statusBar.setBackground(Color.white); statusBar.setFont(new java.awt.Font("Verdana", 0, 11)); statusBar.setBorder(BorderFactory.createLineBorder(Color.black)); - statusBar.setText("Status bar"); - outputTextboxMenu.setText("Output to Textbox"); - clustalColour.setText("Clustalx"); + statusBar.setText(MessageManager.getString("label.status_bar")); + outputTextboxMenu.setText(MessageManager.getString("label.out_to_textbox")); + clustalColour.setText(MessageManager.getString("label.clustalx")); clustalColour.addActionListener(new java.awt.event.ActionListener() { @@ -746,7 +824,7 @@ public class GAlignFrame extends JInternalFrame clustalColour_actionPerformed(e); } }); - zappoColour.setText("Zappo"); + zappoColour.setText(MessageManager.getString("label.zappo")); zappoColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -754,7 +832,7 @@ public class GAlignFrame extends JInternalFrame zappoColour_actionPerformed(e); } }); - taylorColour.setText("Taylor"); + taylorColour.setText(MessageManager.getString("label.taylor")); taylorColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -762,7 +840,7 @@ public class GAlignFrame extends JInternalFrame taylorColour_actionPerformed(e); } }); - hydrophobicityColour.setText("Hydrophobicity"); + hydrophobicityColour.setText(MessageManager.getString("label.hydrophobicity")); hydrophobicityColour .addActionListener(new java.awt.event.ActionListener() { @@ -771,7 +849,7 @@ public class GAlignFrame extends JInternalFrame hydrophobicityColour_actionPerformed(e); } }); - helixColour.setText("Helix Propensity"); + helixColour.setText(MessageManager.getString("label.helix_propensity")); helixColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -779,7 +857,7 @@ public class GAlignFrame extends JInternalFrame helixColour_actionPerformed(e); } }); - strandColour.setText("Strand Propensity"); + strandColour.setText(MessageManager.getString("label.strand_propensity")); strandColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -787,7 +865,7 @@ public class GAlignFrame extends JInternalFrame strandColour_actionPerformed(e); } }); - turnColour.setText("Turn Propensity"); + turnColour.setText(MessageManager.getString("Turn Propensity")); turnColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -795,7 +873,7 @@ public class GAlignFrame extends JInternalFrame turnColour_actionPerformed(e); } }); - buriedColour.setText("Buried Index"); + buriedColour.setText(MessageManager.getString("Buried Index")); buriedColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -803,7 +881,7 @@ public class GAlignFrame extends JInternalFrame buriedColour_actionPerformed(e); } }); - userDefinedColour.setText("User Defined..."); + userDefinedColour.setText(MessageManager.getString("action.user_defined")); userDefinedColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -811,7 +889,7 @@ public class GAlignFrame extends JInternalFrame userDefinedColour_actionPerformed(e); } }); - PIDColour.setText("Percentage Identity"); + PIDColour.setText(MessageManager.getString("label.percentage_identity")); PIDColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -819,7 +897,7 @@ public class GAlignFrame extends JInternalFrame PIDColour_actionPerformed(e); } }); - BLOSUM62Colour.setText("BLOSUM62 Score"); + BLOSUM62Colour.setText(MessageManager.getString("label.blosum62_score")); BLOSUM62Colour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -827,7 +905,32 @@ public class GAlignFrame extends JInternalFrame BLOSUM62Colour_actionPerformed(e); } }); - avDistanceTreeBlosumMenuItem.setText("Average Distance Using BLOSUM62"); + nucleotideColour.setText(MessageManager.getString("label.nucleotide")); + nucleotideColour.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + nucleotideColour_actionPerformed(e); + } + }); + + purinePyrimidineColour.setText(MessageManager.getString("label.purine_pyrimidine")); + purinePyrimidineColour + .addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + purinePyrimidineColour_actionPerformed(e); + } + }); + /* + * covariationColour.setText("Covariation"); + * covariationColour.addActionListener(new java.awt.event.ActionListener() { + * public void actionPerformed(ActionEvent e) { + * covariationColour_actionPerformed(e); } }); + */ + + avDistanceTreeBlosumMenuItem.setText(MessageManager.getString("label.average_distance_bloslum62")); avDistanceTreeBlosumMenuItem .addActionListener(new java.awt.event.ActionListener() { @@ -836,7 +939,7 @@ public class GAlignFrame extends JInternalFrame avTreeBlosumMenuItem_actionPerformed(e); } }); - njTreeBlosumMenuItem.setText("Neighbour Joining using BLOSUM62"); + njTreeBlosumMenuItem.setText(MessageManager.getString("label.neighbour_blosum62")); njTreeBlosumMenuItem .addActionListener(new java.awt.event.ActionListener() { @@ -846,7 +949,7 @@ public class GAlignFrame extends JInternalFrame } }); annotationPanelMenuItem.setActionCommand(""); - annotationPanelMenuItem.setText("Show Annotations"); + annotationPanelMenuItem.setText(MessageManager.getString("label.show_annotations")); annotationPanelMenuItem.setState(jalview.bin.Cache.getDefault( "SHOW_ANNOTATIONS", true)); annotationPanelMenuItem @@ -857,7 +960,7 @@ public class GAlignFrame extends JInternalFrame annotationPanelMenuItem_actionPerformed(e); } }); - colourTextMenuItem.setText("Colour Text"); + colourTextMenuItem.setText(MessageManager.getString("label.colour_text")); colourTextMenuItem .addActionListener(new java.awt.event.ActionListener() { @@ -866,7 +969,7 @@ public class GAlignFrame extends JInternalFrame colourTextMenuItem_actionPerformed(e); } }); - htmlMenuItem.setText("HTML"); + htmlMenuItem.setText(MessageManager.getString("label.html")); htmlMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -874,7 +977,7 @@ public class GAlignFrame extends JInternalFrame htmlMenuItem_actionPerformed(e); } }); - overviewMenuItem.setText("Overview Window"); + overviewMenuItem.setText(MessageManager.getString("label.overview_window")); overviewMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -883,7 +986,7 @@ public class GAlignFrame extends JInternalFrame } }); undoMenuItem.setEnabled(false); - undoMenuItem.setText("Undo"); + undoMenuItem.setText(MessageManager.getString("action.undo")); undoMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_Z, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -895,7 +998,7 @@ public class GAlignFrame extends JInternalFrame } }); redoMenuItem.setEnabled(false); - redoMenuItem.setText("Redo"); + redoMenuItem.setText(MessageManager.getString("action.redo")); redoMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_Y, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -906,7 +1009,7 @@ public class GAlignFrame extends JInternalFrame redoMenuItem_actionPerformed(e); } }); - conservationMenuItem.setText("By Conservation"); + conservationMenuItem.setText(MessageManager.getString("action.by_conservation")); conservationMenuItem .addActionListener(new java.awt.event.ActionListener() { @@ -915,7 +1018,7 @@ public class GAlignFrame extends JInternalFrame conservationMenuItem_actionPerformed(e); } }); - noColourmenuItem.setText("None"); + noColourmenuItem.setText(MessageManager.getString("label.none")); noColourmenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -923,7 +1026,7 @@ public class GAlignFrame extends JInternalFrame noColourmenuItem_actionPerformed(e); } }); - wrapMenuItem.setText("Wrap"); + wrapMenuItem.setText(MessageManager.getString("labe.wrap")); wrapMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -931,7 +1034,7 @@ public class GAlignFrame extends JInternalFrame wrapMenuItem_actionPerformed(e); } }); - printMenuItem.setText("Print ..."); + printMenuItem.setText(MessageManager.getString("action.print") + "..."); printMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_P, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -942,7 +1045,7 @@ public class GAlignFrame extends JInternalFrame printMenuItem_actionPerformed(e); } }); - renderGapsMenuItem.setText("Show Gaps"); + renderGapsMenuItem.setText(MessageManager.getString("action.show_gaps")); renderGapsMenuItem.setState(true); renderGapsMenuItem .addActionListener(new java.awt.event.ActionListener() @@ -952,7 +1055,7 @@ public class GAlignFrame extends JInternalFrame renderGapsMenuItem_actionPerformed(e); } }); - findMenuItem.setText("Find..."); + findMenuItem.setText(MessageManager.getString("action.find")); findMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_F, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -963,7 +1066,7 @@ public class GAlignFrame extends JInternalFrame findMenuItem_actionPerformed(e); } }); - abovePIDThreshold.setText("Above Identity Threshold"); + abovePIDThreshold.setText(MessageManager.getString("label.above_identity_threshold")); abovePIDThreshold.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -971,7 +1074,7 @@ public class GAlignFrame extends JInternalFrame abovePIDThreshold_actionPerformed(e); } }); - showSeqFeatures.setText("Show Sequence Features"); + showSeqFeatures.setText(MessageManager.getString("label.show_sequence_features")); showSeqFeatures.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -979,16 +1082,13 @@ public class GAlignFrame extends JInternalFrame showSeqFeatures_actionPerformed(actionEvent); } }); -/* - * showSeqFeaturesHeight.setText("Vary Sequence Feature Height"); - showSeqFeaturesHeight.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - showSeqFeaturesHeight_actionPerformed(actionEvent); - } - }); */ - showDbRefsMenuitem.setText("Show Database Refs"); + /* + * showSeqFeaturesHeight.setText("Vary Sequence Feature Height"); + * showSeqFeaturesHeight.addActionListener(new ActionListener() { public + * void actionPerformed(ActionEvent actionEvent) { + * showSeqFeaturesHeight_actionPerformed(actionEvent); } }); + */ + showDbRefsMenuitem.setText(MessageManager.getString("label.show_database_refs")); showDbRefsMenuitem.addActionListener(new ActionListener() { @@ -996,9 +1096,9 @@ public class GAlignFrame extends JInternalFrame { showDbRefs_actionPerformed(e); } - + }); - showNpFeatsMenuitem.setText("Show Non-Positional Features"); + showNpFeatsMenuitem.setText(MessageManager.getString("label.show_non_positional_features")); showNpFeatsMenuitem.addActionListener(new ActionListener() { @@ -1006,9 +1106,9 @@ public class GAlignFrame extends JInternalFrame { showNpFeats_actionPerformed(e); } - + }); - showGroupConservation.setText("Group Conservation"); + showGroupConservation.setText(MessageManager.getString("label.group_conservation")); showGroupConservation.addActionListener(new ActionListener() { @@ -1016,10 +1116,10 @@ public class GAlignFrame extends JInternalFrame { showGroupConservation_actionPerformed(e); } - + }); - showGroupConsensus.setText("Group Consensus"); + showGroupConsensus.setText(MessageManager.getString("label.group_consensus")); showGroupConsensus.addActionListener(new ActionListener() { @@ -1027,9 +1127,9 @@ public class GAlignFrame extends JInternalFrame { showGroupConsensus_actionPerformed(e); } - + }); - showConsensusHistogram.setText("Show Consensus Histogram"); + showConsensusHistogram.setText(MessageManager.getString("label.show_consensus_histogram")); showConsensusHistogram.addActionListener(new ActionListener() { @@ -1037,19 +1137,29 @@ public class GAlignFrame extends JInternalFrame { showConsensusHistogram_actionPerformed(e); } - + }); - showConsensusProfile.setText("Show Consensus Logo"); - showConsensusProfile.addActionListener(new ActionListener() + showSequenceLogo.setText(MessageManager.getString("label.show_consensus_logo")); + showSequenceLogo.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - showConsensusProfile_actionPerformed(e); + showSequenceLogo_actionPerformed(e); } - + }); - applyAutoAnnotationSettings.setText("Apply to all groups"); + normaliseSequenceLogo.setText(MessageManager.getString("label.norm_consensus_logo")); + normaliseSequenceLogo.addActionListener(new ActionListener() + { + + public void actionPerformed(ActionEvent e) + { + normaliseSequenceLogo_actionPerformed(e); + } + + }); + applyAutoAnnotationSettings.setText(MessageManager.getString("label.apply_all_groups")); applyAutoAnnotationSettings.setState(false); applyAutoAnnotationSettings.setVisible(true); applyAutoAnnotationSettings.addActionListener(new ActionListener() @@ -1059,10 +1169,10 @@ public class GAlignFrame extends JInternalFrame { applyAutoAnnotationSettings_actionPerformed(e); } - + }); - nucleotideColour.setText("Nucleotide"); + nucleotideColour.setText(MessageManager.getString("label.nucleotide")); nucleotideColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1070,7 +1180,20 @@ public class GAlignFrame extends JInternalFrame nucleotideColour_actionPerformed(e); } }); - deleteGroups.setText("Undefine groups"); + + tcoffeeColour.setText(MessageManager.getString("label.tcoffee_scores")); + tcoffeeColour.setEnabled(false); + tcoffeeColour.addActionListener(new ActionListener() + { + + @Override + public void actionPerformed(ActionEvent e) + { + tcoffeeColorScheme_actionPerformed(e); + } + }); + + deleteGroups.setText(MessageManager.getString("action.undefine_groups")); deleteGroups.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_U, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -1081,7 +1204,29 @@ public class GAlignFrame extends JInternalFrame deleteGroups_actionPerformed(e); } }); - copy.setText("Copy"); + createGroup.setText(MessageManager.getString("action.create_groups")); + createGroup.setAccelerator(javax.swing.KeyStroke.getKeyStroke( + java.awt.event.KeyEvent.VK_G, Toolkit.getDefaultToolkit() + .getMenuShortcutKeyMask(), false)); + createGroup.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + createGroup_actionPerformed(e); + } + }); + unGroup.setText(MessageManager.getString("action.remove_group")); + unGroup.setAccelerator(javax.swing.KeyStroke.getKeyStroke( + java.awt.event.KeyEvent.VK_G,Toolkit.getDefaultToolkit() + .getMenuShortcutKeyMask() | java.awt.event.KeyEvent.SHIFT_MASK, false)); + unGroup.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + unGroup_actionPerformed(e); + } + }); + copy.setText(MessageManager.getString("action.copy")); copy.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_C, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -1093,7 +1238,7 @@ public class GAlignFrame extends JInternalFrame copy_actionPerformed(e); } }); - cut.setText("Cut"); + cut.setText(MessageManager.getString("action.cut")); cut.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_X, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -1104,7 +1249,7 @@ public class GAlignFrame extends JInternalFrame cut_actionPerformed(e); } }); - delete.setText("Delete"); + delete.setText(MessageManager.getString("action.delete")); delete.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_BACK_SPACE, 0, false)); delete.addActionListener(new java.awt.event.ActionListener() @@ -1114,8 +1259,8 @@ public class GAlignFrame extends JInternalFrame delete_actionPerformed(e); } }); - pasteMenu.setText("Paste"); - pasteNew.setText("To New Alignment"); + pasteMenu.setText(MessageManager.getString("action.paste")); + pasteNew.setText(MessageManager.getString("label.to_new_alignment")); pasteNew.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_V, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask() @@ -1127,7 +1272,7 @@ public class GAlignFrame extends JInternalFrame pasteNew_actionPerformed(e); } }); - pasteThis.setText("Add To This Alignment"); + pasteThis.setText(MessageManager.getString("label.to_this_alignment")); pasteThis.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_V, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -1138,7 +1283,7 @@ public class GAlignFrame extends JInternalFrame pasteThis_actionPerformed(e); } }); - applyToAllGroups.setText("Apply Colour To All Groups"); + applyToAllGroups.setText(MessageManager.getString("label.apply_colour_to_all_groups")); applyToAllGroups.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1153,9 +1298,9 @@ public class GAlignFrame extends JInternalFrame createPNG(null); } }); - createPNG.setActionCommand("Save As PNG Image"); + createPNG.setActionCommand(MessageManager.getString("label.save_png_image")); createPNG.setText("PNG"); - font.setText("Font..."); + font.setText(MessageManager.getString("action.font")); font.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1164,7 +1309,7 @@ public class GAlignFrame extends JInternalFrame } }); - seqLimits.setText("Show Sequence Limits"); + seqLimits.setText(MessageManager.getString("label.show_sequence_limits")); seqLimits.setState(jalview.bin.Cache.getDefault("SHOW_JVSUFFIX", true)); seqLimits.addActionListener(new java.awt.event.ActionListener() { @@ -1181,8 +1326,8 @@ public class GAlignFrame extends JInternalFrame createEPS(null); } }); - LoadtreeMenuItem.setActionCommand("Load a tree for this sequence set"); - LoadtreeMenuItem.setText("Load Associated Tree"); + LoadtreeMenuItem.setActionCommand(MessageManager.getString("label.load_tree_for_sequence_set")); + LoadtreeMenuItem.setText(MessageManager.getString("label.load_associated_tree")); LoadtreeMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1190,8 +1335,9 @@ public class GAlignFrame extends JInternalFrame LoadtreeMenuItem_actionPerformed(e); } }); + scaleAbove.setVisible(false); - scaleAbove.setText("Scale Above"); + scaleAbove.setText(MessageManager.getString("action.scale_above")); scaleAbove.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1201,7 +1347,7 @@ public class GAlignFrame extends JInternalFrame }); scaleLeft.setVisible(false); scaleLeft.setSelected(true); - scaleLeft.setText("Scale Left"); + scaleLeft.setText(MessageManager.getString("action.scale_left")); scaleLeft.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1211,7 +1357,7 @@ public class GAlignFrame extends JInternalFrame }); scaleRight.setVisible(false); scaleRight.setSelected(true); - scaleRight.setText("Scale Right"); + scaleRight.setText(MessageManager.getString("action.scale_right")); scaleRight.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1221,7 +1367,7 @@ public class GAlignFrame extends JInternalFrame }); centreColumnLabelsMenuItem.setVisible(true); centreColumnLabelsMenuItem.setState(false); - centreColumnLabelsMenuItem.setText("Centre Column Labels"); + centreColumnLabelsMenuItem.setText(MessageManager.getString("label.centre_column_labels")); centreColumnLabelsMenuItem .addActionListener(new java.awt.event.ActionListener() { @@ -1232,7 +1378,7 @@ public class GAlignFrame extends JInternalFrame }); followHighlightMenuItem.setVisible(true); followHighlightMenuItem.setState(true); - followHighlightMenuItem.setText("Automatic Scrolling"); + followHighlightMenuItem.setText(MessageManager.getString("label.automatic_scrolling")); followHighlightMenuItem.addActionListener(new ActionListener() { @@ -1240,10 +1386,10 @@ public class GAlignFrame extends JInternalFrame { followHighlight_actionPerformed(); } - + }); - - modifyPID.setText("Modify Identity Threshold..."); + + modifyPID.setText(MessageManager.getString("label.modify_identity_thereshold")); modifyPID.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1251,7 +1397,7 @@ public class GAlignFrame extends JInternalFrame modifyPID_actionPerformed(e); } }); - modifyConservation.setText("Modify Conservation Threshold..."); + modifyConservation.setText(MessageManager.getString("label.modify_conservation_thereshold")); modifyConservation .addActionListener(new java.awt.event.ActionListener() { @@ -1260,8 +1406,8 @@ public class GAlignFrame extends JInternalFrame modifyConservation_actionPerformed(e); } }); - sortByTreeMenu.setText("By Tree Order"); - sort.setText("Sort"); + sortByTreeMenu.setText(MessageManager.getString("action.by_tree_order")); + sort.setText(MessageManager.getString("action.sort")); sort.addMenuListener(new MenuListener() { public void menuSelected(MenuEvent e) @@ -1277,7 +1423,7 @@ public class GAlignFrame extends JInternalFrame { } }); - sortByAnnotScore.setText("by Score"); + sortByAnnotScore.setText(MessageManager.getString("label.sort_by_score")); sort.add(sortByAnnotScore); sortByAnnotScore.addMenuListener(new javax.swing.event.MenuListener() { @@ -1297,10 +1443,10 @@ public class GAlignFrame extends JInternalFrame }); sortByAnnotScore.setVisible(false); - calculateTree.setText("Calculate Tree"); + calculateTree.setText(MessageManager.getString("action.calculate_tree")); - jMenu2.setText("Export Image"); - padGapsMenuitem.setText("Pad Gaps"); + jMenu2.setText(MessageManager.getString("label.export_image")); + padGapsMenuitem.setText(MessageManager.getString("label.pad_gaps")); padGapsMenuitem.setState(jalview.bin.Cache .getDefault("PAD_GAPS", false)); padGapsMenuitem.addActionListener(new ActionListener() @@ -1311,7 +1457,7 @@ public class GAlignFrame extends JInternalFrame } }); vamsasStore.setVisible(false); - vamsasStore.setText("VAMSAS store"); + vamsasStore.setText(MessageManager.getString("label.vamsas_store")); vamsasStore.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1319,7 +1465,7 @@ public class GAlignFrame extends JInternalFrame vamsasStore_actionPerformed(e); } }); - showTranslation.setText("Translate cDNA"); + showTranslation.setText(MessageManager.getString("label.translate_cDNA")); showTranslation.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1327,7 +1473,7 @@ public class GAlignFrame extends JInternalFrame showTranslation_actionPerformed(e); } }); - extractScores.setText("Extract Scores..."); + extractScores.setText(MessageManager.getString("label.extract_scores") + "..."); extractScores.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1336,23 +1482,23 @@ public class GAlignFrame extends JInternalFrame } }); extractScores.setVisible(true); // JBPNote: TODO: make gui for regex based - // score extraction - showProducts.setText("Get Cross References"); + // score extraction + showProducts.setText(MessageManager.getString("label.get_cross_refs")); /* * showProducts.addActionListener(new ActionListener() { * * public void actionPerformed(ActionEvent e) { * showProducts_actionPerformed(e); } }); */ - featureSettings.setText("Feature Settings..."); - featureSettings.addActionListener(new ActionListener() + openFeatureSettings.setText(MessageManager.getString("label.feature_settings")); + openFeatureSettings.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { featureSettings_actionPerformed(e); } }); - fetchSequence.setText("Fetch Sequence(s)..."); + fetchSequence.setText(MessageManager.getString("label.fetch_sequences")); fetchSequence.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1361,7 +1507,7 @@ public class GAlignFrame extends JInternalFrame } }); - annotationColour.setText("By Annotation..."); + annotationColour.setText(MessageManager.getString("action.by_annotation")); annotationColour.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1369,7 +1515,17 @@ public class GAlignFrame extends JInternalFrame annotationColour_actionPerformed(e); } }); - associatedData.setText("Load Features / Annotations"); + + rnahelicesColour.setText(MessageManager.getString("action.by_rna_helixes")); + rnahelicesColour.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + rnahelicesColour_actionPerformed(e); + } + }); + + associatedData.setText(MessageManager.getString("label.load_features_annotations")); associatedData.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1377,7 +1533,7 @@ public class GAlignFrame extends JInternalFrame associatedData_actionPerformed(e); } }); - autoCalculate.setText("Autocalculate Consensus"); + autoCalculate.setText(MessageManager.getString("label.autocalculate_consensus")); autoCalculate.setState(jalview.bin.Cache.getDefault( "AUTO_CALC_CONSENSUS", true)); autoCalculate.addActionListener(new ActionListener() @@ -1387,8 +1543,33 @@ public class GAlignFrame extends JInternalFrame autoCalculate_actionPerformed(e); } }); - addSequenceMenu.setText("Add Sequences"); - addFromFile.setText("From File"); + sortByTree.setText(MessageManager.getString("label.sort_alignment_new_tree")); + sortByTree + .setToolTipText("" + MessageManager.getString("label.enable_automatically_sort_alignment_when_open_new_tree")); + sortByTree + .setState(jalview.bin.Cache.getDefault("SORT_BY_TREE", false)); + sortByTree.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + sortByTreeOption_actionPerformed(e); + } + }); + + listenToViewSelections.setText(MessageManager.getString("label.listen_for_selections")); + listenToViewSelections + .setToolTipText("" + MessageManager.getString("label.selections_mirror_selections_made_same_sequences_other_views")); + listenToViewSelections.setState(false); + listenToViewSelections.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + listenToViewSelections_actionPerformed(e); + } + }); + + addSequenceMenu.setText(MessageManager.getString("label.add_sequences")); + addFromFile.setText(MessageManager.getString("label.from_file")); addFromFile.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1396,7 +1577,7 @@ public class GAlignFrame extends JInternalFrame addFromFile_actionPerformed(e); } }); - addFromText.setText("From Textbox"); + addFromText.setText(MessageManager.getString("label.from_textbox")); addFromText.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1404,7 +1585,7 @@ public class GAlignFrame extends JInternalFrame addFromText_actionPerformed(e); } }); - addFromURL.setText("From URL"); + addFromURL.setText(MessageManager.getString("label.from_url")); addFromURL.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1412,7 +1593,7 @@ public class GAlignFrame extends JInternalFrame addFromURL_actionPerformed(e); } }); - exportFeatures.setText("Export Features..."); + exportFeatures.setText(MessageManager.getString("label.export_features")); exportFeatures.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1420,7 +1601,7 @@ public class GAlignFrame extends JInternalFrame exportFeatures_actionPerformed(e); } }); - exportAnnotations.setText("Export Annotations..."); + exportAnnotations.setText(MessageManager.getString("label.export_annotations")); exportAnnotations.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1429,8 +1610,9 @@ public class GAlignFrame extends JInternalFrame } }); statusPanel.setLayout(gridLayout1); - jMenu3.setText("Show"); - showAllSeqs.setText("All Sequences"); + jMenu3.setText(MessageManager.getString("action.show")); + showAllSeqs.setText(MessageManager.getString("label.all_sequences")); + showAllSeqs.setToolTipText(MessageManager.getString("label.toggle_sequence_visibility")); showAllSeqs.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1438,7 +1620,8 @@ public class GAlignFrame extends JInternalFrame showAllSeqs_actionPerformed(e); } }); - showAllColumns.setText("All Columns"); + showAllColumns.setText(MessageManager.getString("label.all_columns")); + showAllColumns.setToolTipText(MessageManager.getString("label.toggle_columns_visibility")); showAllColumns.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1446,8 +1629,9 @@ public class GAlignFrame extends JInternalFrame showAllColumns_actionPerformed(e); } }); - hideMenu.setText("Hide"); - hideSelSequences.setText("Selected Sequences"); + hideMenu.setText(MessageManager.getString("action.hide")); + hideSelSequences.setText(MessageManager.getString("label.selected_sequences")); + hideSelSequences.setToolTipText(MessageManager.getString("label.toggle_sequence_visibility")); hideSelSequences.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1455,7 +1639,8 @@ public class GAlignFrame extends JInternalFrame hideSelSequences_actionPerformed(e); } }); - hideSelColumns.setText("Selected Columns"); + hideSelColumns.setText(MessageManager.getString("label.selected_columns")); + hideSelColumns.setToolTipText(MessageManager.getString("label.toggle_columns_visibility")); hideSelColumns.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1463,7 +1648,35 @@ public class GAlignFrame extends JInternalFrame hideSelColumns_actionPerformed(e); } }); - hiddenMarkers.setText("Show Hidden Markers"); + hideAllSelection.setText(MessageManager.getString("label.selected_region")); + hideAllSelection.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + hideAllSelection_actionPerformed(e); + } + }); + // TODO: should be hidden if no selection exists. + hideAllButSelection.setText(MessageManager.getString("label.all_but_selected_region")); + hideAllButSelection.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + hideAllButSelection_actionPerformed(e); + } + }); + showAllhidden.setText(MessageManager.getString("label.all_sequences_columns")); + showAllhidden + .setToolTipText(MessageManager.getString("label.toggles_visibility_hidden_selected_regions")); + showAllhidden.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + showAllhidden_actionPerformed(e); + } + }); + + hiddenMarkers.setText(MessageManager.getString("action.show_hidden_markers")); hiddenMarkers.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1471,7 +1684,7 @@ public class GAlignFrame extends JInternalFrame hiddenMarkers_actionPerformed(e); } }); - invertColSel.setText("Invert Column Selection"); + invertColSel.setText(MessageManager.getString("action.invert_column_selection")); invertColSel.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_I, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask() @@ -1506,7 +1719,7 @@ public class GAlignFrame extends JInternalFrame tabbedPane_focusGained(e); } }); - save.setText("Save"); + save.setText(MessageManager.getString("action.save")); save.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_S, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -1518,7 +1731,7 @@ public class GAlignFrame extends JInternalFrame } }); reload.setEnabled(false); - reload.setText("Reload"); + reload.setText(MessageManager.getString("action.reload")); reload.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1526,7 +1739,7 @@ public class GAlignFrame extends JInternalFrame reload_actionPerformed(e); } }); - newView.setText("New View"); + newView.setText(MessageManager.getString("action.new_view")); newView.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_T, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -1537,9 +1750,8 @@ public class GAlignFrame extends JInternalFrame newView_actionPerformed(e); } }); - tabbedPane.setToolTipText(" Right-click to rename tab" - + "
Press X to eXpand tabs, G to reGroup."); - textColour.setText("Colour Text ..."); + tabbedPane.setToolTipText("" + MessageManager.getString("label.rename_tab_eXpand_reGroup") + ""); + textColour.setText(MessageManager.getString("label.colour_text") + "..."); textColour.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1547,9 +1759,9 @@ public class GAlignFrame extends JInternalFrame textColour_actionPerformed(e); } }); - formatMenu.setText("Format"); - selectMenu.setText("Select"); - idRightAlign.setText("Right Align Sequence Id"); + formatMenu.setText(MessageManager.getString("action.format")); + selectMenu.setText(MessageManager.getString("action.select")); + idRightAlign.setText(MessageManager.getString("label.right_align_sequence_id")); idRightAlign.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1558,7 +1770,7 @@ public class GAlignFrame extends JInternalFrame } }); gatherViews.setEnabled(false); - gatherViews.setText("Gather Views"); + gatherViews.setText(MessageManager.getString("action.gather_views")); gatherViews.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_G, 0, false)); gatherViews.addActionListener(new ActionListener() @@ -1569,7 +1781,7 @@ public class GAlignFrame extends JInternalFrame } }); expandViews.setEnabled(false); - expandViews.setText("Expand Views"); + expandViews.setText(MessageManager.getString("action.expand_views")); expandViews.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_X, 0, false)); expandViews.addActionListener(new ActionListener() @@ -1579,7 +1791,7 @@ public class GAlignFrame extends JInternalFrame expandViews_actionPerformed(e); } }); - pageSetup.setText("Page Setup ..."); + pageSetup.setText(MessageManager.getString("action.page_setup") + "..."); pageSetup.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1587,7 +1799,7 @@ public class GAlignFrame extends JInternalFrame pageSetup_actionPerformed(e); } }); - alignmentProperties.setText("Alignment Properties..."); + alignmentProperties.setText(MessageManager.getString("label.alignment_props") + "..."); alignmentProperties.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -1595,8 +1807,8 @@ public class GAlignFrame extends JInternalFrame alignmentProperties(); } }); - tooltipSettingsMenu.setText("Sequence ID Tooltip"); - autoAnnMenu.setText("Autocalculated Annotation"); + tooltipSettingsMenu.setText(MessageManager.getString("label.sequence_id_tooltip")); + autoAnnMenu.setText(MessageManager.getString("label.autocalculated_annotation")); alignFrameMenuBar.add(fileMenu); alignFrameMenuBar.add(editMenu); alignFrameMenuBar.add(selectMenu); @@ -1637,9 +1849,10 @@ public class GAlignFrame extends JInternalFrame editMenu.add(removeRedundancyMenuItem); editMenu.addSeparator(); // dont add these yet in the CVS build - they cannot be undone! - editMenu.add(justifyLeftMenuItem); - editMenu.add(justifyRightMenuItem); - editMenu.addSeparator(); + // Excluded from Jalview 2.5 release - undo needs to be implemented. + // editMenu.add(justifyLeftMenuItem); + // editMenu.add(justifyRightMenuItem); + // editMenu.addSeparator(); editMenu.add(padGapsMenuitem); viewMenu.add(newView); viewMenu.add(expandViews); @@ -1652,16 +1865,17 @@ public class GAlignFrame extends JInternalFrame viewMenu.add(annotationPanelMenuItem); autoAnnMenu.add(applyAutoAnnotationSettings); autoAnnMenu.add(showConsensusHistogram); - autoAnnMenu.add(showConsensusProfile); + autoAnnMenu.add(showSequenceLogo); + autoAnnMenu.add(normaliseSequenceLogo); autoAnnMenu.addSeparator(); autoAnnMenu.add(showGroupConservation); autoAnnMenu.add(showGroupConsensus); viewMenu.add(autoAnnMenu); viewMenu.addSeparator(); viewMenu.add(showSeqFeatures); - //viewMenu.add(showSeqFeaturesHeight); - - viewMenu.add(featureSettings); + // viewMenu.add(showSeqFeaturesHeight); + + viewMenu.add(openFeatureSettings); tooltipSettingsMenu.add(showDbRefsMenuitem); tooltipSettingsMenu.add(showNpFeatsMenuitem); viewMenu.add(tooltipSettingsMenu); @@ -1684,6 +1898,9 @@ public class GAlignFrame extends JInternalFrame colourMenu.add(turnColour); colourMenu.add(buriedColour); colourMenu.add(nucleotideColour); + colourMenu.add(purinePyrimidineColour); + // colourMenu.add(covariationColour); + colourMenu.add(tcoffeeColour); colourMenu.add(userDefinedColour); colourMenu.addSeparator(); colourMenu.add(conservationMenuItem); @@ -1691,6 +1908,7 @@ public class GAlignFrame extends JInternalFrame colourMenu.add(abovePIDThreshold); colourMenu.add(modifyPID); colourMenu.add(annotationColour); + colourMenu.add(rnahelicesColour); calculateMenu.add(sort); calculateMenu.add(calculateTree); calculateMenu.addSeparator(); @@ -1700,9 +1918,10 @@ public class GAlignFrame extends JInternalFrame calculateMenu.add(showTranslation); calculateMenu.add(showProducts); calculateMenu.add(autoCalculate); + calculateMenu.add(sortByTree); calculateMenu.addSeparator(); calculateMenu.add(extractScores); - webServiceNoServices = new JMenuItem(""); + webServiceNoServices = new JMenuItem(MessageManager.getString("label.no_services")); webService.add(webServiceNoServices); pasteMenu.add(pasteNew); pasteMenu.add(pasteThis); @@ -1726,8 +1945,12 @@ public class GAlignFrame extends JInternalFrame this.getContentPane().add(tabbedPane, java.awt.BorderLayout.CENTER); jMenu3.add(showAllColumns); jMenu3.add(showAllSeqs); + jMenu3.add(showAllhidden); hideMenu.add(hideSelColumns); hideMenu.add(hideSelSequences); + hideMenu.add(hideAllSelection); + hideMenu.add(hideAllButSelection); + formatMenu.add(font); formatMenu.addSeparator(); formatMenu.add(wrapMenuItem); @@ -1742,94 +1965,130 @@ public class GAlignFrame extends JInternalFrame formatMenu.add(colourTextMenuItem); formatMenu.add(renderGapsMenuItem); formatMenu.add(centreColumnLabelsMenuItem); - formatMenu.add(showUnconservedMenuItem); + formatMenu.add(showNonconservedMenuItem); selectMenu.add(findMenuItem); selectMenu.addSeparator(); selectMenu.add(selectAllSequenceMenuItem); selectMenu.add(deselectAllSequenceMenuItem); selectMenu.add(invertSequenceMenuItem); selectMenu.add(invertColSel); - selectMenu.add(deleteGroups); + selectMenu.add(createGroup); + selectMenu.add(unGroup); selectMenu.add(grpsFromSelection); + selectMenu.add(deleteGroups); + // TODO - determine if the listenToViewSelections button is needed : see bug + // JAL-574 + // selectMenu.addSeparator(); + // selectMenu.add(listenToViewSelections); + } + + protected void normaliseSequenceLogo_actionPerformed(ActionEvent e) + { + // TODO Auto-generated method stub + + } + + protected void listenToViewSelections_actionPerformed(ActionEvent e) + { + // TODO Auto-generated method stub + + } + + protected void showAllhidden_actionPerformed(ActionEvent e) + { + // TODO Auto-generated method stub + + } + + protected void hideAllButSelection_actionPerformed(ActionEvent e) + { + // TODO Auto-generated method stub + + } + + protected void hideAllSelection_actionPerformed(ActionEvent e) + { + // TODO Auto-generated method stub + } protected void applyAutoAnnotationSettings_actionPerformed(ActionEvent e) { // TODO Auto-generated method stub - + } protected void showConsensusHistogram_actionPerformed(ActionEvent e) { // TODO Auto-generated method stub - + } - protected void showConsensusProfile_actionPerformed(ActionEvent e) + protected void showSequenceLogo_actionPerformed(ActionEvent e) { // TODO Auto-generated method stub - + } protected void makeGrpsFromSelection_actionPerformed(ActionEvent e) { // TODO Auto-generated method stub - + } protected void showGroupConsensus_actionPerformed(ActionEvent e) { // TODO Auto-generated method stub - + } protected void showGroupConservation_actionPerformed(ActionEvent e) { // TODO Auto-generated method stub - + } protected void showUnconservedMenuItem_actionPerformed(ActionEvent e) { // TODO Auto-generated method stub - + } protected void showSeqFeaturesHeight_actionPerformed( ActionEvent actionEvent) { // TODO Auto-generated method stub - + } protected void justifyRightMenuItem_actionPerformed(ActionEvent e) { // TODO Auto-generated method stub - + } protected void justifyLeftMenuItem_actionPerformed(ActionEvent e) { // TODO Auto-generated method stub - + } protected void followHighlight_actionPerformed() { // TODO Auto-generated method stub - + } protected void showNpFeats_actionPerformed(ActionEvent e) { // TODO Auto-generated method stub - + } protected void showDbRefs_actionPerformed(ActionEvent e) { // TODO Auto-generated method stub - + } protected void centreColumnLabels_actionPerformed(ActionEvent e) @@ -2033,6 +2292,14 @@ public class GAlignFrame extends JInternalFrame { } + protected void purinePyrimidineColour_actionPerformed(ActionEvent e) + { + } + + /* + * protected void covariationColour_actionPerformed(ActionEvent e) { } + */ + protected void noColourmenuItem_actionPerformed(ActionEvent e) { } @@ -2068,6 +2335,14 @@ public class GAlignFrame extends JInternalFrame protected void deleteGroups_actionPerformed(ActionEvent e) { } + + protected void createGroup_actionPerformed(ActionEvent e) + { + } + + protected void unGroup_actionPerformed(ActionEvent e) + { + } protected void copy_actionPerformed(ActionEvent e) { @@ -2116,6 +2391,33 @@ public class GAlignFrame extends JInternalFrame protected void LoadtreeMenuItem_actionPerformed(ActionEvent e) { + + } + + /** + * Template method to handle the 'load T-Coffee scores' menu event. + *

+ * Subclasses override this method to provide a custom action. + * + * @param event + * The raised event + */ + protected void loadScores_actionPerformed(ActionEvent event) + { + + } + + /** + * Template method to handle the 'Color T-Coffee scores' menu event. + *

+ * Subclasses override this method to provide a custom action. + * + * @param event + * The raised event + */ + protected void tcoffeeColorScheme_actionPerformed(ActionEvent event) + { + } protected void jpred_actionPerformed(ActionEvent e) @@ -2185,6 +2487,11 @@ public class GAlignFrame extends JInternalFrame } + public void rnahelicesColour_actionPerformed(ActionEvent e) + { + + } + public void associatedData_actionPerformed(ActionEvent e) { @@ -2195,6 +2502,11 @@ public class GAlignFrame extends JInternalFrame } + public void sortByTreeOption_actionPerformed(ActionEvent e) + { + + } + public void showAllSeqs_actionPerformed(ActionEvent e) {