/*\r
* Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
*\r
* This program is free software; you can redistribute it and/or\r
* modify it under the terms of the GNU General Public License\r
import java.awt.*;\r
import java.awt.event.*;\r
import javax.swing.*;\r
+import javax.swing.event.*;\r
\r
import jalview.schemes.*;\r
import java.awt.BorderLayout;\r
\r
+\r
+\r
+\r
public class GAlignFrame\r
extends JInternalFrame\r
{\r
protected JMenuItem clustalAlignMenuItem = new JMenuItem();\r
BorderLayout borderLayout1 = new BorderLayout();\r
public JLabel statusBar = new JLabel();\r
- protected JMenuItem saveAlignmentMenu = new JMenuItem();\r
+ protected JMenuItem saveAs = new JMenuItem();\r
protected JMenu outputTextboxMenu = new JMenu();\r
protected JRadioButtonMenuItem clustalColour = new JRadioButtonMenuItem();\r
protected JRadioButtonMenuItem zappoColour = new JRadioButtonMenuItem();\r
JMenu jMenu3 = new JMenu();\r
JMenuItem showAllSeqs = new JMenuItem();\r
JMenuItem showAllColumns = new JMenuItem();\r
- JMenu jMenu4 = new JMenu();\r
+ JMenu hideMenu = new JMenu();\r
JMenuItem hideSelSequences = new JMenuItem();\r
JMenuItem hideSelColumns = new JMenuItem();\r
protected JCheckBoxMenuItem hiddenMarkers = new JCheckBoxMenuItem();\r
JMenuItem invertColSel = new JMenuItem();\r
-\r
+ protected JTabbedPane tabbedPane = new JTabbedPane();\r
+ JMenuItem save = new JMenuItem();\r
public GAlignFrame()\r
{\r
-\r
-\r
try\r
{\r
jbInit();\r
setJMenuBar(alignFrameMenuBar);\r
\r
// dynamically fill save as menu with available formats\r
- for (int i = 0; i < jalview.io.FormatAdapter.formats.size()-1; i++)\r
+ for (int i = 0; i < jalview.io.FormatAdapter.WRITEABLE_FORMATS.length; i++)\r
{\r
- JMenuItem item = new JMenuItem( (String) jalview.io.FormatAdapter.formats.\r
- elementAt(\r
- i));\r
+ JMenuItem item = new JMenuItem( jalview.io.FormatAdapter.WRITEABLE_FORMATS[i] );\r
+\r
item.addActionListener(new java.awt.event.ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
private void jbInit()\r
throws Exception\r
{\r
- fileMenu.setMnemonic('F');\r
fileMenu.setText("File");\r
- saveAlignmentMenu.setMnemonic('L');\r
- saveAlignmentMenu.setText("Save As");\r
- saveAlignmentMenu.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.\r
- awt.event.KeyEvent.VK_S, java.awt.event.KeyEvent.CTRL_MASK, false));\r
- saveAlignmentMenu.addActionListener(new ActionListener()\r
+ saveAs.setText("Save As ...");\r
+ saveAs.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.\r
+ KeyEvent.VK_S, java.awt.event.KeyEvent.ALT_MASK, false));\r
+ saveAs.addActionListener(new ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
{\r
- saveAlignmentMenu_actionPerformed(e);\r
+ saveAs_actionPerformed(e);\r
}\r
});\r
closeMenuItem.setMnemonic('C');\r
closeMenuItem.setText("Close");\r
+ closeMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.\r
+ event.KeyEvent.VK_W, java.awt.event.KeyEvent.CTRL_MASK, false));\r
closeMenuItem.addActionListener(new java.awt.event.ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
}\r
});\r
invertSequenceMenuItem.setText("Invert Sequence Selection");\r
+ invertSequenceMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
+ java.awt.event.KeyEvent.VK_I,\r
+ java.awt.event.KeyEvent.SHIFT_MASK, false));\r
invertSequenceMenuItem.addActionListener(new java.awt.event.ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
}\r
});\r
remove2LeftMenuItem.setText("Remove Left");\r
+ remove2LeftMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.\r
+ awt.event.KeyEvent.VK_L, java.awt.event.KeyEvent.CTRL_MASK, false));\r
remove2LeftMenuItem.addActionListener(new java.awt.event.ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
}\r
});\r
remove2RightMenuItem.setText("Remove Right");\r
+ remove2RightMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.\r
+ awt.event.KeyEvent.VK_R, java.awt.event.KeyEvent.CTRL_MASK, false));\r
remove2RightMenuItem.addActionListener(new java.awt.event.ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
}\r
});\r
removeGappedColumnMenuItem.setText("Remove Empty Columns");\r
+ removeGappedColumnMenuItem.setAccelerator(javax.swing.KeyStroke.\r
+ getKeyStroke(java.awt.event.\r
+ KeyEvent.VK_E, java.awt.event.KeyEvent.CTRL_MASK, false));\r
removeGappedColumnMenuItem.addActionListener(new java.awt.event.\r
ActionListener()\r
{\r
}\r
});\r
removeAllGapsMenuItem.setText("Remove All Gaps");\r
+ removeAllGapsMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
+ java.awt.event.KeyEvent.VK_G, java.awt.event.KeyEvent.CTRL_MASK, false));\r
removeAllGapsMenuItem.addActionListener(new java.awt.event.ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
}\r
});\r
removeRedundancyMenuItem.setText("Remove Redundancy...");\r
+ removeRedundancyMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
+ java.awt.event.KeyEvent.VK_R, java.awt.event.KeyEvent.CTRL_MASK, false));\r
removeRedundancyMenuItem.addActionListener(new java.awt.event.\r
ActionListener()\r
{\r
redoMenuItem.setEnabled(false);\r
redoMenuItem.setMnemonic('0');\r
redoMenuItem.setText("Redo");\r
+ redoMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.\r
+ event.KeyEvent.VK_Y, java.awt.event.KeyEvent.CTRL_MASK, false));\r
redoMenuItem.addActionListener(new java.awt.event.ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
}\r
});\r
printMenuItem.setText("Print");\r
+ printMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.\r
+ event.KeyEvent.VK_P, java.awt.event.KeyEvent.CTRL_MASK, false));\r
printMenuItem.addActionListener(new java.awt.event.ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
}\r
});\r
deleteGroups.setText("Undefine groups");\r
+ deleteGroups.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.\r
+ event.KeyEvent.VK_U, java.awt.event.KeyEvent.CTRL_MASK, false));\r
deleteGroups.addActionListener(new java.awt.event.ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
}\r
});\r
applyToAllGroups.setText("Apply Colour To All Groups");\r
- applyToAllGroups.setState(true);\r
applyToAllGroups.addActionListener(new java.awt.event.ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
sort.setText("Sort");\r
calculate.setText("Calculate Tree");\r
\r
- jMenu2.setText("Export");\r
+ jMenu2.setText("Export Image");\r
padGapsMenuitem.setText("Pad Gaps");\r
padGapsMenuitem.setState( jalview.bin.Cache.getDefault("PAD_GAPS", false));\r
padGapsMenuitem.addActionListener(new ActionListener()\r
}\r
});\r
\r
- /* tabbedPane.addChangeListener(new ChangeListener()\r
- {\r
- public void stateChanged(ChangeEvent ece)\r
- {\r
\r
- tabSelected();\r
- }\r
- });*/\r
featureSettings.setText("Feature Settings...");\r
featureSettings.addActionListener(new ActionListener()\r
{\r
smoothFont_actionPerformed(e);\r
}\r
});\r
- smoothFont.setState( jalview.bin.Cache.getDefault("ANTI_ALIAS",false));\r
+\r
annotationColour.setText("By Annotation...");\r
annotationColour.addActionListener(new ActionListener()\r
{\r
showAllColumns_actionPerformed(e);\r
}\r
});\r
- jMenu4.setText("Hide");\r
+ hideMenu.setText("Hide");\r
hideSelSequences.setText("Selected Sequences");\r
hideSelSequences.addActionListener(new ActionListener()\r
{\r
}\r
});\r
hiddenMarkers.setText("Hidden Markers");\r
- hiddenMarkers.setState(true);\r
hiddenMarkers.addActionListener(new ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
}\r
});\r
invertColSel.setText("Invert Column Selection");\r
+ invertColSel.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.\r
+ event.KeyEvent.VK_I, java.awt.event.KeyEvent.CTRL_MASK, false));\r
invertColSel.addActionListener(new ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
invertColSel_actionPerformed(e);\r
}\r
});\r
+ tabbedPane.addChangeListener(new javax.swing.event.ChangeListener()\r
+ {\r
+ public void stateChanged(ChangeEvent evt)\r
+ {\r
+ JTabbedPane pane = (JTabbedPane)evt.getSource();\r
+ int sel = pane.getSelectedIndex();\r
+ tabSelectionChanged(sel);\r
+ }\r
+ });\r
+ tabbedPane.addMouseListener(new MouseAdapter()\r
+ {\r
+ public void mousePressed(MouseEvent e)\r
+ {\r
+ tabbedPane_mousePressed(e);\r
+ }\r
+ });\r
+ tabbedPane.addFocusListener(new FocusAdapter()\r
+ {\r
+ public void focusGained(FocusEvent e)\r
+ {\r
+ tabbedPane_focusGained(e);\r
+ }\r
+ });\r
+ save.setText("Save");\r
+ save.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.\r
+ KeyEvent.VK_S, java.awt.event.KeyEvent.CTRL_MASK, false));\r
+ save.addActionListener(new ActionListener()\r
+ {\r
+ public void actionPerformed(ActionEvent e)\r
+ {\r
+ save_actionPerformed(e);\r
+ }\r
+ });\r
\r
alignFrameMenuBar.add(fileMenu);\r
alignFrameMenuBar.add(editMenu);\r
fileMenu.add(fetchSequence);\r
fileMenu.addSeparator();\r
fileMenu.add(vamsasStore);\r
- fileMenu.add(saveAlignmentMenu);\r
- fileMenu.add(jMenu2);\r
+ fileMenu.add(save);\r
+ fileMenu.add(saveAs);\r
fileMenu.add(outputTextboxMenu);\r
fileMenu.add(printMenuItem);\r
fileMenu.addSeparator();\r
+ fileMenu.add(jMenu2);\r
fileMenu.add(exportFeatures);\r
fileMenu.add(exportAnnotations);\r
fileMenu.add(LoadtreeMenuItem);\r
viewMenu.add(smoothFont);\r
viewMenu.addSeparator();\r
viewMenu.add(jMenu3);\r
- viewMenu.add(jMenu4);\r
+ viewMenu.add(hideMenu);\r
viewMenu.add(hiddenMarkers);\r
viewMenu.addSeparator();\r
viewMenu.add(wrapMenuItem);\r
addSequenceMenu.add(addFromURL);\r
this.getContentPane().add(statusPanel, java.awt.BorderLayout.SOUTH);\r
statusPanel.add(statusBar, null);\r
+ this.getContentPane().add(tabbedPane, java.awt.BorderLayout.CENTER);\r
jMenu3.add(showAllColumns);\r
jMenu3.add(showAllSeqs);\r
- jMenu4.add(hideSelColumns);\r
- jMenu4.add(hideSelSequences);\r
+ hideMenu.add(hideSelColumns);\r
+ hideMenu.add(hideSelSequences);\r
}\r
\r
protected void outputText_actionPerformed(ActionEvent e)\r
\r
\r
\r
- protected void saveAlignmentMenu_actionPerformed(ActionEvent e)\r
+ protected void saveAs_actionPerformed(ActionEvent e)\r
{\r
}\r
\r
{\r
\r
}\r
+\r
+ public void tabSelectionChanged(int sel)\r
+ {\r
+\r
+ }\r
+\r
+ public void tabbedPane_mousePressed(MouseEvent e)\r
+ {\r
+\r
+ }\r
+\r
+ public void tabbedPane_focusGained(FocusEvent e)\r
+ {\r
+ requestFocus();\r
+ }\r
+\r
+ public void save_actionPerformed(ActionEvent e)\r
+ {\r
+\r
+ }\r
}\r
git://source.jalview.org / jalview.git / blobdiff