X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGAlignFrame.java;h=b5a0d30f35e42fd34f36bd3e7dc1bd5eef31d562;hb=d587f1aa61946dc14f6f089cf1dc2a3116cfb773;hp=be0d08243b0c10168041acbd9a7bf51be30d63eb;hpb=2d740577b9dda7b872d808e2419ca66e2ad0eb4b;p=jalview.git diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java index be0d082..b5a0d30 100755 --- a/src/jalview/jbgui/GAlignFrame.java +++ b/src/jalview/jbgui/GAlignFrame.java @@ -88,7 +88,6 @@ public class GAlignFrame JMenuItem printMenuItem = new JMenuItem(); public JCheckBoxMenuItem renderGapsMenuItem = new JCheckBoxMenuItem(); JMenuItem findMenuItem = new JMenuItem(); - JMenu searchMenu = new JMenu(); public JCheckBoxMenuItem abovePIDThreshold = new JCheckBoxMenuItem(); public JCheckBoxMenuItem showSeqFeatures = new JCheckBoxMenuItem(); protected JRadioButtonMenuItem nucleotideColour = new JRadioButtonMenuItem(); @@ -141,9 +140,14 @@ public class GAlignFrame JMenuItem invertColSel = new JMenuItem(); protected JTabbedPane tabbedPane = new JTabbedPane(); JMenuItem save = new JMenuItem(); - JMenuItem jMenuItem1 = new JMenuItem(); protected JMenuItem reload = new JMenuItem(); JMenuItem newView = new JMenuItem(); + JMenuItem textColour = new JMenuItem(); + JMenu formatMenu = new JMenu(); + JMenu selectMenu = new JMenu(); + protected JCheckBoxMenuItem idRightAlign = new JCheckBoxMenuItem(); + protected JMenuItem gatherViews = new JMenuItem(); + protected JMenuItem expandViews = new JMenuItem(); public GAlignFrame() { try @@ -384,7 +388,7 @@ public class GAlignFrame invertSequenceMenuItem.setText("Invert Sequence Selection"); invertSequenceMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_I, - Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()|java.awt.event.KeyEvent.SHIFT_MASK, false)); + Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); invertSequenceMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -748,8 +752,6 @@ public class GAlignFrame findMenuItem_actionPerformed(e); } }); - searchMenu.setText("Search"); - abovePIDThreshold.setText("Above Identity Threshold"); abovePIDThreshold.addActionListener(new java.awt.event.ActionListener() { @@ -939,6 +941,21 @@ public class GAlignFrame }); sortByTreeMenu.setText("By Tree Order"); sort.setText("Sort"); + sort.addMenuListener(new MenuListener() + { + public void menuSelected(MenuEvent e) + { + buildTreeMenu(); + } + + public void menuDeselected(MenuEvent e) + { + } + + public void menuCanceled(MenuEvent e) + { + } + }); calculate.setText("Calculate Tree"); jMenu2.setText("Export Image"); @@ -1088,7 +1105,7 @@ public class GAlignFrame hideSelColumns_actionPerformed(e); } }); - hiddenMarkers.setText("Hidden Markers"); + hiddenMarkers.setText("Show Hidden Markers"); hiddenMarkers.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1098,7 +1115,10 @@ public class GAlignFrame }); invertColSel.setText("Invert Column Selection"); invertColSel.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt. - event.KeyEvent.VK_I, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false)); + event.KeyEvent.VK_I, + Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() + |java.awt.event.KeyEvent.ALT_MASK, + false)); invertColSel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1160,11 +1180,52 @@ public class GAlignFrame }); tabbedPane.setToolTipText(" Right-click to rename tab" +"
Press X to eXpand tabs, G to reGroup."); + textColour.setText("Text Colour"); + textColour.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + textColour_actionPerformed(e); + } + }); + formatMenu.setText("Format"); + selectMenu.setText("Select"); + idRightAlign.setText("Right Align Sequence Id"); + idRightAlign.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + idRightAlign_actionPerformed(e); + } + }); + gatherViews.setEnabled(false); + gatherViews.setText("Gather Views"); + gatherViews.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt. + event.KeyEvent.VK_G, 0, false)); + gatherViews.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + gatherViews_actionPerformed(e); + } + }); + expandViews.setEnabled(false); + expandViews.setText("Expand Views"); + expandViews.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt. + event.KeyEvent.VK_X, 0, false)); + expandViews.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + expandViews_actionPerformed(e); + } + }); alignFrameMenuBar.add(fileMenu); alignFrameMenuBar.add(editMenu); - alignFrameMenuBar.add(searchMenu); + alignFrameMenuBar.add(selectMenu); alignFrameMenuBar.add(viewMenu); + alignFrameMenuBar.add(formatMenu); alignFrameMenuBar.add(colourMenu); alignFrameMenuBar.add(calculateMenu); alignFrameMenuBar.add(webService); @@ -1192,12 +1253,6 @@ public class GAlignFrame editMenu.add(pasteMenu); editMenu.add(delete); editMenu.addSeparator(); - editMenu.add(selectAllSequenceMenuItem); - editMenu.add(deselectAllSequenceMenuItem); - editMenu.add(invertSequenceMenuItem); - editMenu.add(invertColSel); - editMenu.add(deleteGroups); - editMenu.addSeparator(); editMenu.add(remove2LeftMenuItem); editMenu.add(remove2RightMenuItem); editMenu.add(removeGappedColumnMenuItem); @@ -1205,24 +1260,13 @@ public class GAlignFrame editMenu.add(removeRedundancyMenuItem); editMenu.addSeparator(); editMenu.add(padGapsMenuitem); - searchMenu.add(findMenuItem); viewMenu.add(newView); - viewMenu.addSeparator(); - viewMenu.add(font); + viewMenu.add(expandViews); + viewMenu.add(gatherViews); viewMenu.addSeparator(); viewMenu.add(jMenu3); viewMenu.add(hideMenu); - viewMenu.add(hiddenMarkers); viewMenu.addSeparator(); - viewMenu.add(wrapMenuItem); - viewMenu.add(seqLimits); - viewMenu.add(scaleAbove); - viewMenu.add(scaleLeft); - viewMenu.add(scaleRight); - viewMenu.add(viewBoxesMenuItem); - viewMenu.add(viewTextMenuItem); - viewMenu.add(colourTextMenuItem); - viewMenu.add(renderGapsMenuItem); viewMenu.add(annotationPanelMenuItem); viewMenu.addSeparator(); viewMenu.add(showSeqFeatures); @@ -1230,6 +1274,7 @@ public class GAlignFrame viewMenu.addSeparator(); viewMenu.add(overviewMenuItem); colourMenu.add(applyToAllGroups); + colourMenu.add(textColour); colourMenu.addSeparator(); colourMenu.add(noColourmenuItem); colourMenu.add(clustalColour); @@ -1264,6 +1309,7 @@ public class GAlignFrame sort.add(sortIDMenuItem); sort.add(sortGroupMenuItem); sort.add(sortPairwiseMenuItem); + sort.add(sortByTreeMenu); calculate.add(averageDistanceTreeMenuItem); calculate.add(neighbourTreeMenuItem); calculate.add(avDistanceTreeBlosumMenuItem); @@ -1281,6 +1327,26 @@ public class GAlignFrame jMenu3.add(showAllSeqs); hideMenu.add(hideSelColumns); hideMenu.add(hideSelSequences); + formatMenu.add(font); + formatMenu.addSeparator(); + formatMenu.add(wrapMenuItem); + formatMenu.add(scaleAbove); + formatMenu.add(scaleLeft); + formatMenu.add(scaleRight); + formatMenu.add(seqLimits); + formatMenu.add(idRightAlign); + formatMenu.add(hiddenMarkers); + formatMenu.add(viewBoxesMenuItem); + formatMenu.add(viewTextMenuItem); + formatMenu.add(colourTextMenuItem); + formatMenu.add(renderGapsMenuItem); + selectMenu.add(findMenuItem); + selectMenu.addSeparator(); + selectMenu.add(selectAllSequenceMenuItem); + selectMenu.add(deselectAllSequenceMenuItem); + selectMenu.add(invertSequenceMenuItem); + selectMenu.add(invertColSel); + selectMenu.add(deleteGroups); } protected void outputText_actionPerformed(ActionEvent e) @@ -1705,4 +1771,29 @@ public class GAlignFrame { } + + public void textColour_actionPerformed(ActionEvent e) + { + + } + + public void idRightAlign_actionPerformed(ActionEvent e) + { + + } + + public void expandViews_actionPerformed(ActionEvent e) + { + + } + + public void gatherViews_actionPerformed(ActionEvent e) + { + + } + + public void buildTreeMenu() + { + + } }