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
header updated
[jalview.git]
/
src
/
jalview
/
gui
/
AlignmentPanel.java
diff --git
a/src/jalview/gui/AlignmentPanel.java
b/src/jalview/gui/AlignmentPanel.java
index
f7cc054
..
22cb9e3
100755
(executable)
--- a/
src/jalview/gui/AlignmentPanel.java
+++ b/
src/jalview/gui/AlignmentPanel.java
@@
-1,6
+1,6
@@
/*
\r
* Jalview - A Sequence Alignment Editor and Viewer
\r
/*
\r
* Jalview - A Sequence Alignment Editor and Viewer
\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
\r
*
\r
* This program is free software; you can redistribute it and/or
\r
* modify it under the terms of the GNU General Public License
\r
*
\r
* This program is free software; you can redistribute it and/or
\r
* modify it under the terms of the GNU General Public License
\r
@@
-238,7
+238,8
@@
public class AlignmentPanel extends GAlignmentPanel
case KeyEvent.VK_H:
\r
{
\r
boolean toggleSeqs = !evt.isControlDown();
\r
case KeyEvent.VK_H:
\r
{
\r
boolean toggleSeqs = !evt.isControlDown();
\r
- boolean toggleCols = !evt.isAltDown();
\r
+ boolean toggleCols = !evt.isShiftDown();
\r
+
\r
boolean hide = false;
\r
\r
SequenceGroup sg = av.getSelectionGroup();
\r
boolean hide = false;
\r
\r
SequenceGroup sg = av.getSelectionGroup();
\r
@@
-249,14
+250,18
@@
public class AlignmentPanel extends GAlignmentPanel
alignFrame.hideSelSequences_actionPerformed(null);
\r
hide = true;
\r
}
\r
alignFrame.hideSelSequences_actionPerformed(null);
\r
hide = true;
\r
}
\r
- else
\r
+ else if (!(toggleCols && av.colSel.getSelected().size() > 0))
\r
alignFrame.showAllSeqs_actionPerformed(null);
\r
}
\r
\r
if (toggleCols)
\r
{
\r
if(av.colSel.getSelected().size() > 0)
\r
alignFrame.showAllSeqs_actionPerformed(null);
\r
}
\r
\r
if (toggleCols)
\r
{
\r
if(av.colSel.getSelected().size() > 0)
\r
+ {
\r
alignFrame.hideSelColumns_actionPerformed(null);
\r
alignFrame.hideSelColumns_actionPerformed(null);
\r
+ if(!toggleSeqs)
\r
+ av.selectionGroup = sg;
\r
+ }
\r
else if(!hide)
\r
alignFrame.showAllColumns_actionPerformed(null);
\r
}
\r
else if(!hide)
\r
alignFrame.showAllColumns_actionPerformed(null);
\r
}
\r