\r
import jalview.gui.Preferences;\r
import jalview.schemes.ColourSchemeProperty;\r
+import javax.swing.event.AncestorListener;\r
+import javax.swing.event.AncestorEvent;\r
\r
public class GAlignFrame extends JInternalFrame\r
{\r
protected JMenuItem clustalAlignMenuItem = new JMenuItem();\r
BorderLayout borderLayout1 = new BorderLayout();\r
public JLabel statusBar = new JLabel();\r
- protected JMenu saveAlignmentMenu = new JMenu();\r
+ protected JMenuItem saveAlignmentMenu = new JMenuItem();\r
protected JMenu outputTextboxMenu = new JMenu();\r
protected JRadioButtonMenuItem clustalColour = new JRadioButtonMenuItem();\r
protected JRadioButtonMenuItem zappoColour = new JRadioButtonMenuItem();\r
JMenuItem modifyPID = new JMenuItem();\r
JMenuItem modifyConservation = new JMenuItem();\r
protected JMenu sortByTreeMenu = new JMenu();\r
- JMenu jMenu2 = new JMenu();\r
JMenu sort = new JMenu();\r
JMenu calculate = new JMenu();\r
JMenuItem msaAlignMenuItem = new JMenuItem();\r
+ JMenu jMenu2 = new JMenu();\r
public GAlignFrame()\r
{\r
ButtonGroup colours = new ButtonGroup();\r
// dynamically fill save as menu with available formats\r
for (int i = 0; i < jalview.io.FormatAdapter.formats.size(); i++) {\r
item = new JMenuItem((String) jalview.io.FormatAdapter.formats.elementAt(i));\r
- saveAlignmentMenu.add( item );\r
- item.addActionListener(new java.awt.event.ActionListener()\r
- {\r
- public void actionPerformed(ActionEvent e)\r
- {\r
- saveAs_actionPerformed(e);\r
- }\r
- });\r
-\r
- item = new JMenuItem((String) jalview.io.FormatAdapter.formats.elementAt(i));\r
item.addActionListener(new java.awt.event.ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
fileMenu.setMnemonic('F');\r
fileMenu.setText("File");\r
saveAlignmentMenu.setMnemonic('L');\r
- saveAlignmentMenu.setText("Save");\r
+ saveAlignmentMenu.setText("Save As");\r
+ saveAlignmentMenu.addActionListener(new ActionListener()\r
+ {\r
+ public void actionPerformed(ActionEvent e)\r
+ {\r
+ saveAlignmentMenu_actionPerformed(e);\r
+ }\r
+ });\r
closeMenuItem.setMnemonic('C');\r
closeMenuItem.setText("Close");\r
closeMenuItem.addActionListener(new java.awt.event.ActionListener()\r
viewTextMenuItem_actionPerformed(e);\r
}\r
});\r
- sortPairwiseMenuItem.setText("Pairwise Identity");\r
+ sortPairwiseMenuItem.setText("By Pairwise Identity");\r
sortPairwiseMenuItem.addActionListener(new java.awt.event.ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
sortPairwiseMenuItem_actionPerformed(e);\r
}\r
});\r
- sortIDMenuItem.setText("ID");\r
+ sortIDMenuItem.setText("By ID");\r
sortIDMenuItem.addActionListener(new java.awt.event.ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
sortIDMenuItem_actionPerformed(e);\r
}\r
});\r
- sortGroupMenuItem.setText("Group");\r
+ sortGroupMenuItem.setText("By Group");\r
sortGroupMenuItem.addActionListener(new java.awt.event.ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
});\r
this.getContentPane().setLayout(borderLayout1);\r
alignFrameMenuBar.setFont(new java.awt.Font("Verdana", 0, 11));\r
+ alignFrameMenuBar.addAncestorListener(new AncestorListener()\r
+ {\r
+ public void ancestorAdded(AncestorEvent event)\r
+ {\r
+ alignFrameMenuBar_ancestorAdded(event);\r
+ }\r
+\r
+ public void ancestorRemoved(AncestorEvent event)\r
+ {\r
+ }\r
+\r
+ public void ancestorMoved(AncestorEvent event)\r
+ {\r
+ }\r
+ });\r
statusBar.setBackground(Color.white);\r
statusBar.setFont(new java.awt.Font("Verdana", 0, 11));\r
statusBar.setBorder(BorderFactory.createLineBorder(Color.black));\r
});\r
searchMenu.setText("Search");\r
\r
- abovePIDThreshold.setText("Above Identity threshold");\r
+ abovePIDThreshold.setText("Above Identity Threshold");\r
abovePIDThreshold.addActionListener(new java.awt.event.ActionListener() {\r
public void actionPerformed(ActionEvent e) {\r
abovePIDThreshold_actionPerformed(e);\r
createPNG_actionPerformed(e);\r
}\r
});\r
- createPNG.setActionCommand("Save as PNG Image");\r
+ createPNG.setActionCommand("Save As PNG Image");\r
createPNG.setText("PNG");\r
font.setText("Font...");\r
font.addActionListener(new java.awt.event.ActionListener()\r
modifyConservation_actionPerformed(e);\r
}\r
});\r
- sortByTreeMenu.setText("Tree Order");\r
- jMenu2.setText("Save as");\r
+ sortByTreeMenu.setText("By Tree Order");\r
sort.setText("Sort");\r
calculate.setText("Calculate Tree");\r
msaAlignMenuItem.setText("Muscle Alignment...");\r
msaAlignMenuItem_actionPerformed(e);\r
}\r
});\r
+ jMenu2.setText("Export");\r
alignFrameMenuBar.add(fileMenu);\r
alignFrameMenuBar.add(editMenu);\r
alignFrameMenuBar.add(searchMenu);\r
this.getContentPane().add(statusBar, BorderLayout.SOUTH);\r
jMenu1.add(pasteNew);\r
jMenu1.add(pasteThis);\r
- jMenu2.add(htmlMenuItem);\r
- jMenu2.add(epsFile);\r
- jMenu2.add(createPNG);\r
sort.add(sortIDMenuItem);\r
- sort.add(sortGroupMenuItem);\r
sort.add(sortByTreeMenu);\r
+ sort.add(sortGroupMenuItem);\r
sort.add(sortPairwiseMenuItem);\r
calculate.add(averageDistanceTreeMenuItem);\r
calculate.add(neighbourTreeMenuItem);\r
calculate.add(avDistanceTreeBlosumMenuItem);\r
calculate.add(njTreeBlosumMenuItem);\r
- }\r
-\r
- protected void saveAs_actionPerformed(ActionEvent e)\r
- {\r
-\r
+ jMenu2.add(htmlMenuItem);\r
+ jMenu2.add(epsFile);\r
+ jMenu2.add(createPNG);\r
}\r
\r
protected void outputText_actionPerformed(ActionEvent e)\r
\r
}\r
\r
+ public void alignFrameMenuBar_ancestorAdded(AncestorEvent event)\r
+ {\r
+\r
+ }\r
+\r
+ public void saveAlignmentMenu_actionPerformed(ActionEvent e)\r
+ {\r
+\r
+ }\r
+\r
}\r
protected static JMenu windowMenu = new JMenu();\r
JMenu toolsMenu = new JMenu();\r
JMenuItem preferences = new JMenuItem();\r
+ JMenuItem saveState = new JMenuItem();\r
+ JMenuItem loadState = new JMenuItem();\r
+ JMenu jMenu1 = new JMenu();\r
public GDesktop()\r
{\r
try\r
FileMenu.setText("File");\r
HelpMenu.setText("Help");\r
inputLocalFileMenuItem.setMnemonic('L');\r
- inputLocalFileMenuItem.setText("Input Alignment From Local File");\r
+ inputLocalFileMenuItem.setText("Local File");\r
inputLocalFileMenuItem.addActionListener(new java.awt.event.ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
}\r
});\r
inputURLMenuItem.setMnemonic('U');\r
- inputURLMenuItem.setText("Input Alignment From URL");\r
+ inputURLMenuItem.setText("From URL");\r
inputURLMenuItem.addActionListener(new java.awt.event.ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
inputURLMenuItem_actionPerformed(e);\r
}\r
});\r
- inputTextboxMenuItem.setMnemonic('T');\r
- inputTextboxMenuItem.setText("Input Alignment via Textbox");\r
+ inputTextboxMenuItem.setMnemonic('C');\r
+ inputTextboxMenuItem.setText("Cut & Paste Textbox");\r
inputTextboxMenuItem.addActionListener(new java.awt.event.ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
}\r
});\r
toolsMenu.setText("Tools");\r
+ saveState.setMnemonic('S');\r
+ saveState.setText("Save Project");\r
+ saveState.addActionListener(new ActionListener()\r
+ {\r
+ public void actionPerformed(ActionEvent e)\r
+ {\r
+ saveState_actionPerformed(e);\r
+ }\r
+ });\r
+ loadState.setMnemonic('L');\r
+ loadState.setText("Load Project");\r
+ loadState.addActionListener(new ActionListener()\r
+ {\r
+ public void actionPerformed(ActionEvent e)\r
+ {\r
+ loadState_actionPerformed(e);\r
+ }\r
+ });\r
+ jMenu1.setMnemonic('I');\r
+ jMenu1.setText("Input Alignment");\r
DesktopMenubar.add(FileMenu);\r
DesktopMenubar.add(toolsMenu);\r
DesktopMenubar.add(HelpMenu);\r
DesktopMenubar.add(windowMenu);\r
FileMenu.addSeparator();\r
- FileMenu.add(inputLocalFileMenuItem);\r
- FileMenu.add(inputURLMenuItem);\r
- FileMenu.add(inputTextboxMenuItem);\r
+ FileMenu.add(jMenu1);\r
+ FileMenu.addSeparator();\r
+ FileMenu.add(saveState);\r
+ FileMenu.add(loadState);\r
FileMenu.addSeparator();\r
FileMenu.add(quit);\r
HelpMenu.add(aboutMenuItem);\r
HelpMenu.add(documentationMenuItem);\r
toolsMenu.add(preferences);\r
+ jMenu1.add(inputLocalFileMenuItem);\r
+ jMenu1.add(inputURLMenuItem);\r
+ jMenu1.add(inputTextboxMenuItem);\r
\r
}\r
\r
{\r
\r
}\r
+\r
+ public void saveState_actionPerformed(ActionEvent e)\r
+ {\r
+\r
+ }\r
+\r
+ public void loadState_actionPerformed(ActionEvent e)\r
+ {\r
+\r
+ }\r
+\r
+ public void loadJalviewAlign_actionPerformed(ActionEvent e)\r
+ {\r
+\r
+ }\r
}\r
-package jalview.jbgui;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.*;
-
-
-public class GFinder extends JPanel
-{
- JLabel jLabel1 = new JLabel();
- protected JTextField textfield = new JTextField();
- protected JButton findAll = new JButton();
- protected JButton findNext = new JButton();
- JPanel jPanel1 = new JPanel();
- GridLayout gridLayout1 = new GridLayout();
- protected JButton createNewGroup = new JButton();
-
- public GFinder()
- {
- try
- {
- jbInit();
- }
- catch(Exception e)
- {
- e.printStackTrace();
- }
- }
- private void jbInit() throws Exception
- {
- jLabel1.setFont(new java.awt.Font("Verdana", 0, 12));
- jLabel1.setText("Find");
- jLabel1.setBounds(new Rectangle(3, 30, 34, 15));
- this.setLayout(null);
- textfield.setFont(new java.awt.Font("Verdana", 0, 12));
- textfield.setText("");
- textfield.setBounds(new Rectangle(40, 27, 133, 21));
- textfield.addKeyListener(new java.awt.event.KeyAdapter()
- {
- public void keyTyped(KeyEvent e)
- {
- textfield_keyTyped(e);
- }
- });
- textfield.addActionListener(new java.awt.event.ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- textfield_actionPerformed(e);
- }
- });
- findAll.setFont(new java.awt.Font("Verdana", 0, 12));
- findAll.setText("Find all");
- findAll.addActionListener(new java.awt.event.ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- findAll_actionPerformed(e);
- }
- });
- findNext.setEnabled(false);
- findNext.setFont(new java.awt.Font("Verdana", 0, 12));
- findNext.setText("Find Next");
- findNext.addActionListener(new java.awt.event.ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- findNext_actionPerformed(e);
- }
- });
- jPanel1.setBounds(new Rectangle(180, 5, 141, 64));
- jPanel1.setLayout(gridLayout1);
- gridLayout1.setHgap(0);
- gridLayout1.setRows(3);
- gridLayout1.setVgap(2);
- createNewGroup.setEnabled(false);
- createNewGroup.setFont(new java.awt.Font("Verdana", 0, 12));
- createNewGroup.setToolTipText("");
- createNewGroup.setMargin(new Insets(0, 0, 0, 0));
- createNewGroup.setText("Create new group");
- createNewGroup.addActionListener(new java.awt.event.ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- createNewGroup_actionPerformed(e);
- }
- });
- jPanel1.add(findNext, null);
- jPanel1.add(findAll, null);
- jPanel1.add(createNewGroup, null);
- this.add(textfield, null);
- this.add(jLabel1, null);
- this.add(jPanel1, null);
- }
-
- protected void findNext_actionPerformed(ActionEvent e)
- {
-
- }
-
- protected void findAll_actionPerformed(ActionEvent e)
- {
-
- }
-
-
- protected void textfield_actionPerformed(ActionEvent e)
- {
-
- }
-
- void textfield_keyTyped(KeyEvent e)
- {
- findNext.setEnabled(true);
- }
-
- public void createNewGroup_actionPerformed(ActionEvent e)
- {
-
- }
-
-}
+package jalview.jbgui;\r
+\r
+import javax.swing.*;\r
+import java.awt.*;\r
+import java.awt.event.*;\r
+\r
+\r
+public class GFinder extends JPanel\r
+{\r
+ JLabel jLabel1 = new JLabel();\r
+ protected JTextField textfield = new JTextField();\r
+ protected JButton findAll = new JButton();\r
+ protected JButton findNext = new JButton();\r
+ JPanel jPanel1 = new JPanel();\r
+ GridLayout gridLayout1 = new GridLayout();\r
+ protected JButton createNewGroup = new JButton();\r
+\r
+ public GFinder()\r
+ {\r
+ try\r
+ {\r
+ jbInit();\r
+ }\r
+ catch(Exception e)\r
+ {\r
+ e.printStackTrace();\r
+ }\r
+ }\r
+ private void jbInit() throws Exception\r
+ {\r
+ jLabel1.setFont(new java.awt.Font("Verdana", 0, 12));\r
+ jLabel1.setText("Find");\r
+ jLabel1.setBounds(new Rectangle(3, 30, 34, 15));\r
+ this.setLayout(null);\r
+ textfield.setFont(new java.awt.Font("Verdana", 0, 12));\r
+ textfield.setText("");\r
+ textfield.setBounds(new Rectangle(40, 27, 133, 21));\r
+ textfield.addKeyListener(new java.awt.event.KeyAdapter()\r
+ {\r
+ public void keyTyped(KeyEvent e)\r
+ {\r
+ textfield_keyTyped(e);\r
+ }\r
+ });\r
+ textfield.addActionListener(new java.awt.event.ActionListener()\r
+ {\r
+ public void actionPerformed(ActionEvent e)\r
+ {\r
+ textfield_actionPerformed(e);\r
+ }\r
+ });\r
+ findAll.setFont(new java.awt.Font("Verdana", 0, 12));\r
+ findAll.setText("Find all");\r
+ findAll.addActionListener(new java.awt.event.ActionListener()\r
+ {\r
+ public void actionPerformed(ActionEvent e)\r
+ {\r
+ findAll_actionPerformed(e);\r
+ }\r
+ });\r
+ findNext.setEnabled(false);\r
+ findNext.setFont(new java.awt.Font("Verdana", 0, 12));\r
+ findNext.setText("Find Next");\r
+ findNext.addActionListener(new java.awt.event.ActionListener()\r
+ {\r
+ public void actionPerformed(ActionEvent e)\r
+ {\r
+ findNext_actionPerformed(e);\r
+ }\r
+ });\r
+ jPanel1.setBounds(new Rectangle(180, 5, 141, 64));\r
+ jPanel1.setLayout(gridLayout1);\r
+ gridLayout1.setHgap(0);\r
+ gridLayout1.setRows(3);\r
+ gridLayout1.setVgap(2);\r
+ createNewGroup.setEnabled(false);\r
+ createNewGroup.setFont(new java.awt.Font("Verdana", 0, 12));\r
+ createNewGroup.setToolTipText("");\r
+ createNewGroup.setMargin(new Insets(0, 0, 0, 0));\r
+ createNewGroup.setText("Create new group");\r
+ createNewGroup.addActionListener(new java.awt.event.ActionListener()\r
+ {\r
+ public void actionPerformed(ActionEvent e)\r
+ {\r
+ createNewGroup_actionPerformed(e);\r
+ }\r
+ });\r
+ jPanel1.add(findNext, null);\r
+ jPanel1.add(findAll, null);\r
+ jPanel1.add(createNewGroup, null);\r
+ this.add(textfield, null);\r
+ this.add(jLabel1, null);\r
+ this.add(jPanel1, null);\r
+ }\r
+\r
+ protected void findNext_actionPerformed(ActionEvent e)\r
+ {\r
+\r
+ }\r
+\r
+ protected void findAll_actionPerformed(ActionEvent e)\r
+ {\r
+\r
+ }\r
+\r
+\r
+ protected void textfield_actionPerformed(ActionEvent e)\r
+ {\r
+\r
+ }\r
+\r
+ void textfield_keyTyped(KeyEvent e)\r
+ {\r
+ findNext.setEnabled(true);\r
+ }\r
+\r
+ public void createNewGroup_actionPerformed(ActionEvent e)\r
+ {\r
+\r
+ }\r
+\r
+}\r
fullID.setHorizontalTextPosition(SwingConstants.LEFT);\r
fullID.setText("Full Sequence ID");\r
fullID.setBounds(new Rectangle(9, 78, 129, 23));\r
+ fullScreen.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
fullScreen.setHorizontalAlignment(SwingConstants.RIGHT);\r
fullScreen.setHorizontalTextPosition(SwingConstants.LEFT);\r
- fullScreen.setText("Full Screen");\r
- fullScreen.setBounds(new Rectangle(31, 28, 107, 23));\r
+ fullScreen.setText("Maximise Window");\r
+ fullScreen.setBounds(new Rectangle(5, 29, 132, 23));\r
conservation.setEnabled(false);\r
conservation.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
conservation.setHorizontalAlignment(SwingConstants.RIGHT);\r
gapSymbolCB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
gapSymbolCB.setBounds(new Rectangle(121, 140, 67, 21));\r
jPanel2.add(annotations);\r
- jPanel2.add(fullScreen);\r
jPanel2.add(conservation);\r
jPanel2.add(quality);\r
jPanel2.add(fullID);\r
jPanel2.add(fontSizeCB);\r
jPanel2.add(fontStyleCB);\r
jPanel2.add(identity);\r
+ jPanel2.add(fullScreen);\r
jPanel1.add(ok);\r
jPanel1.add(cancel);\r
this.add(visaulTab, java.awt.BorderLayout.CENTER);\r
this.setFont(new java.awt.Font("Verdana", 0, 12));\r
scrollPane.setOpaque(false);\r
jMenu1.setText("File");\r
- saveAsNewick.setText("Newick format");\r
+ saveAsNewick.setText("Newick Format");\r
saveAsNewick.addActionListener(new ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
git://source.jalview.org / jalview.git / commitdiff