X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGUserDefinedColours.java;h=9b685b5643f3e7c686f8fac5be9e2d48145cf3e4;hb=4d2e0d36506302cc00677527725bcccbdf27d766;hp=8d7444539f07bcf66d3c4b40c358c3cc10a510bb;hpb=2bf3234c84daef8cd4474651a8e2f8bfe6cd3ba0;p=jalview.git

diff --git a/src/jalview/jbgui/GUserDefinedColours.java b/src/jalview/jbgui/GUserDefinedColours.java
index 8d74445..9b685b5 100755
--- a/src/jalview/jbgui/GUserDefinedColours.java
+++ b/src/jalview/jbgui/GUserDefinedColours.java
@@ -1,6 +1,6 @@
 /*
 * Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+* Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -22,7 +22,7 @@ import java.awt.*;
 import java.awt.event.*;
 
 import javax.swing.*;
-
+import java.awt.Dimension;
 
 /**
  * DOCUMENT ME!
@@ -35,7 +35,7 @@ public class GUserDefinedColours extends JPanel
     protected JColorChooser colorChooser = new JColorChooser();
     protected JPanel buttonPanel = new JPanel();
     protected GridLayout gridLayout = new GridLayout();
-    JPanel jPanel2 = new JPanel();
+    JPanel lowerPanel = new JPanel();
     protected JButton okButton = new JButton();
     protected JButton applyButton = new JButton();
     protected JButton loadbutton = new JButton();
@@ -46,8 +46,8 @@ public class GUserDefinedColours extends JPanel
   protected JTextField schemeName = new JTextField();
   BorderLayout borderLayout1 = new BorderLayout();
   JPanel panel1 = new JPanel();
-  JPanel jPanel1 = new JPanel();
-  JPanel jPanel3 = new JPanel();
+  JPanel okCancelPanel = new JPanel();
+  JPanel saveLoadPanel = new JPanel();
   BorderLayout borderLayout3 = new BorderLayout();
   GridBagLayout gridBagLayout1 = new GridBagLayout();
   BorderLayout borderLayout2 = new BorderLayout();
@@ -55,8 +55,10 @@ public class GUserDefinedColours extends JPanel
   BorderLayout borderLayout4 = new BorderLayout();
   JPanel jPanel4 = new JPanel();
   BorderLayout borderLayout5 = new BorderLayout();
-  JPanel jPanel6 = new JPanel();
   JLabel label = new JLabel();
+  protected JPanel casePanel = new JPanel();
+  protected JCheckBox caseSensitive = new JCheckBox();
+  protected JButton lcaseColour = new JButton();
   /**
      * Creates a new GUserDefinedColours object.
      */
@@ -70,6 +72,7 @@ public class GUserDefinedColours extends JPanel
         {
             e.printStackTrace();
         }
+
     }
 
     /**
@@ -82,7 +85,7 @@ public class GUserDefinedColours extends JPanel
         this.setLayout(borderLayout4);
         buttonPanel.setLayout(gridLayout);
         gridLayout.setColumns(4);
-        gridLayout.setRows(6);
+        gridLayout.setRows(5);
         okButton.setFont(new java.awt.Font("Verdana", 0, 11));
         okButton.setText("OK");
         okButton.addActionListener(new java.awt.event.ActionListener()
@@ -129,15 +132,14 @@ public class GUserDefinedColours extends JPanel
                 }
             });
         this.setBackground(new Color(212, 208, 223));
-        jPanel2.setOpaque(false);
-    jPanel2.setLayout(borderLayout3);
+    lowerPanel.setOpaque(false);
+    lowerPanel.setLayout(borderLayout3);
     colorChooser.setOpaque(false);
     jLabel1.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
     jLabel1.setText("Name");
     namePanel.setMinimumSize(new Dimension(300, 31));
     namePanel.setOpaque(false);
     namePanel.setPreferredSize(new Dimension(240, 25));
-    namePanel.setToolTipText("");
     namePanel.setLayout(borderLayout1);
     schemeName.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
     schemeName.setPreferredSize(new Dimension(105, 21));
@@ -145,38 +147,51 @@ public class GUserDefinedColours extends JPanel
     schemeName.setHorizontalAlignment(SwingConstants.CENTER);
     panel1.setLayout(flowLayout1);
     panel1.setOpaque(false);
-    jPanel1.setOpaque(false);
-    jPanel3.setOpaque(false);
+    okCancelPanel.setOpaque(false);
+    saveLoadPanel.setOpaque(false);
     jPanel4.setLayout(borderLayout5);
-    jPanel6.setBackground(Color.pink);
-    jPanel6.setMinimumSize(new Dimension(10, 70));
-    jPanel6.setOpaque(false);
-    jPanel6.setPreferredSize(new Dimension(10, 45));
-    jPanel6.setLayout(null);
     label.setFont(new java.awt.Font("Verdana", Font.ITALIC, 10));
     label.setOpaque(false);
     label.setPreferredSize(new Dimension(260, 34));
     label.setText(
         "<html>Save your colour scheme with a unique name and it will be added " +
         "to the Colour menu.</html>");
+    caseSensitive.setText("Case Sensitive");
+    caseSensitive.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        caseSensitive_actionPerformed(e);
+      }
+    });
+    lcaseColour.setText("Lower Case Colour");
+    lcaseColour.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        lcaseColour_actionPerformed(e);
+      }
+    });
 
-    jPanel3.add(savebutton);
-    jPanel3.add(loadbutton);
-    jPanel1.add(applyButton);
-    jPanel1.add(okButton);
-    jPanel1.add(cancelButton);
-    jPanel2.add(jPanel3, java.awt.BorderLayout.NORTH);
-    jPanel2.add(jPanel1, java.awt.BorderLayout.SOUTH);
+    saveLoadPanel.add(savebutton);
+    saveLoadPanel.add(loadbutton);
+    okCancelPanel.add(applyButton);
+    okCancelPanel.add(okButton);
+    okCancelPanel.add(cancelButton);
+    lowerPanel.add(saveLoadPanel, java.awt.BorderLayout.NORTH);
+    lowerPanel.add(okCancelPanel, java.awt.BorderLayout.SOUTH);
 
     namePanel.add(schemeName, java.awt.BorderLayout.CENTER);
     namePanel.add(jLabel1, java.awt.BorderLayout.WEST);
     panel1.add(namePanel, null);
     panel1.add(buttonPanel, null);
-    panel1.add(jPanel2, null);
+    panel1.add(casePanel);
+    casePanel.add(caseSensitive);
+    casePanel.add(lcaseColour);
+    panel1.add(lowerPanel, null);
     panel1.add(label);
 
     jPanel4.add(panel1, java.awt.BorderLayout.CENTER);
-    jPanel4.add(jPanel6, java.awt.BorderLayout.NORTH);
     this.add(jPanel4, java.awt.BorderLayout.CENTER);
     this.add(colorChooser, java.awt.BorderLayout.EAST);
   }
@@ -225,4 +240,14 @@ public class GUserDefinedColours extends JPanel
     protected void cancelButton_actionPerformed(ActionEvent e)
     {
     }
+
+    public void caseSensitive_actionPerformed(ActionEvent e)
+    {
+
+    }
+
+    public void lcaseColour_actionPerformed(ActionEvent e)
+    {
+
+    }
 }