JMenuItem invertColSel = new JMenuItem();\r
protected JTabbedPane tabbedPane = new JTabbedPane();\r
JMenuItem save = new JMenuItem();\r
- JMenuItem jMenuItem1 = new JMenuItem();\r
protected JMenuItem reload = new JMenuItem();\r
JMenuItem newView = new JMenuItem();\r
JMenuItem textColour = new JMenuItem();\r
- JMenu jMenu1 = new JMenu();\r
- JCheckBoxMenuItem jCheckBoxMenuItem1 = new JCheckBoxMenuItem();\r
- JMenu jMenu4 = new JMenu();\r
+ JMenu formatMenu = new JMenu();\r
+ JMenu selectMenu = new JMenu();\r
protected JCheckBoxMenuItem idRightAlign = new JCheckBoxMenuItem();\r
+ protected JMenuItem gatherViews = new JMenuItem();\r
+ protected JMenuItem expandViews = new JMenuItem();\r
public GAlignFrame()\r
{\r
try\r
invertSequenceMenuItem.setText("Invert Sequence Selection");\r
invertSequenceMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
java.awt.event.KeyEvent.VK_I,\r
- Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()|java.awt.event.KeyEvent.SHIFT_MASK, false));\r
+ Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
invertSequenceMenuItem.addActionListener(new java.awt.event.ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
pasteNew.setText("To New Alignment");\r
pasteNew.setAccelerator(javax.swing.KeyStroke.getKeyStroke(\r
java.awt.event.KeyEvent.VK_V,\r
- Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()|java.awt.event.KeyEvent.ALT_MASK, false));\r
+ Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()|java.awt.event.KeyEvent.SHIFT_MASK, false));\r
pasteNew.addActionListener(new java.awt.event.ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
});\r
sortByTreeMenu.setText("By Tree Order");\r
sort.setText("Sort");\r
+ sort.addMenuListener(new MenuListener()\r
+ {\r
+ public void menuSelected(MenuEvent e)\r
+ {\r
+ buildTreeMenu();\r
+ }\r
+\r
+ public void menuDeselected(MenuEvent e)\r
+ {\r
+ }\r
+\r
+ public void menuCanceled(MenuEvent e)\r
+ {\r
+ }\r
+ });\r
calculate.setText("Calculate Tree");\r
\r
jMenu2.setText("Export Image");\r
});\r
invertColSel.setText("Invert Column Selection");\r
invertColSel.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.\r
- event.KeyEvent.VK_I, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false));\r
+ event.KeyEvent.VK_I,\r
+ Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()\r
+ |java.awt.event.KeyEvent.ALT_MASK,\r
+ false));\r
invertColSel.addActionListener(new ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
textColour_actionPerformed(e);\r
}\r
});\r
- jMenu1.setText("Format");\r
- jCheckBoxMenuItem1.setText("Right Align Ids");\r
- jMenu4.setText("Select");\r
+ formatMenu.setText("Format");\r
+ selectMenu.setText("Select");\r
idRightAlign.setText("Right Align Sequence Id");\r
idRightAlign.addActionListener(new ActionListener()\r
{\r
idRightAlign_actionPerformed(e);\r
}\r
});\r
+ gatherViews.setEnabled(false);\r
+ gatherViews.setText("Gather Views");\r
+ gatherViews.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.\r
+ event.KeyEvent.VK_G, 0, false));\r
+ gatherViews.addActionListener(new ActionListener()\r
+ {\r
+ public void actionPerformed(ActionEvent e)\r
+ {\r
+ gatherViews_actionPerformed(e);\r
+ }\r
+ });\r
+ expandViews.setEnabled(false);\r
+ expandViews.setText("Expand Views");\r
+ expandViews.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.\r
+ event.KeyEvent.VK_X, 0, false));\r
+ expandViews.addActionListener(new ActionListener()\r
+ {\r
+ public void actionPerformed(ActionEvent e)\r
+ {\r
+ expandViews_actionPerformed(e);\r
+ }\r
+ });\r
\r
alignFrameMenuBar.add(fileMenu);\r
alignFrameMenuBar.add(editMenu);\r
- alignFrameMenuBar.add(jMenu4);\r
+ alignFrameMenuBar.add(selectMenu);\r
alignFrameMenuBar.add(viewMenu);\r
- alignFrameMenuBar.add(jMenu1);\r
+ alignFrameMenuBar.add(formatMenu);\r
alignFrameMenuBar.add(colourMenu);\r
alignFrameMenuBar.add(calculateMenu);\r
alignFrameMenuBar.add(webService);\r
editMenu.addSeparator();\r
editMenu.add(padGapsMenuitem);\r
viewMenu.add(newView);\r
+ viewMenu.add(expandViews);\r
+ viewMenu.add(gatherViews);\r
viewMenu.addSeparator();\r
viewMenu.add(jMenu3);\r
viewMenu.add(hideMenu);\r
sort.add(sortIDMenuItem);\r
sort.add(sortGroupMenuItem);\r
sort.add(sortPairwiseMenuItem);\r
+ sort.add(sortByTreeMenu);\r
calculate.add(averageDistanceTreeMenuItem);\r
calculate.add(neighbourTreeMenuItem);\r
calculate.add(avDistanceTreeBlosumMenuItem);\r
jMenu3.add(showAllSeqs);\r
hideMenu.add(hideSelColumns);\r
hideMenu.add(hideSelSequences);\r
- jMenu1.add(font);\r
- jMenu1.addSeparator();\r
- jMenu1.add(wrapMenuItem);\r
- jMenu1.add(scaleAbove);\r
- jMenu1.add(scaleLeft);\r
- jMenu1.add(scaleRight);\r
- jMenu1.add(seqLimits);\r
- jMenu1.add(idRightAlign);\r
- jMenu1.add(hiddenMarkers);\r
- jMenu1.add(viewBoxesMenuItem);\r
- jMenu1.add(viewTextMenuItem);\r
- jMenu1.add(colourTextMenuItem);\r
- jMenu1.add(renderGapsMenuItem);\r
- jMenu4.add(findMenuItem);\r
- jMenu4.addSeparator();\r
- jMenu4.add(selectAllSequenceMenuItem);\r
- jMenu4.add(deselectAllSequenceMenuItem);\r
- jMenu4.add(invertSequenceMenuItem);\r
- jMenu4.add(invertColSel);\r
- jMenu4.add(deleteGroups);\r
+ formatMenu.add(font);\r
+ formatMenu.addSeparator();\r
+ formatMenu.add(wrapMenuItem);\r
+ formatMenu.add(scaleAbove);\r
+ formatMenu.add(scaleLeft);\r
+ formatMenu.add(scaleRight);\r
+ formatMenu.add(seqLimits);\r
+ formatMenu.add(idRightAlign);\r
+ formatMenu.add(hiddenMarkers);\r
+ formatMenu.add(viewBoxesMenuItem);\r
+ formatMenu.add(viewTextMenuItem);\r
+ formatMenu.add(colourTextMenuItem);\r
+ formatMenu.add(renderGapsMenuItem);\r
+ selectMenu.add(findMenuItem);\r
+ selectMenu.addSeparator();\r
+ selectMenu.add(selectAllSequenceMenuItem);\r
+ selectMenu.add(deselectAllSequenceMenuItem);\r
+ selectMenu.add(invertSequenceMenuItem);\r
+ selectMenu.add(invertColSel);\r
+ selectMenu.add(deleteGroups);\r
}\r
\r
protected void outputText_actionPerformed(ActionEvent e)\r
{\r
\r
}\r
+\r
+ public void expandViews_actionPerformed(ActionEvent e)\r
+ {\r
+\r
+ }\r
+\r
+ public void gatherViews_actionPerformed(ActionEvent e)\r
+ {\r
+\r
+ }\r
+\r
+ public void buildTreeMenu()\r
+ {\r
+\r
+ }\r
}\r