git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
selected states set in updateMenusFromViewport
[jalview.git]
/
src
/
jalview
/
jbgui
/
GAlignFrame.java
diff --git
a/src/jalview/jbgui/GAlignFrame.java
b/src/jalview/jbgui/GAlignFrame.java
index
0611a72
..
cbe888a
100755
(executable)
--- a/
src/jalview/jbgui/GAlignFrame.java
+++ b/
src/jalview/jbgui/GAlignFrame.java
@@
-369,7
+369,8
@@
public class GAlignFrame
});
\r
invertSequenceMenuItem.setText("Invert Sequence Selection");
\r
invertSequenceMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
\r
});
\r
invertSequenceMenuItem.setText("Invert Sequence Selection");
\r
invertSequenceMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
\r
- java.awt.event.KeyEvent.VK_S, java.awt.event.KeyEvent.SHIFT_MASK, false));
\r
+ java.awt.event.KeyEvent.VK_I,
\r
+ java.awt.event.KeyEvent.SHIFT_MASK, false));
\r
invertSequenceMenuItem.addActionListener(new java.awt.event.ActionListener()
\r
{
\r
public void actionPerformed(ActionEvent e)
\r
invertSequenceMenuItem.addActionListener(new java.awt.event.ActionListener()
\r
{
\r
public void actionPerformed(ActionEvent e)
\r
@@
-826,7
+827,6
@@
public class GAlignFrame
}
\r
});
\r
applyToAllGroups.setText("Apply Colour To All Groups");
\r
}
\r
});
\r
applyToAllGroups.setText("Apply Colour To All Groups");
\r
- applyToAllGroups.setState(true);
\r
applyToAllGroups.addActionListener(new java.awt.event.ActionListener()
\r
{
\r
public void actionPerformed(ActionEvent e)
\r
applyToAllGroups.addActionListener(new java.awt.event.ActionListener()
\r
{
\r
public void actionPerformed(ActionEvent e)
\r
@@
-957,14
+957,7
@@
public class GAlignFrame
}
\r
});
\r
\r
}
\r
});
\r
\r
- /* tabbedPane.addChangeListener(new ChangeListener()
\r
- {
\r
- public void stateChanged(ChangeEvent ece)
\r
- {
\r
\r
\r
- tabSelected();
\r
- }
\r
- });*/
\r
featureSettings.setText("Feature Settings...");
\r
featureSettings.addActionListener(new ActionListener()
\r
{
\r
featureSettings.setText("Feature Settings...");
\r
featureSettings.addActionListener(new ActionListener()
\r
{
\r
@@
-989,7
+982,7
@@
public class GAlignFrame
smoothFont_actionPerformed(e);
\r
}
\r
});
\r
smoothFont_actionPerformed(e);
\r
}
\r
});
\r
- smoothFont.setState( jalview.bin.Cache.getDefault("ANTI_ALIAS",false));
\r
+
\r
annotationColour.setText("By Annotation...");
\r
annotationColour.addActionListener(new ActionListener()
\r
{
\r
annotationColour.setText("By Annotation...");
\r
annotationColour.addActionListener(new ActionListener()
\r
{
\r
@@
-1092,7
+1085,6
@@
public class GAlignFrame
}
\r
});
\r
hiddenMarkers.setText("Hidden Markers");
\r
}
\r
});
\r
hiddenMarkers.setText("Hidden Markers");
\r
- hiddenMarkers.setState(true);
\r
hiddenMarkers.addActionListener(new ActionListener()
\r
{
\r
public void actionPerformed(ActionEvent e)
\r
hiddenMarkers.addActionListener(new ActionListener()
\r
{
\r
public void actionPerformed(ActionEvent e)
\r
@@
-1102,7
+1094,7
@@
public class GAlignFrame
});
\r
invertColSel.setText("Invert Column Selection");
\r
invertColSel.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.
\r
});
\r
invertColSel.setText("Invert Column Selection");
\r
invertColSel.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.
\r
- event.KeyEvent.VK_C, java.awt.event.KeyEvent.SHIFT_MASK, false));
\r
+ event.KeyEvent.VK_I, java.awt.event.KeyEvent.CTRL_MASK, false));
\r
invertColSel.addActionListener(new ActionListener()
\r
{
\r
public void actionPerformed(ActionEvent e)
\r
invertColSel.addActionListener(new ActionListener()
\r
{
\r
public void actionPerformed(ActionEvent e)
\r
@@
-1126,6
+1118,13
@@
public class GAlignFrame
tabbedPane_mousePressed(e);
\r
}
\r
});
\r
tabbedPane_mousePressed(e);
\r
}
\r
});
\r
+ tabbedPane.addFocusListener(new FocusAdapter()
\r
+ {
\r
+ public void focusGained(FocusEvent e)
\r
+ {
\r
+ tabbedPane_focusGained(e);
\r
+ }
\r
+ });
\r
\r
alignFrameMenuBar.add(fileMenu);
\r
alignFrameMenuBar.add(editMenu);
\r
\r
alignFrameMenuBar.add(fileMenu);
\r
alignFrameMenuBar.add(editMenu);
\r
@@
-1648,4
+1647,9
@@
public class GAlignFrame
{
\r
\r
}
\r
{
\r
\r
}
\r
+
\r
+ public void tabbedPane_focusGained(FocusEvent e)
\r
+ {
\r
+ requestFocus();
\r
+ }
\r
}
\r
}
\r