X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGAlignFrame.java;h=cbe888aee1e775de69b8e4fb3ecc6d43100e1f1e;hb=488e3a038c2ba1a3926f2af5eaea97ba76e028d0;hp=0611a72a2bdb406d9d7b97216af77232fab07bd5;hpb=1f1214dab18d5ed1d0e7d68f92bb49ca4cf70787;p=jalview.git diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java index 0611a72..cbe888a 100755 --- a/src/jalview/jbgui/GAlignFrame.java +++ b/src/jalview/jbgui/GAlignFrame.java @@ -369,7 +369,8 @@ public class GAlignFrame }); invertSequenceMenuItem.setText("Invert Sequence Selection"); invertSequenceMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( - java.awt.event.KeyEvent.VK_S, java.awt.event.KeyEvent.SHIFT_MASK, false)); + java.awt.event.KeyEvent.VK_I, + java.awt.event.KeyEvent.SHIFT_MASK, false)); invertSequenceMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -826,7 +827,6 @@ public class GAlignFrame } }); applyToAllGroups.setText("Apply Colour To All Groups"); - applyToAllGroups.setState(true); applyToAllGroups.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -957,14 +957,7 @@ public class GAlignFrame } }); - /* tabbedPane.addChangeListener(new ChangeListener() - { - public void stateChanged(ChangeEvent ece) - { - tabSelected(); - } - });*/ featureSettings.setText("Feature Settings..."); featureSettings.addActionListener(new ActionListener() { @@ -989,7 +982,7 @@ public class GAlignFrame smoothFont_actionPerformed(e); } }); - smoothFont.setState( jalview.bin.Cache.getDefault("ANTI_ALIAS",false)); + annotationColour.setText("By Annotation..."); annotationColour.addActionListener(new ActionListener() { @@ -1092,7 +1085,6 @@ public class GAlignFrame } }); hiddenMarkers.setText("Hidden Markers"); - hiddenMarkers.setState(true); hiddenMarkers.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1102,7 +1094,7 @@ public class GAlignFrame }); invertColSel.setText("Invert Column Selection"); invertColSel.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt. - event.KeyEvent.VK_C, java.awt.event.KeyEvent.SHIFT_MASK, false)); + event.KeyEvent.VK_I, java.awt.event.KeyEvent.CTRL_MASK, false)); invertColSel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1126,6 +1118,13 @@ public class GAlignFrame tabbedPane_mousePressed(e); } }); + tabbedPane.addFocusListener(new FocusAdapter() + { + public void focusGained(FocusEvent e) + { + tabbedPane_focusGained(e); + } + }); alignFrameMenuBar.add(fileMenu); alignFrameMenuBar.add(editMenu); @@ -1648,4 +1647,9 @@ public class GAlignFrame { } + + public void tabbedPane_focusGained(FocusEvent e) + { + requestFocus(); + } }