X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFeatureSettings.java;h=daae5a531da9b9a3388913f87f3eaf3bfa64ccca;hb=a8f483d04205bb8273ee311c12968b7e86d205fa;hp=9e0925b73bfb30e68275758c9a6c674b468fd975;hpb=7c7a5a297e063d3892dd7e629bc317cdde837b81;p=jalview.git
diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java
index 9e0925b..daae5a5 100644
--- a/src/jalview/gui/FeatureSettings.java
+++ b/src/jalview/gui/FeatureSettings.java
@@ -1,5 +1,5 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
* Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
@@ -108,7 +108,7 @@ public class FeatureSettings extends JPanel
else if (evt.getClickCount() == 2)
{
fr.ap.alignFrame.avc.markColumnsContainingFeatures(
- evt.isShiftDown(),
+ evt.isAltDown(),evt.isShiftDown() || evt.isMetaDown(), evt.isMetaDown(),
(String) table.getValueAt(selectedRow, 0));
}
}
@@ -138,7 +138,8 @@ public class FeatureSettings extends JPanel
}
}
});
-
+ table.setToolTipText(""+JvSwingUtils
+ .wrapTooltip("Click/drag feature types up or down to change render order.
Double click to select columns containing feature in alignment/current selection
Pressing Alt will select columns outside features rather than inside
Pressing Shift to modify current selection (rather than clear current selection)
Press CTRL or Command/Meta to toggle columns in/outside features
")+"");
scrollPane.setViewportView(table);
dassourceBrowser = new DasSourceBrowser(this);
@@ -304,7 +305,7 @@ public class FeatureSettings extends JPanel
@Override
public void actionPerformed(ActionEvent arg0)
{
- fr.ap.alignFrame.avc.markColumnsContainingFeatures(false, type);
+ fr.ap.alignFrame.avc.markColumnsContainingFeatures(false, false, false, type);
}
});
JMenuItem clearCols = new JMenuItem(MessageManager.getString("label.select_columns_not_containing"));
@@ -314,7 +315,7 @@ public class FeatureSettings extends JPanel
@Override
public void actionPerformed(ActionEvent arg0)
{
- fr.ap.alignFrame.avc.markColumnsContainingFeatures(true, type);
+ fr.ap.alignFrame.avc.markColumnsContainingFeatures(true, false, false, type);
}
});
men.add(selCols);