From: amwaterhouse Date: Tue, 14 Dec 2004 17:35:27 +0000 (+0000) Subject: Enable PID menuitem X-Git-Tag: Release_2_0~823 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=692329a18017d315e6b21f8049d846fc0bbacffe;p=jalview.git Enable PID menuitem --- diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java index a4ec5cc..be879ee 100755 --- a/src/jalview/jbgui/GAlignFrame.java +++ b/src/jalview/jbgui/GAlignFrame.java @@ -61,7 +61,6 @@ public class GAlignFrame extends JInternalFrame protected JRadioButtonMenuItem strandColour = new JRadioButtonMenuItem(); protected JRadioButtonMenuItem turnColour = new JRadioButtonMenuItem(); protected JRadioButtonMenuItem buriedColour = new JRadioButtonMenuItem(); - protected JRadioButtonMenuItem abovePIDColour = new JRadioButtonMenuItem(); protected JRadioButtonMenuItem userDefinedColour = new JRadioButtonMenuItem(); protected JRadioButtonMenuItem PIDColour = new JRadioButtonMenuItem(); protected JRadioButtonMenuItem BLOSUM62Colour = new JRadioButtonMenuItem(); @@ -84,6 +83,7 @@ public class GAlignFrame extends JInternalFrame JMenuItem findMenuItem = new JMenuItem(); JMenu searchMenu = new JMenu(); protected JCheckBoxMenuItem modifyAlignmentMenuItem = new JCheckBoxMenuItem(); + JCheckBoxMenuItem abovePIDThreshold = new JCheckBoxMenuItem(); public GAlignFrame() { try @@ -132,7 +132,6 @@ public class GAlignFrame extends JInternalFrame colours.add(strandColour); colours.add(turnColour); colours.add(buriedColour); - colours.add(abovePIDColour); colours.add(userDefinedColour); colours.add(PIDColour); colours.add(BLOSUM62Colour); @@ -441,15 +440,6 @@ public class GAlignFrame extends JInternalFrame buriedColour_actionPerformed(e); } }); - abovePIDColour.setEnabled(false); - abovePIDColour.setText("Above PID threshold only"); - abovePIDColour.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - abovePIDColour_actionPerformed(e); - } - }); userDefinedColour.setText("User defined colours"); userDefinedColour.addActionListener(new java.awt.event.ActionListener() { @@ -458,7 +448,6 @@ public class GAlignFrame extends JInternalFrame userDefinedColour_actionPerformed(e); } }); - PIDColour.setEnabled(false); PIDColour.setText("By PID"); PIDColour.addActionListener(new java.awt.event.ActionListener() { @@ -630,6 +619,8 @@ public class GAlignFrame extends JInternalFrame modifyAlignmentMenuItem_actionPerformed(e); } }); + abovePIDThreshold.setEnabled(false); + abovePIDThreshold.setText("Above PID threshold"); alignFrameMenuBar.add(fileMenu); alignFrameMenuBar.add(editMenu); alignFrameMenuBar.add(searchMenu); @@ -683,11 +674,12 @@ public class GAlignFrame extends JInternalFrame colourMenu.add(turnColour); colourMenu.add(buriedColour); colourMenu.add(userDefinedColour); - colourMenu.addSeparator(); + colourMenu.add(abovePIDThreshold); + colourMenu.addSeparator(); colourMenu.add(conservationMenuItem); colourMenu.add(conservationColourIncMenuItem); colourMenu.addSeparator(); - colourMenu.add(abovePIDColour); + colourMenu.add(PIDColour); colourMenu.add(BLOSUM62Colour); colourMenu.addSeparator(); @@ -965,10 +957,6 @@ public class GAlignFrame extends JInternalFrame } - protected void abovePIDColour_actionPerformed(ActionEvent e) - { - - } protected void userDefinedColour_actionPerformed(ActionEvent e)