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
JAL-934 - refactor to use label font functions
[jalview.git]
/
src
/
jalview
/
gui
/
ViewSelectionMenu.java
diff --git
a/src/jalview/gui/ViewSelectionMenu.java
b/src/jalview/gui/ViewSelectionMenu.java
index
b3ac405
..
c5433e5
100644
(file)
--- a/
src/jalview/gui/ViewSelectionMenu.java
+++ b/
src/jalview/gui/ViewSelectionMenu.java
@@
-20,6
+20,8
@@
import javax.swing.event.MenuListener;
* dialog/menu which allows the user to select/deselect specific views from a
* list of associated views.
*
* dialog/menu which allows the user to select/deselect specific views from a
* list of associated views.
*
+ * Includes patches related to JAL-641
+ *
* @author JimP
*
*/
* @author JimP
*
*/
@@
-119,9
+121,10
@@
public class ViewSelectionMenu extends JMenu
}
if (allviews.length >= 2)
{
}
if (allviews.length >= 2)
{
-
+ // ensure we update menu state to reflect external selection list state
+ append = append || _selectedviews.size()>1;
toggleview = new JCheckBoxMenuItem("Select many views",append);
toggleview = new JCheckBoxMenuItem("Select many views",append);
- toggleview.setToolTipText("When selected, toggles whether a particular view is used to colour the alignment.");
+ toggleview.setToolTipText("When enabled, allows many views to be selected.");
toggleview.addItemListener(new ItemListener() {
@Override
toggleview.addItemListener(new ItemListener() {
@Override
@@
-199,14
+202,19
@@
public class ViewSelectionMenu extends JMenu
{
if (append)
{
{
if (append)
{
- if (e.getStateChange() == e.SELECTED)
+ enabled=false;
+ // toggle the inclusion state
+ if (_selectedviews.indexOf(p)==-1)
{
_selectedviews.add(p);
{
_selectedviews.add(p);
+ a.setSelected(true);
}
else
{
_selectedviews.remove(p);
}
else
{
_selectedviews.remove(p);
+ a.setSelected(false);
}
}
+ enabled=true;
_handler.itemStateChanged(e);
}
else
_handler.itemStateChanged(e);
}
else