git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
43e7133
)
Menu names changed
author
amwaterhouse
<Andrew Waterhouse>
Thu, 28 Apr 2005 15:30:28 +0000
(15:30 +0000)
committer
amwaterhouse
<Andrew Waterhouse>
Thu, 28 Apr 2005 15:30:28 +0000
(15:30 +0000)
src/jalview/gui/PopupMenu.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/PopupMenu.java
b/src/jalview/gui/PopupMenu.java
index
398294b
..
3177bfc
100755
(executable)
--- a/
src/jalview/gui/PopupMenu.java
+++ b/
src/jalview/gui/PopupMenu.java
@@
-42,6
+42,7
@@
public class PopupMenu extends JPopupMenu
JMenuItem unGroupMenuItem = new JMenuItem();
\r
JMenuItem pdbMenuItem = new JMenuItem();
\r
JMenuItem outline = new JMenuItem();
\r
JMenuItem unGroupMenuItem = new JMenuItem();
\r
JMenuItem pdbMenuItem = new JMenuItem();
\r
JMenuItem outline = new JMenuItem();
\r
+ JRadioButtonMenuItem nucleotideMenuItem = new JRadioButtonMenuItem();
\r
\r
public PopupMenu(AlignmentPanel ap, Sequence seq)
\r
{
\r
\r
public PopupMenu(AlignmentPanel ap, Sequence seq)
\r
{
\r
@@
-182,6
+183,14
@@
public class PopupMenu extends JPopupMenu
outline_actionPerformed(e);
\r
}
\r
});
\r
outline_actionPerformed(e);
\r
}
\r
});
\r
+ nucleotideMenuItem.setText("Nucleotide");
\r
+ nucleotideMenuItem.addActionListener(new ActionListener()
\r
+ {
\r
+ public void actionPerformed(ActionEvent e)
\r
+ {
\r
+ nucleotideMenuItem_actionPerformed(e);
\r
+ }
\r
+ });
\r
add(groupMenu);
\r
this.add(sequenceMenu);
\r
this.add(residueMenu);
\r
add(groupMenu);
\r
this.add(sequenceMenu);
\r
this.add(residueMenu);
\r
@@
-196,6
+205,9
@@
public class PopupMenu extends JPopupMenu
defineMenu.addSeparator();
\r
defineMenu.add(noColourmenuItem);
\r
defineMenu.add(clustalColour);
\r
defineMenu.addSeparator();
\r
defineMenu.add(noColourmenuItem);
\r
defineMenu.add(clustalColour);
\r
+ defineMenu.add(BLOSUM62Colour);
\r
+ defineMenu.add(PIDColour);
\r
+
\r
defineMenu.add(zappoColour);
\r
defineMenu.add(taylorColour);
\r
defineMenu.add(hydrophobicityColour);
\r
defineMenu.add(zappoColour);
\r
defineMenu.add(taylorColour);
\r
defineMenu.add(hydrophobicityColour);
\r
@@
-203,9
+215,10
@@
public class PopupMenu extends JPopupMenu
defineMenu.add(strandColour);
\r
defineMenu.add(turnColour);
\r
defineMenu.add(buriedColour);
\r
defineMenu.add(strandColour);
\r
defineMenu.add(turnColour);
\r
defineMenu.add(buriedColour);
\r
+ defineMenu.add(nucleotideMenuItem);
\r
+
\r
defineMenu.add(userDefinedColour);
\r
defineMenu.add(userDefinedColour);
\r
- defineMenu.add(PIDColour);
\r
- defineMenu.add(BLOSUM62Colour);
\r
+
\r
defineMenu.addSeparator();
\r
defineMenu.add(abovePIDColour);
\r
defineMenu.add(conservationMenuItem);
\r
defineMenu.addSeparator();
\r
defineMenu.add(abovePIDColour);
\r
defineMenu.add(conservationMenuItem);
\r
@@
-231,7
+244,7
@@
public class PopupMenu extends JPopupMenu
clustalColour_actionPerformed(e);
\r
}
\r
});
\r
clustalColour_actionPerformed(e);
\r
}
\r
});
\r
- zappoColour.setText("Zappo colour scheme");
\r
+ zappoColour.setText("Zappo");
\r
zappoColour.addActionListener(new java.awt.event.ActionListener()
\r
{
\r
public void actionPerformed(ActionEvent e)
\r
zappoColour.addActionListener(new java.awt.event.ActionListener()
\r
{
\r
public void actionPerformed(ActionEvent e)
\r
@@
-239,7
+252,7
@@
public class PopupMenu extends JPopupMenu
zappoColour_actionPerformed(e);
\r
}
\r
});
\r
zappoColour_actionPerformed(e);
\r
}
\r
});
\r
- taylorColour.setText("Taylor colour scheme");
\r
+ taylorColour.setText("Taylor");
\r
taylorColour.addActionListener(new java.awt.event.ActionListener()
\r
{
\r
public void actionPerformed(ActionEvent e)
\r
taylorColour.addActionListener(new java.awt.event.ActionListener()
\r
{
\r
public void actionPerformed(ActionEvent e)
\r
@@
-247,7
+260,7
@@
public class PopupMenu extends JPopupMenu
taylorColour_actionPerformed(e);
\r
}
\r
});
\r
taylorColour_actionPerformed(e);
\r
}
\r
});
\r
- hydrophobicityColour.setText("By hydrophobicity");
\r
+ hydrophobicityColour.setText("Hydrophobicity");
\r
hydrophobicityColour.addActionListener(new java.awt.event.ActionListener()
\r
{
\r
public void actionPerformed(ActionEvent e)
\r
hydrophobicityColour.addActionListener(new java.awt.event.ActionListener()
\r
{
\r
public void actionPerformed(ActionEvent e)
\r
@@
-279,7
+292,7
@@
public class PopupMenu extends JPopupMenu
turnColour_actionPerformed(e);
\r
}
\r
});
\r
turnColour_actionPerformed(e);
\r
}
\r
});
\r
- buriedColour.setText("Buried index");
\r
+ buriedColour.setText("Buried Index");
\r
buriedColour.addActionListener(new java.awt.event.ActionListener()
\r
{
\r
public void actionPerformed(ActionEvent e)
\r
buriedColour.addActionListener(new java.awt.event.ActionListener()
\r
{
\r
public void actionPerformed(ActionEvent e)
\r
@@
-287,7
+300,7
@@
public class PopupMenu extends JPopupMenu
buriedColour_actionPerformed(e);
\r
}
\r
});
\r
buriedColour_actionPerformed(e);
\r
}
\r
});
\r
- abovePIDColour.setText("Above PID threshold only");
\r
+ abovePIDColour.setText("Above % Identity");
\r
abovePIDColour.addActionListener(new java.awt.event.ActionListener()
\r
{
\r
public void actionPerformed(ActionEvent e)
\r
abovePIDColour.addActionListener(new java.awt.event.ActionListener()
\r
{
\r
public void actionPerformed(ActionEvent e)
\r
@@
-295,7
+308,7
@@
public class PopupMenu extends JPopupMenu
abovePIDColour_actionPerformed(e);
\r
}
\r
});
\r
abovePIDColour_actionPerformed(e);
\r
}
\r
});
\r
- userDefinedColour.setText("User defined colours");
\r
+ userDefinedColour.setText("User Defined");
\r
userDefinedColour.addActionListener(new java.awt.event.ActionListener()
\r
{
\r
public void actionPerformed(ActionEvent e)
\r
userDefinedColour.addActionListener(new java.awt.event.ActionListener()
\r
{
\r
public void actionPerformed(ActionEvent e)
\r
@@
-311,7
+324,7
@@
public class PopupMenu extends JPopupMenu
PIDColour_actionPerformed(e);
\r
}
\r
});
\r
PIDColour_actionPerformed(e);
\r
}
\r
});
\r
- BLOSUM62Colour.setText("BLOSUM62 score");
\r
+ BLOSUM62Colour.setText("BLOSUM62");
\r
BLOSUM62Colour.addActionListener(new java.awt.event.ActionListener()
\r
{
\r
public void actionPerformed(ActionEvent e)
\r
BLOSUM62Colour.addActionListener(new java.awt.event.ActionListener()
\r
{
\r
public void actionPerformed(ActionEvent e)
\r
@@
-319,7
+332,7
@@
public class PopupMenu extends JPopupMenu
BLOSUM62Colour_actionPerformed(e);
\r
}
\r
});
\r
BLOSUM62Colour_actionPerformed(e);
\r
}
\r
});
\r
- conservationMenuItem.setText("By conservation");
\r
+ conservationMenuItem.setText("Conservation");
\r
conservationMenuItem.addActionListener(new java.awt.event.ActionListener()
\r
{
\r
public void actionPerformed(ActionEvent e)
\r
conservationMenuItem.addActionListener(new java.awt.event.ActionListener()
\r
{
\r
public void actionPerformed(ActionEvent e)
\r
@@
-392,6
+405,13
@@
public class PopupMenu extends JPopupMenu
refresh();
\r
}
\r
\r
refresh();
\r
}
\r
\r
+ public void nucleotideMenuItem_actionPerformed(ActionEvent e)
\r
+ {
\r
+ getGroup().cs = new NucleotideColourScheme();
\r
+ refresh();
\r
+ }
\r
+
\r
+
\r
\r
protected void abovePIDColour_actionPerformed(ActionEvent e)
\r
{
\r
\r
protected void abovePIDColour_actionPerformed(ActionEvent e)
\r
{
\r
@@
-424,14
+444,7
@@
public class PopupMenu extends JPopupMenu
\r
protected void userDefinedColour_actionPerformed(ActionEvent e)
\r
{
\r
\r
protected void userDefinedColour_actionPerformed(ActionEvent e)
\r
{
\r
- JInternalFrame frame = new JInternalFrame();
\r
- UserDefinedColours chooser = new UserDefinedColours( frame, ap, getGroup());
\r
- frame.setContentPane(chooser);
\r
- Desktop.addInternalFrame(frame,"User defined colours ("+getGroup().getName()+")", 450,540 );
\r
- frame.setResizable(false);
\r
- frame.setIconifiable(false);
\r
- frame.setMaximizable(false);
\r
-
\r
+ UserDefinedColours chooser = new UserDefinedColours( ap, getGroup());
\r
}
\r
\r
protected void PIDColour_actionPerformed(ActionEvent e)
\r
}
\r
\r
protected void PIDColour_actionPerformed(ActionEvent e)
\r