import jalview.bin.Cache;
import jalview.gui.JvSwingUtils;
import jalview.gui.Preferences;
-import jalview.io.FileFormat;
+import jalview.io.FileFormats;
import jalview.util.MessageManager;
import jalview.util.Platform;
import java.awt.BorderLayout;
import java.awt.Color;
-import java.awt.Component;
import java.awt.GridLayout;
import java.awt.Toolkit;
import java.awt.event.ActionEvent;
protected JMenuItem closeMenuItem = new JMenuItem();
- protected JMenu colourMenu = new JMenu();
-
protected JMenu webService = new JMenu();
protected JMenuItem webServiceNoServices;
protected JMenu outputTextboxMenu = new JMenu();
- protected JRadioButtonMenuItem textColour;
-
- protected JRadioButtonMenuItem userDefinedColour;
-
protected JCheckBoxMenuItem annotationPanelMenuItem = new JCheckBoxMenuItem();
protected JCheckBoxMenuItem colourTextMenuItem = new JCheckBoxMenuItem();
protected JMenuItem redoMenuItem = new JMenuItem();
- protected JCheckBoxMenuItem conservationMenuItem;
-
- protected JRadioButtonMenuItem noColourmenuItem;
-
protected JCheckBoxMenuItem wrapMenuItem = new JCheckBoxMenuItem();
protected JCheckBoxMenuItem renderGapsMenuItem = new JCheckBoxMenuItem();
- protected JCheckBoxMenuItem abovePIDThreshold;
-
public JCheckBoxMenuItem showSeqFeatures = new JCheckBoxMenuItem();
JMenuItem copy = new JMenuItem();
JMenu pasteMenu = new JMenu();
- protected JCheckBoxMenuItem applyToAllGroups;
-
protected JCheckBoxMenuItem seqLimits = new JCheckBoxMenuItem();
protected JCheckBoxMenuItem scaleAbove = new JCheckBoxMenuItem();
protected JCheckBoxMenuItem scaleRight = new JCheckBoxMenuItem();
- protected JMenuItem modifyPID;
+ protected JCheckBoxMenuItem applyToAllGroups;
+
+ protected JMenu colourMenu = new JMenu();
+
+ protected JMenuItem textColour;
+
+ protected JCheckBoxMenuItem conservationMenuItem;
protected JMenuItem modifyConservation;
+ protected JCheckBoxMenuItem abovePIDThreshold;
+
+ protected JMenuItem modifyPID;
+
protected JMenuItem annotationColour;
protected JMenu sortByTreeMenu = new JMenu();
protected JMenu sort = new JMenu();
- protected JMenu calculateTree = new JMenu();
+ protected JMenuItem calculateTree = new JMenuItem();
protected JCheckBoxMenuItem padGapsMenuitem = new JCheckBoxMenuItem();
setJMenuBar(alignFrameMenuBar);
// dynamically fill save as menu with available formats
- for (String ff : FileFormat.getWritableFormats(true))
+ for (String ff : FileFormats.getInstance().getWritableFormats(true))
{
JMenuItem item = new JMenuItem(ff);
}
}
- /**
- * Marks as selected the colour menu item matching the given name, or the
- * first item ('None') if no match is found
- *
- * @param colourName
- */
- protected void setColourSelected(String colourName)
- {
- noColourmenuItem.setSelected(true);
- if (colourName == null)
- {
- return;
- }
-
- /*
- * look for a radio button with a name that matches the colour name
- * (note the button text may not as it may be internationalised)
- */
- for (Component menuItem : colourMenu.getMenuComponents())
- {
- if (menuItem instanceof JRadioButtonMenuItem)
- {
- if (colourName.equals(((JRadioButtonMenuItem) menuItem).getName()))
- {
- ((JRadioButtonMenuItem) menuItem).setSelected(true);
- return;
- }
- }
- }
- }
-
private void jbInit() throws Exception
{
initColourMenu();
PCAMenuItem_actionPerformed(e);
}
});
- JMenuItem averageDistanceTreeMenuItem = new JMenuItem(
- MessageManager.getString("label.average_distance_identity"));
- averageDistanceTreeMenuItem.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- averageDistanceTreeMenuItem_actionPerformed(e);
- }
- });
- JMenuItem neighbourTreeMenuItem = new JMenuItem(
- MessageManager.getString("label.neighbour_joining_identity"));
- neighbourTreeMenuItem.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- neighbourTreeMenuItem_actionPerformed(e);
- }
- });
this.getContentPane().setLayout(new BorderLayout());
alignFrameMenuBar.setFont(new java.awt.Font("Verdana", 0, 11));
outputTextboxMenu.setText(MessageManager
.getString("label.out_to_textbox"));
-
- JMenuItem avDistanceTreeBlosumMenuItem = new JMenuItem(
- MessageManager.getString("label.average_distance_blosum62"));
- avDistanceTreeBlosumMenuItem.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- avTreeBlosumMenuItem_actionPerformed(e);
- }
- });
- JMenuItem njTreeBlosumMenuItem = new JMenuItem(
- MessageManager.getString("label.neighbour_blosum62"));
- njTreeBlosumMenuItem.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- njTreeBlosumMenuItem_actionPerformed(e);
- }
- });
annotationPanelMenuItem.setActionCommand("");
annotationPanelMenuItem.setText(MessageManager
.getString("label.show_annotations"));
});
JMenuItem createGroup = new JMenuItem(
- MessageManager.getString("action.create_groups"));
+ MessageManager.getString("action.create_group"));
keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_G, Toolkit
.getDefaultToolkit().getMenuShortcutKeyMask(), false);
al = new ActionListener()
@Override
public void menuSelected(MenuEvent e)
{
- buildTreeMenu();
+ buildTreeSortMenu();
}
@Override
});
sortByAnnotScore.setVisible(false);
- calculateTree
- .setText(MessageManager.getString("action.calculate_tree"));
+ calculateTree.setText(MessageManager
+ .getString("action.calculate_tree_pca"));
padGapsMenuitem.setText(MessageManager.getString("label.pad_gaps"));
padGapsMenuitem.setState(jalview.bin.Cache
formatMenu.setText(MessageManager.getString("action.format"));
JMenu selectMenu = new JMenu(MessageManager.getString("action.select"));
+
idRightAlign.setText(MessageManager
.getString("label.right_align_sequence_id"));
idRightAlign.addActionListener(new ActionListener()
calculateMenu.add(calculateTree);
calculateMenu.addSeparator();
calculateMenu.add(pairwiseAlignmentMenuItem);
- calculateMenu.add(PCAMenuItem);
+ // calculateMenu.add(PCAMenuItem);
calculateMenu.addSeparator();
calculateMenu.add(showTranslation);
calculateMenu.add(showReverse);
// selectMenu.add(listenToViewSelections);
}
+ protected void configureSelectMenu()
+ {
+ // TODO Auto-generated method stub
+
+ }
+
/**
* Constructs the entries on the Colour menu (but does not add them to the
- * menu). The 'name' property of each item is set to the canonical name of the
- * corresponding colour scheme (may not match the display name), to allow
- * selection of items by colour scheme name.
+ * menu).
*/
protected void initColourMenu()
{
@Override
public void actionPerformed(ActionEvent e)
{
- applyToAllGroups_actionPerformed();
+ applyToAllGroups_actionPerformed(applyToAllGroups.isSelected());
}
});
- textColour = new JRadioButtonMenuItem(
- MessageManager.getString("action.set_text_colour"));
+ textColour = new JMenuItem(
+ MessageManager.getString("label.text_colour"));
textColour.addActionListener(new ActionListener()
{
@Override
}
});
- userDefinedColour = new JRadioButtonMenuItem(
- MessageManager
- .getString("action.user_defined"));
- userDefinedColour.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- userDefinedColour_actionPerformed(e);
- }
- });
-
conservationMenuItem = new JCheckBoxMenuItem(
MessageManager.getString("action.by_conservation"));
conservationMenuItem.addActionListener(new ActionListener()
@Override
public void actionPerformed(ActionEvent e)
{
- conservationMenuItem_actionPerformed();
- }
- });
- noColourmenuItem = new JRadioButtonMenuItem(
- MessageManager.getString("label.none"));
- noColourmenuItem.setName("None");
- noColourmenuItem.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- noColourmenuItem_actionPerformed();
+ conservationMenuItem_actionPerformed(conservationMenuItem
+ .isSelected());
}
});
@Override
public void actionPerformed(ActionEvent e)
{
- abovePIDThreshold_actionPerformed();
+ abovePIDThreshold_actionPerformed(abovePIDThreshold.isSelected());
}
});
modifyPID = new JMenuItem(
{
}
- protected void averageDistanceTreeMenuItem_actionPerformed(ActionEvent e)
- {
- }
-
protected void neighbourTreeMenuItem_actionPerformed(ActionEvent e)
{
}
- protected void njTreeBlosumMenuItem_actionPerformed(ActionEvent e)
- {
- }
-
- protected void avTreeBlosumMenuItem_actionPerformed(ActionEvent e)
- {
- }
-
- protected void userDefinedColour_actionPerformed(ActionEvent e)
- {
- }
-
-
-
- /*
- * protected void covariationColour_actionPerformed() { }
- */
-
- protected void noColourmenuItem_actionPerformed()
- {
- }
-
- protected void conservationMenuItem_actionPerformed()
+ protected void conservationMenuItem_actionPerformed(boolean selected)
{
}
{
}
- protected void abovePIDThreshold_actionPerformed()
+ protected void abovePIDThreshold_actionPerformed(boolean selected)
{
}
{
}
- protected void applyToAllGroups_actionPerformed()
+ protected void applyToAllGroups_actionPerformed(boolean selected)
{
}
}
- public void buildTreeMenu()
+ public void buildTreeSortMenu()
{
}
git://source.jalview.org / jalview.git / blobdiff