X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGAlignFrame.java;h=d0327564b480118eb1ca9e9cb92ed8bcd973ebf6;hb=8c4f77adba0521e7dc89dcb77fe2f8b28c62f70d;hp=be0d08243b0c10168041acbd9a7bf51be30d63eb;hpb=2d740577b9dda7b872d808e2419ca66e2ad0eb4b;p=jalview.git diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java index be0d082..d032756 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(); @@ -144,6 +143,11 @@ public class GAlignFrame JMenuItem jMenuItem1 = new JMenuItem(); protected JMenuItem reload = new JMenuItem(); JMenuItem newView = new JMenuItem(); + JMenuItem textColour = new JMenuItem(); + JMenu jMenu1 = new JMenu(); + JCheckBoxMenuItem jCheckBoxMenuItem1 = new JCheckBoxMenuItem(); + JMenu jMenu4 = new JMenu(); + protected JCheckBoxMenuItem idRightAlign = new JCheckBoxMenuItem(); public GAlignFrame() { try @@ -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() { @@ -821,7 +823,7 @@ public class GAlignFrame pasteNew.setText("To New Alignment"); pasteNew.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_V, - Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()|java.awt.event.KeyEvent.SHIFT_MASK, false)); + Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()|java.awt.event.KeyEvent.ALT_MASK, false)); pasteNew.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1088,7 +1090,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) @@ -1160,11 +1162,31 @@ 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); + } + }); + jMenu1.setText("Format"); + jCheckBoxMenuItem1.setText("Right Align Ids"); + jMenu4.setText("Select"); + idRightAlign.setText("Right Align Sequence Id"); + idRightAlign.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + idRightAlign_actionPerformed(e); + } + }); alignFrameMenuBar.add(fileMenu); alignFrameMenuBar.add(editMenu); - alignFrameMenuBar.add(searchMenu); + alignFrameMenuBar.add(jMenu4); alignFrameMenuBar.add(viewMenu); + alignFrameMenuBar.add(jMenu1); alignFrameMenuBar.add(colourMenu); alignFrameMenuBar.add(calculateMenu); alignFrameMenuBar.add(webService); @@ -1192,12 +1214,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 +1221,11 @@ public class GAlignFrame editMenu.add(removeRedundancyMenuItem); editMenu.addSeparator(); editMenu.add(padGapsMenuitem); - searchMenu.add(findMenuItem); viewMenu.add(newView); viewMenu.addSeparator(); - viewMenu.add(font); - 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 +1233,7 @@ public class GAlignFrame viewMenu.addSeparator(); viewMenu.add(overviewMenuItem); colourMenu.add(applyToAllGroups); + colourMenu.add(textColour); colourMenu.addSeparator(); colourMenu.add(noColourmenuItem); colourMenu.add(clustalColour); @@ -1281,6 +1285,26 @@ public class GAlignFrame jMenu3.add(showAllSeqs); hideMenu.add(hideSelColumns); hideMenu.add(hideSelSequences); + jMenu1.add(font); + jMenu1.addSeparator(); + jMenu1.add(wrapMenuItem); + jMenu1.add(scaleAbove); + jMenu1.add(scaleLeft); + jMenu1.add(scaleRight); + jMenu1.add(seqLimits); + jMenu1.add(idRightAlign); + jMenu1.add(hiddenMarkers); + jMenu1.add(viewBoxesMenuItem); + jMenu1.add(viewTextMenuItem); + jMenu1.add(colourTextMenuItem); + jMenu1.add(renderGapsMenuItem); + jMenu4.add(findMenuItem); + jMenu4.addSeparator(); + jMenu4.add(selectAllSequenceMenuItem); + jMenu4.add(deselectAllSequenceMenuItem); + jMenu4.add(invertSequenceMenuItem); + jMenu4.add(invertColSel); + jMenu4.add(deleteGroups); } protected void outputText_actionPerformed(ActionEvent e) @@ -1705,4 +1729,14 @@ public class GAlignFrame { } + + public void textColour_actionPerformed(ActionEvent e) + { + + } + + public void idRightAlign_actionPerformed(ActionEvent e) + { + + } }