X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGAlignFrame.java;h=6e98f744519b3ce987169e7bcaec8d1072fc429e;hb=9eff2c2a7aeb98617fb6e55179f53c66ac1ecd82;hp=ee6ba9f27196f5483a8ec65e5d2b0028f7edbdee;hpb=5d16133e9f3ddee070b9998fdb55bc13e6b4266d;p=jalview.git diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java index ee6ba9f..6e98f74 100755 --- a/src/jalview/jbgui/GAlignFrame.java +++ b/src/jalview/jbgui/GAlignFrame.java @@ -1,5 +1,5 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1) + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1) * Copyright (C) 2014 The Jalview Authors * * This file is part of Jalview. @@ -242,6 +242,8 @@ public class GAlignFrame extends JInternalFrame protected JMenuItem showTranslation = new JMenuItem(); protected JMenuItem extractScores = new JMenuItem(); + + protected JMenuItem expandAlignment = new JMenuItem(); protected JMenu showProducts = new JMenu(); @@ -630,7 +632,15 @@ public class GAlignFrame extends JInternalFrame makeGrpsFromSelection_actionPerformed(e); } }); - + expandAlignment.setText(MessageManager.getString("action.view_flanking_regions")); + expandAlignment.setToolTipText(MessageManager.getString("label.view_flanking_regions")); + expandAlignment.addActionListener(new java.awt.event.ActionListener() { + @Override + public void actionPerformed(ActionEvent e) + { + expand_newalign(e); + } + }); remove2LeftMenuItem.setText(MessageManager.getString("action.remove_left")); remove2LeftMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_L, Toolkit.getDefaultToolkit() @@ -865,7 +875,7 @@ public class GAlignFrame extends JInternalFrame strandColour_actionPerformed(e); } }); - turnColour.setText(MessageManager.getString("Turn Propensity")); + turnColour.setText(MessageManager.getString("label.turn_propensity")); turnColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -873,7 +883,7 @@ public class GAlignFrame extends JInternalFrame turnColour_actionPerformed(e); } }); - buriedColour.setText(MessageManager.getString("Buried Index")); + buriedColour.setText(MessageManager.getString("label.buried_index")); buriedColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1930,10 +1940,6 @@ public class GAlignFrame extends JInternalFrame sort.add(sortGroupMenuItem); sort.add(sortPairwiseMenuItem); sort.add(sortByTreeMenu); - calculateTree.add(averageDistanceTreeMenuItem); - calculateTree.add(neighbourTreeMenuItem); - calculateTree.add(avDistanceTreeBlosumMenuItem); - calculateTree.add(njTreeBlosumMenuItem); jMenu2.add(htmlMenuItem); jMenu2.add(epsFile); jMenu2.add(createPNG); @@ -1976,6 +1982,7 @@ public class GAlignFrame extends JInternalFrame selectMenu.add(unGroup); selectMenu.add(grpsFromSelection); selectMenu.add(deleteGroups); + calculateMenu.add(expandAlignment); // TODO - determine if the listenToViewSelections button is needed : see bug // JAL-574 // selectMenu.addSeparator(); @@ -2616,4 +2623,10 @@ public class GAlignFrame extends JInternalFrame { } + + protected void expand_newalign(ActionEvent e) + { + // TODO Auto-generated method stub + + } }