X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGAlignFrame.java;h=6253e36d4b4b434eec97d3ae53c8edb3e0f35e04;hb=a45774ee31d9f35d4eff46d54d7deab719afb092;hp=067b3d2fd3348a09305202d9e9207c6833ec7aab;hpb=75dafd4638a0bdbff996aa60deee030e8d55f68a;p=jalview.git
diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index 067b3d2..6253e36 100755
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@ -1,6 +1,6 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
*
* This file is part of Jalview.
*
@@ -121,7 +121,7 @@ public class GAlignFrame extends JInternalFrame
public JCheckBoxMenuItem colourTextMenuItem = new JCheckBoxMenuItem();
- public JCheckBoxMenuItem showUnconservedMenuItem = new JCheckBoxMenuItem();
+ public JCheckBoxMenuItem showNonconservedMenuItem = new JCheckBoxMenuItem();
JMenuItem htmlMenuItem = new JMenuItem();
@@ -221,6 +221,10 @@ public class GAlignFrame extends JInternalFrame
protected JCheckBoxMenuItem autoCalculate = new JCheckBoxMenuItem();
+ protected JCheckBoxMenuItem sortByTree = new JCheckBoxMenuItem();
+
+ protected JCheckBoxMenuItem listenToViewSelections = new JCheckBoxMenuItem();
+
JMenu addSequenceMenu = new JMenu();
JMenuItem addFromFile = new JMenuItem();
@@ -363,8 +367,7 @@ public class GAlignFrame extends JInternalFrame
if (evt.isControlDown()
|| SwingUtilities.isRightMouseButton(evt))
{
- radioItem
- .removeActionListener(radioItem.getActionListeners()[0]);
+ radioItem.removeActionListener(radioItem.getActionListeners()[0]);
int option = JOptionPane.showInternalConfirmDialog(
jalview.gui.Desktop.desktop,
@@ -430,9 +433,6 @@ public class GAlignFrame extends JInternalFrame
switch (index)
{
- case ColourSchemeProperty.NONE:
- noColourmenuItem.setSelected(true);
- break;
case ColourSchemeProperty.CLUSTAL:
clustalColour.setSelected(true);
@@ -491,6 +491,11 @@ public class GAlignFrame extends JInternalFrame
userDefinedColour.setSelected(true);
break;
+ case ColourSchemeProperty.NONE:
+ default:
+ noColourmenuItem.setSelected(true);
+ break;
+
}
}
@@ -656,9 +661,9 @@ public class GAlignFrame extends JInternalFrame
viewTextMenuItem_actionPerformed(e);
}
});
- showUnconservedMenuItem.setText("Show Unconserved");
- showUnconservedMenuItem.setState(false);
- showUnconservedMenuItem
+ showNonconservedMenuItem.setText("Show nonconserved");
+ showNonconservedMenuItem.setState(false);
+ showNonconservedMenuItem
.addActionListener(new java.awt.event.ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -1402,6 +1407,29 @@ public class GAlignFrame extends JInternalFrame
autoCalculate_actionPerformed(e);
}
});
+ sortByTree.setText("Sort Alignment With New Tree");
+ sortByTree.setToolTipText("Enable this to automatically sort
the alignment when you open
a new tree.");
+ sortByTree.setState(jalview.bin.Cache.getDefault(
+ "SORT_BY_TREE", false));
+ sortByTree.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ sortByTreeOption_actionPerformed(e);
+ }
+ });
+
+ listenToViewSelections.setText("Listen for selections");
+ listenToViewSelections.setToolTipText("When selected, selections in this view will mirror
selections made on the same sequences in other views.");
+ listenToViewSelections.setState(false);
+ listenToViewSelections.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ listenToViewSelections_actionPerformed(e);
+ }
+ });
+
addSequenceMenu.setText("Add Sequences");
addFromFile.setText("From File");
addFromFile.addActionListener(new ActionListener()
@@ -1748,6 +1776,7 @@ public class GAlignFrame extends JInternalFrame
calculateMenu.add(showTranslation);
calculateMenu.add(showProducts);
calculateMenu.add(autoCalculate);
+ calculateMenu.add(sortByTree);
calculateMenu.addSeparator();
calculateMenu.add(extractScores);
webServiceNoServices = new JMenuItem("");
@@ -1794,7 +1823,7 @@ public class GAlignFrame extends JInternalFrame
formatMenu.add(colourTextMenuItem);
formatMenu.add(renderGapsMenuItem);
formatMenu.add(centreColumnLabelsMenuItem);
- formatMenu.add(showUnconservedMenuItem);
+ formatMenu.add(showNonconservedMenuItem);
selectMenu.add(findMenuItem);
selectMenu.addSeparator();
selectMenu.add(selectAllSequenceMenuItem);
@@ -1803,6 +1832,15 @@ public class GAlignFrame extends JInternalFrame
selectMenu.add(invertColSel);
selectMenu.add(deleteGroups);
selectMenu.add(grpsFromSelection);
+ // TODO - determine if the listenToViewSelections button is needed : see bug JAL-574
+ //selectMenu.addSeparator();
+ //selectMenu.add(listenToViewSelections);
+ }
+
+ protected void listenToViewSelections_actionPerformed(ActionEvent e)
+ {
+ // TODO Auto-generated method stub
+
}
protected void showAllhidden_actionPerformed(ActionEvent e)
@@ -2265,6 +2303,11 @@ public class GAlignFrame extends JInternalFrame
}
+ public void sortByTreeOption_actionPerformed(ActionEvent e)
+ {
+
+ }
+
public void showAllSeqs_actionPerformed(ActionEvent e)
{