git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
random ';'
[jalview.git]
/
src
/
jalview
/
gui
/
PopupMenu.java
diff --git
a/src/jalview/gui/PopupMenu.java
b/src/jalview/gui/PopupMenu.java
index
5292de9
..
21be086
100755
(executable)
--- a/
src/jalview/gui/PopupMenu.java
+++ b/
src/jalview/gui/PopupMenu.java
@@
-81,6
+81,8
@@
public class PopupMenu extends JPopupMenu
JMenuItem discoverPDB = new JMenuItem();
\r
JMenu outputMenu = new JMenu();
\r
JMenuItem sequenceFeature = new JMenuItem();
\r
JMenuItem discoverPDB = new JMenuItem();
\r
JMenu outputMenu = new JMenu();
\r
JMenuItem sequenceFeature = new JMenuItem();
\r
+ JMenuItem textColour = new JMenuItem();
\r
+ JMenu jMenu1 = new JMenu();
\r
\r
/**
\r
* Creates a new PopupMenu object.
\r
\r
/**
\r
* Creates a new PopupMenu object.
\r
@@
-510,23
+512,25
@@
public class PopupMenu extends JPopupMenu
sequenceFeature_actionPerformed(e);
\r
}
\r
});
\r
sequenceFeature_actionPerformed(e);
\r
}
\r
});
\r
+ textColour.setText("Text Colour");
\r
+ textColour.addActionListener(new ActionListener()
\r
+ {
\r
+ public void actionPerformed(ActionEvent e)
\r
+ {
\r
+ textColour_actionPerformed(e);
\r
+ }
\r
+ });
\r
+ jMenu1.setText("Group");
\r
add(groupMenu);
\r
\r
add(sequenceMenu);
\r
groupMenu.add(editMenu);
\r
groupMenu.add(outputMenu);
\r
add(groupMenu);
\r
\r
add(sequenceMenu);
\r
groupMenu.add(editMenu);
\r
groupMenu.add(outputMenu);
\r
- groupMenu.addSeparator();
\r
groupMenu.add(sequenceFeature);
\r
groupMenu.add(sequenceFeature);
\r
- groupMenu.addSeparator();
\r
- groupMenu.add(groupName);
\r
- groupMenu.add(unGroupMenuItem);
\r
- groupMenu.add(colourMenu);
\r
- groupMenu.add(showBoxes);
\r
- groupMenu.add(showText);
\r
- groupMenu.add(showColourText);
\r
- groupMenu.add(outline);
\r
+ groupMenu.add(jMenu1);
\r
sequenceMenu.add(sequenceName);
\r
sequenceMenu.add(pdbMenu);
\r
sequenceMenu.add(sequenceName);
\r
sequenceMenu.add(pdbMenu);
\r
+ colourMenu.add(textColour);
\r
colourMenu.add(noColourmenuItem);
\r
colourMenu.add(clustalColour);
\r
colourMenu.add(BLOSUM62Colour);
\r
colourMenu.add(noColourmenuItem);
\r
colourMenu.add(clustalColour);
\r
colourMenu.add(BLOSUM62Colour);
\r
@@
-573,6
+577,13
@@
public class PopupMenu extends JPopupMenu
pdbMenu.add(pdbFromFile);
\r
pdbMenu.add(enterPDB);
\r
pdbMenu.add(discoverPDB);
\r
pdbMenu.add(pdbFromFile);
\r
pdbMenu.add(enterPDB);
\r
pdbMenu.add(discoverPDB);
\r
+ jMenu1.add(groupName);
\r
+ jMenu1.add(unGroupMenuItem);
\r
+ jMenu1.add(colourMenu);
\r
+ jMenu1.add(showBoxes);
\r
+ jMenu1.add(showText);
\r
+ jMenu1.add(showColourText);
\r
+ jMenu1.add(outline);
\r
noColourmenuItem.setText("None");
\r
noColourmenuItem.addActionListener(new java.awt.event.ActionListener()
\r
{
\r
noColourmenuItem.setText("None");
\r
noColourmenuItem.addActionListener(new java.awt.event.ActionListener()
\r
{
\r
@@
-1344,4
+1355,11
@@
public class PopupMenu extends JPopupMenu
ap.highlightSearchResults(null);
\r
}
\r
}
\r
ap.highlightSearchResults(null);
\r
}
\r
}
\r
+
\r
+ public void textColour_actionPerformed(ActionEvent e)
\r
+ {
\r
+ SequenceGroup sg = getGroup();
\r
+ if (sg != null)
\r
+ new TextColourChooser().chooseColour(ap, sg);
\r
+ }
\r
}
\r
}
\r