X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGAlignFrame.java;h=ddb2bcd954a15a1231874818257f579eb1a408ff;hb=d4cf3b864ffb4d148389a3cdb788e43efd4e4b47;hp=463bf70c67a424cfa6478c15297da1676f650a72;hpb=71a0d926b2dac39360d891f18271ae2100835166;p=jalview.git diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java index 463bf70..ddb2bcd 100755 --- a/src/jalview/jbgui/GAlignFrame.java +++ b/src/jalview/jbgui/GAlignFrame.java @@ -23,7 +23,6 @@ import java.awt.event.*; import javax.swing.*; import javax.swing.event.*; -import jalview.gui.*; import jalview.schemes.*; public class GAlignFrame @@ -37,6 +36,7 @@ public class GAlignFrame protected JMenu colourMenu = new JMenu(); protected JMenu calculateMenu = new JMenu(); protected JMenu webService = new JMenu(); + protected JMenuItem webServiceNoServices; protected JMenuItem selectAllSequenceMenuItem = new JMenuItem(); protected JMenuItem deselectAllSequenceMenuItem = new JMenuItem(); protected JMenuItem invertSequenceMenuItem = new JMenuItem(); @@ -102,23 +102,98 @@ public class GAlignFrame public JCheckBoxMenuItem fullSeqId = new JCheckBoxMenuItem(); JMenuItem epsFile = new JMenuItem(); JMenuItem LoadtreeMenuItem = new JMenuItem(); - JMenuItem jnet = new JMenuItem(); public JCheckBoxMenuItem scaleAbove = new JCheckBoxMenuItem(); public JCheckBoxMenuItem scaleLeft = new JCheckBoxMenuItem(); public JCheckBoxMenuItem scaleRight = new JCheckBoxMenuItem(); - JMenuItem modifyPID = new JMenuItem(); - JMenuItem modifyConservation = new JMenuItem(); + protected JMenuItem modifyPID = new JMenuItem(); + protected JMenuItem modifyConservation = new JMenuItem(); protected JMenu sortByTreeMenu = new JMenu(); protected JMenu sort = new JMenu(); JMenu calculate = new JMenu(); - JMenuItem msaAlignMenuItem = new JMenuItem(); JMenu jMenu2 = new JMenu(); JMenuItem padGapsMenuitem = new JMenuItem(); - JMenuItem ClustalRealign = new JMenuItem(); + protected ButtonGroup colours = new ButtonGroup(); public GAlignFrame() { - ButtonGroup colours = new ButtonGroup(); + + + try + { + jbInit(); + setJMenuBar(alignFrameMenuBar); + + // dynamically fill save as menu with available formats + for (int i = 0; i < jalview.io.FormatAdapter.formats.size(); i++) + { + JMenuItem item = new JMenuItem( (String) jalview.io.FormatAdapter.formats. + elementAt( + i)); + item.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + outputText_actionPerformed(e); + } + }); + + outputTextboxMenu.add(item); + } + } + catch (Exception e) + { + } + + + if(jalview.gui.UserDefinedColours.getUserColourSchemes()!=null) + { + java.util.Enumeration userColours = jalview.gui.UserDefinedColours. + getUserColourSchemes().keys(); + + while (userColours.hasMoreElements()) + { + final JRadioButtonMenuItem radioItem = new JRadioButtonMenuItem(userColours. + nextElement().toString()); + radioItem.setName("USER_DEFINED"); + radioItem.addMouseListener(new MouseAdapter() + { + public void mousePressed(MouseEvent evt) + { + if(evt.isControlDown() || SwingUtilities.isRightMouseButton(evt)) + { + radioItem.removeActionListener(radioItem.getActionListeners()[0]); + + int option = JOptionPane.showInternalConfirmDialog(jalview.gui.Desktop.desktop, + "Remove from default list?", + "Remove user defined colour", + JOptionPane.YES_NO_OPTION); + if(option == JOptionPane.YES_OPTION) + { + jalview.gui.UserDefinedColours.removeColourFromDefaults(radioItem.getText()); + colourMenu.remove(radioItem); + } + else + radioItem.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent evt) + { + userDefinedColour_actionPerformed(evt); + } + }); + } + } + }); + radioItem.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent evt) + { + userDefinedColour_actionPerformed(evt); + } + }); + colourMenu.insert(radioItem, 15); + colours.add(radioItem); + } + } colours.add(noColourmenuItem); colours.add(clustalColour); colours.add(zappoColour); @@ -133,9 +208,13 @@ public class GAlignFrame colours.add(BLOSUM62Colour); colours.add(nucleotideColour); - noColourmenuItem.setSelected(true); + setColourSelected(jalview.bin.Cache.getDefault("DEFAULT_COLOUR", "None")); + + + } - String defaultColour = jalview.bin.Cache.getDefault("DEFAULT_COLOUR", null); + public void setColourSelected(String defaultColour) + { if (defaultColour != null) { @@ -143,6 +222,9 @@ public class GAlignFrame switch (index) { + case ColourSchemeProperty.NONE: + noColourmenuItem.setSelected(true); + break; case ColourSchemeProperty.CLUSTAL: clustalColour.setSelected(true); @@ -163,6 +245,10 @@ public class GAlignFrame break; + case ColourSchemeProperty.TAYLOR: + taylorColour.setSelected(true); + break; + case ColourSchemeProperty.HYDROPHOBIC: hydrophobicityColour.setSelected(true); @@ -200,34 +286,6 @@ public class GAlignFrame } } - try - { - jbInit(); - setJMenuBar(alignFrameMenuBar); - - JMenuItem item; - - // dynamically fill save as menu with available formats - for (int i = 0; i < jalview.io.FormatAdapter.formats.size(); i++) - { - item = new JMenuItem( (String) jalview.io.FormatAdapter.formats. - elementAt( - i)); - item.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - outputText_actionPerformed(e); - } - }); - - outputTextboxMenu.add(item); - } - } - catch (Exception e) - { - } - } private void jbInit() @@ -237,6 +295,8 @@ public class GAlignFrame fileMenu.setText("File"); saveAlignmentMenu.setMnemonic('L'); saveAlignmentMenu.setText("Save As"); + saveAlignmentMenu.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java. + awt.event.KeyEvent.VK_S, java.awt.event.KeyEvent.CTRL_MASK, false)); saveAlignmentMenu.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -409,14 +469,6 @@ public class GAlignFrame neighbourTreeMenuItem_actionPerformed(e); } }); - clustalAlignMenuItem.setText("Clustal Alignment"); - clustalAlignMenuItem.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - clustalAlignMenuItem_actionPerformed(e); - } - }); this.getContentPane().setLayout(borderLayout1); alignFrameMenuBar.setFont(new java.awt.Font("Verdana", 0, 11)); alignFrameMenuBar.addAncestorListener(new AncestorListener() @@ -771,7 +823,7 @@ public class GAlignFrame } }); fullSeqId.setText("Show Full Sequence ID"); - fullSeqId.setState(true); + fullSeqId.setState( jalview.bin.Cache.getDefault("SHOW_FULL_ID",true)); fullSeqId.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -796,14 +848,6 @@ public class GAlignFrame LoadtreeMenuItem_actionPerformed(e); } }); - jnet.setText("JNet"); - jnet.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - jpred_actionPerformed(e); - } - }); scaleAbove.setVisible(false); scaleAbove.setText("Scale Above"); scaleAbove.addActionListener(new java.awt.event.ActionListener() @@ -852,14 +896,7 @@ public class GAlignFrame sortByTreeMenu.setText("By Tree Order"); sort.setText("Sort"); calculate.setText("Calculate Tree"); - msaAlignMenuItem.setText("Muscle Alignment"); - msaAlignMenuItem.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - msaAlignMenuItem_actionPerformed(e); - } - }); + jMenu2.setText("Export"); padGapsMenuitem.setText("Pad Gaps"); padGapsMenuitem.addActionListener(new ActionListener() @@ -869,20 +906,13 @@ public class GAlignFrame padGapsMenuitem_actionPerformed(e); } }); - ClustalRealign.setText("Clustal Realign"); - ClustalRealign.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - ClustalRealign_actionPerformed(e); - } - }); alignFrameMenuBar.add(fileMenu); alignFrameMenuBar.add(editMenu); alignFrameMenuBar.add(searchMenu); alignFrameMenuBar.add(viewMenu); alignFrameMenuBar.add(colourMenu); alignFrameMenuBar.add(calculateMenu); + alignFrameMenuBar.add(webService); fileMenu.add(saveAlignmentMenu); fileMenu.add(jMenu2); fileMenu.add(outputTextboxMenu); @@ -951,12 +981,8 @@ public class GAlignFrame calculateMenu.addSeparator(); calculateMenu.add(pairwiseAlignmentMenuItem); calculateMenu.add(PCAMenuItem); - calculateMenu.addSeparator(); - calculateMenu.add(webService); - webService.add(clustalAlignMenuItem); - webService.add(msaAlignMenuItem); - webService.add(jnet); - webService.add(ClustalRealign); + webServiceNoServices=new JMenuItem(""); + webService.add(webServiceNoServices); this.getContentPane().add(statusBar, BorderLayout.SOUTH); jMenu1.add(pasteNew); jMenu1.add(pasteThis);