git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d8c5026
)
Panels replace colour buttons
author
amwaterhouse
<Andrew Waterhouse>
Tue, 21 Nov 2006 12:18:15 +0000
(12:18 +0000)
committer
amwaterhouse
<Andrew Waterhouse>
Tue, 21 Nov 2006 12:18:15 +0000
(12:18 +0000)
src/jalview/gui/AnnotationColourChooser.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/AnnotationColourChooser.java
b/src/jalview/gui/AnnotationColourChooser.java
index
f499217
..
b748c85
100755
(executable)
--- a/
src/jalview/gui/AnnotationColourChooser.java
+++ b/
src/jalview/gui/AnnotationColourChooser.java
@@
-26,6
+26,8
@@
import jalview.schemes.*;
import javax.swing.event.*;
\r
import java.util.*;
\r
import jalview.datamodel.SequenceGroup;
\r
import javax.swing.event.*;
\r
import java.util.*;
\r
import jalview.datamodel.SequenceGroup;
\r
+import java.awt.Dimension;
\r
+import javax.swing.BorderFactory;
\r
\r
public class AnnotationColourChooser
\r
extends JPanel
\r
\r
public class AnnotationColourChooser
\r
extends JPanel
\r
@@
-127,24
+129,27
@@
public class AnnotationColourChooser
throws Exception
\r
{
\r
minColour.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
\r
throws Exception
\r
{
\r
minColour.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
\r
- minColour.setToolTipText("");
\r
- minColour.setMargin(new Insets(2, 2, 2, 2));
\r
- minColour.setText("Min Colour");
\r
- minColour.addActionListener(new ActionListener()
\r
+ minColour.setBorder(BorderFactory.createEtchedBorder());
\r
+ minColour.setPreferredSize(new Dimension(40, 20));
\r
+ minColour.setToolTipText("Minimum Colour");
\r
+ minColour.addMouseListener(new MouseAdapter()
\r
{
\r
{
\r
- public void actionPerformed(ActionEvent e)
\r
+ public void mousePressed(MouseEvent e)
\r
{
\r
{
\r
- minColour_actionPerformed(e);
\r
+ if (minColour.isEnabled())
\r
+ minColour_actionPerformed();
\r
}
\r
});
\r
maxColour.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
\r
}
\r
});
\r
maxColour.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
\r
- maxColour.setMargin(new Insets(2, 2, 2, 2));
\r
- maxColour.setText("Max Colour");
\r
- maxColour.addActionListener(new ActionListener()
\r
+ maxColour.setBorder(BorderFactory.createEtchedBorder());
\r
+ maxColour.setPreferredSize(new Dimension(40, 20));
\r
+ maxColour.setToolTipText("Maximum Colour");
\r
+ maxColour.addMouseListener(new MouseAdapter()
\r
{
\r
{
\r
- public void actionPerformed(ActionEvent e)
\r
+ public void mousePressed(MouseEvent e)
\r
{
\r
{
\r
- maxColour_actionPerformed(e);
\r
+ if (maxColour.isEnabled())
\r
+ maxColour_actionPerformed();
\r
}
\r
});
\r
ok.setOpaque(false);
\r
}
\r
});
\r
ok.setOpaque(false);
\r
@@
-225,8
+230,8
@@
public class AnnotationColourChooser
}
\r
\r
JComboBox annotations = new JComboBox();
\r
}
\r
\r
JComboBox annotations = new JComboBox();
\r
- JButton minColour = new JButton();
\r
- JButton maxColour = new JButton();
\r
+ JPanel minColour = new JPanel();
\r
+ JPanel maxColour = new JPanel();
\r
JButton ok = new JButton();
\r
JButton cancel = new JButton();
\r
JPanel jPanel1 = new JPanel();
\r
JButton ok = new JButton();
\r
JButton cancel = new JButton();
\r
JPanel jPanel1 = new JPanel();
\r
@@
-240,7
+245,7
@@
public class AnnotationColourChooser
JTextField thresholdValue = new JTextField(20);
\r
JCheckBox currentColours = new JCheckBox();
\r
\r
JTextField thresholdValue = new JTextField(20);
\r
JCheckBox currentColours = new JCheckBox();
\r
\r
- public void minColour_actionPerformed(ActionEvent e)
\r
+ public void minColour_actionPerformed()
\r
{
\r
Color col = JColorChooser.showDialog(this,
\r
"Select Colour for Minimum Value",
\r
{
\r
Color col = JColorChooser.showDialog(this,
\r
"Select Colour for Minimum Value",
\r
@@
-251,7
+256,7
@@
public class AnnotationColourChooser
changeColour();
\r
}
\r
\r
changeColour();
\r
}
\r
\r
- public void maxColour_actionPerformed(ActionEvent e)
\r
+ public void maxColour_actionPerformed()
\r
{
\r
Color col = JColorChooser.showDialog(this,
\r
"Select Colour for Maximum Value",
\r
{
\r
Color col = JColorChooser.showDialog(this,
\r
"Select Colour for Maximum Value",
\r