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
Merge branch 'JAL-1139_proguard' into develop
[jalview.git]
/
src
/
jalview
/
gui
/
PopupMenu.java
diff --git
a/src/jalview/gui/PopupMenu.java
b/src/jalview/gui/PopupMenu.java
index
9c5a222
..
037f007
100644
(file)
--- a/
src/jalview/gui/PopupMenu.java
+++ b/
src/jalview/gui/PopupMenu.java
@@
-90,7
+90,7
@@
public class PopupMenu extends JPopupMenu
JMenuItem sequenceSelDetails = new JMenuItem();
SequenceI sequence;
JMenuItem sequenceSelDetails = new JMenuItem();
SequenceI sequence;
-
+ JMenuItem createGroupMenuItem = new JMenuItem();
JMenuItem unGroupMenuItem = new JMenuItem();
JMenuItem outline = new JMenuItem();
JMenuItem unGroupMenuItem = new JMenuItem();
JMenuItem outline = new JMenuItem();
@@
-411,9
+411,10
@@
public class PopupMenu extends JPopupMenu
}
SequenceGroup sg = ap.av.getSelectionGroup();
}
SequenceGroup sg = ap.av.getSelectionGroup();
+ boolean isDefinedGroup = (sg!=null) ? ap.av.getAlignment().getGroups().contains(sg) : false;
if (sg != null && sg.getSize() > 0)
if (sg != null && sg.getSize() > 0)
- {
+ {
groupName.setText("Name: " + sg.getName());
groupName.setText("Edit name and description of current group.");
groupName.setText("Name: " + sg.getName());
groupName.setText("Edit name and description of current group.");
@@
-541,9
+542,15
@@
public class PopupMenu extends JPopupMenu
editMenu.setVisible(false);
}
editMenu.setVisible(false);
}
- if (!ap.av.getAlignment().getGroups().contains(sg))
+ if (!isDefinedGroup)
{
{
+ createGroupMenuItem.setVisible(true);
unGroupMenuItem.setVisible(false);
unGroupMenuItem.setVisible(false);
+ jMenu1.setText("Edit New Group");
+ } else {
+ createGroupMenuItem.setVisible(false);
+ unGroupMenuItem.setVisible(true);
+ jMenu1.setText("Edit Group");
}
if (seq == null)
}
if (seq == null)
@@
-956,6
+963,14
@@
public class PopupMenu extends JPopupMenu
unGroupMenuItem_actionPerformed();
}
});
unGroupMenuItem_actionPerformed();
}
});
+ createGroupMenuItem.setText("Create Group");
+ createGroupMenuItem.addActionListener(new java.awt.event.ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ createGroupMenuItem_actionPerformed();
+ }
+ });
outline.setText("Border colour");
outline.addActionListener(new java.awt.event.ActionListener()
outline.setText("Border colour");
outline.addActionListener(new java.awt.event.ActionListener()
@@
-1144,6
+1159,8
@@
public class PopupMenu extends JPopupMenu
groupMenu.add(editMenu);
groupMenu.add(outputMenu);
groupMenu.add(sequenceFeature);
groupMenu.add(editMenu);
groupMenu.add(outputMenu);
groupMenu.add(sequenceFeature);
+ groupMenu.add(createGroupMenuItem);
+ groupMenu.add(unGroupMenuItem);
groupMenu.add(jMenu1);
sequenceMenu.add(sequenceName);
sequenceMenu.add(sequenceDetails);
groupMenu.add(jMenu1);
sequenceMenu.add(sequenceName);
sequenceMenu.add(sequenceDetails);
@@
-1204,7
+1221,6
@@
public class PopupMenu extends JPopupMenu
pdbMenu.add(enterPDB);
pdbMenu.add(discoverPDB);
jMenu1.add(groupName);
pdbMenu.add(enterPDB);
pdbMenu.add(discoverPDB);
jMenu1.add(groupName);
- jMenu1.add(unGroupMenuItem);
jMenu1.add(colourMenu);
jMenu1.add(showBoxes);
jMenu1.add(showText);
jMenu1.add(colourMenu);
jMenu1.add(showBoxes);
jMenu1.add(showText);
@@
-1680,7
+1696,7
@@
public class PopupMenu extends JPopupMenu
sequence.getAnnotation()[0], null,
AnnotationColourGradient.NO_THRESHOLD);
sequence.getAnnotation()[0], null,
AnnotationColourGradient.NO_THRESHOLD);
- acg.predefinedColours = true;
+ acg.setPredefinedColours(true);
sg.cs = acg;
refresh();
sg.cs = acg;
refresh();
@@
-1780,6
+1796,11
@@
public class PopupMenu extends JPopupMenu
ap.av.setSelectionGroup(null);
refresh();
}
ap.av.setSelectionGroup(null);
refresh();
}
+ void createGroupMenuItem_actionPerformed()
+ {
+ getGroup(); // implicitly creates group - note - should apply defaults / use standard alignment window logic for this
+ refresh();
+ }
/**
* DOCUMENT ME!
/**
* DOCUMENT ME!