Right align as pref

[jalview.git] / src / jalview / jbgui / GUserDefinedColours.java

diff --git a/src/jalview/jbgui/GUserDefinedColours.java b/src/jalview/jbgui/GUserDefinedColours.java
index 8d74445..661b962 100755 (executable)
--- a/src/jalview/jbgui/GUserDefinedColours.java
+++ b/src/jalview/jbgui/GUserDefinedColours.java
@@ -1,6 +1,6 @@
 /*\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
@@ -22,7 +22,7 @@ import java.awt.*;
 import java.awt.event.*;\r
 \r
 import javax.swing.*;\r
-\r
+import java.awt.Dimension;\r
 \r
 /**\r
  * DOCUMENT ME!\r
@@ -35,7 +35,7 @@ public class GUserDefinedColours extends JPanel
     protected JColorChooser colorChooser = new JColorChooser();\r
     protected JPanel buttonPanel = new JPanel();\r
     protected GridLayout gridLayout = new GridLayout();\r
-    JPanel jPanel2 = new JPanel();\r
+    JPanel lowerPanel = new JPanel();\r
     protected JButton okButton = new JButton();\r
     protected JButton applyButton = new JButton();\r
     protected JButton loadbutton = new JButton();\r
@@ -46,8 +46,8 @@ public class GUserDefinedColours extends JPanel
   protected JTextField schemeName = new JTextField();\r
   BorderLayout borderLayout1 = new BorderLayout();\r
   JPanel panel1 = new JPanel();\r
-  JPanel jPanel1 = new JPanel();\r
-  JPanel jPanel3 = new JPanel();\r
+  JPanel okCancelPanel = new JPanel();\r
+  JPanel saveLoadPanel = new JPanel();\r
   BorderLayout borderLayout3 = new BorderLayout();\r
   GridBagLayout gridBagLayout1 = new GridBagLayout();\r
   BorderLayout borderLayout2 = new BorderLayout();\r
@@ -55,8 +55,10 @@ public class GUserDefinedColours extends JPanel
   BorderLayout borderLayout4 = new BorderLayout();\r
   JPanel jPanel4 = new JPanel();\r
   BorderLayout borderLayout5 = new BorderLayout();\r
-  JPanel jPanel6 = new JPanel();\r
   JLabel label = new JLabel();\r
+  protected JPanel casePanel = new JPanel();\r
+  protected JCheckBox caseSensitive = new JCheckBox();\r
+  protected JButton lcaseColour = new JButton();\r
   /**\r
      * Creates a new GUserDefinedColours object.\r
      */\r
@@ -70,6 +72,7 @@ public class GUserDefinedColours extends JPanel
         {\r
             e.printStackTrace();\r
         }\r
+\r
     }\r
 \r
     /**\r
@@ -82,7 +85,7 @@ public class GUserDefinedColours extends JPanel
         this.setLayout(borderLayout4);\r
         buttonPanel.setLayout(gridLayout);\r
         gridLayout.setColumns(4);\r
-        gridLayout.setRows(6);\r
+        gridLayout.setRows(5);\r
         okButton.setFont(new java.awt.Font("Verdana", 0, 11));\r
         okButton.setText("OK");\r
         okButton.addActionListener(new java.awt.event.ActionListener()\r
@@ -129,8 +132,8 @@ public class GUserDefinedColours extends JPanel
                 }\r
             });\r
         this.setBackground(new Color(212, 208, 223));\r
-        jPanel2.setOpaque(false);\r
-    jPanel2.setLayout(borderLayout3);\r
+    lowerPanel.setOpaque(false);\r
+    lowerPanel.setLayout(borderLayout3);\r
     colorChooser.setOpaque(false);\r
     jLabel1.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
     jLabel1.setText("Name");\r
@@ -145,38 +148,51 @@ public class GUserDefinedColours extends JPanel
     schemeName.setHorizontalAlignment(SwingConstants.CENTER);\r
     panel1.setLayout(flowLayout1);\r
     panel1.setOpaque(false);\r
-    jPanel1.setOpaque(false);\r
-    jPanel3.setOpaque(false);\r
+    okCancelPanel.setOpaque(false);\r
+    saveLoadPanel.setOpaque(false);\r
     jPanel4.setLayout(borderLayout5);\r
-    jPanel6.setBackground(Color.pink);\r
-    jPanel6.setMinimumSize(new Dimension(10, 70));\r
-    jPanel6.setOpaque(false);\r
-    jPanel6.setPreferredSize(new Dimension(10, 45));\r
-    jPanel6.setLayout(null);\r
     label.setFont(new java.awt.Font("Verdana", Font.ITALIC, 10));\r
     label.setOpaque(false);\r
     label.setPreferredSize(new Dimension(260, 34));\r
     label.setText(\r
         "<html>Save your colour scheme with a unique name and it will be added " +\r
         "to the Colour menu.</html>");\r
+    caseSensitive.setText("Case Sensitive");\r
+    caseSensitive.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        caseSensitive_actionPerformed(e);\r
+      }\r
+    });\r
+    lcaseColour.setText("Lower Case Colour");\r
+    lcaseColour.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        lcaseColour_actionPerformed(e);\r
+      }\r
+    });\r
 \r
-    jPanel3.add(savebutton);\r
-    jPanel3.add(loadbutton);\r
-    jPanel1.add(applyButton);\r
-    jPanel1.add(okButton);\r
-    jPanel1.add(cancelButton);\r
-    jPanel2.add(jPanel3, java.awt.BorderLayout.NORTH);\r
-    jPanel2.add(jPanel1, java.awt.BorderLayout.SOUTH);\r
+    saveLoadPanel.add(savebutton);\r
+    saveLoadPanel.add(loadbutton);\r
+    okCancelPanel.add(applyButton);\r
+    okCancelPanel.add(okButton);\r
+    okCancelPanel.add(cancelButton);\r
+    lowerPanel.add(saveLoadPanel, java.awt.BorderLayout.NORTH);\r
+    lowerPanel.add(okCancelPanel, java.awt.BorderLayout.SOUTH);\r
 \r
     namePanel.add(schemeName, java.awt.BorderLayout.CENTER);\r
     namePanel.add(jLabel1, java.awt.BorderLayout.WEST);\r
     panel1.add(namePanel, null);\r
     panel1.add(buttonPanel, null);\r
-    panel1.add(jPanel2, null);\r
+    panel1.add(casePanel);\r
+    casePanel.add(caseSensitive);\r
+    casePanel.add(lcaseColour);\r
+    panel1.add(lowerPanel, null);\r
     panel1.add(label);\r
 \r
     jPanel4.add(panel1, java.awt.BorderLayout.CENTER);\r
-    jPanel4.add(jPanel6, java.awt.BorderLayout.NORTH);\r
     this.add(jPanel4, java.awt.BorderLayout.CENTER);\r
     this.add(colorChooser, java.awt.BorderLayout.EAST);\r
   }\r
@@ -225,4 +241,14 @@ public class GUserDefinedColours extends JPanel
     protected void cancelButton_actionPerformed(ActionEvent e)\r
     {\r
     }\r
+\r
+    public void caseSensitive_actionPerformed(ActionEvent e)\r
+    {\r
+\r
+    }\r
+\r
+    public void lcaseColour_actionPerformed(ActionEvent e)\r
+    {\r
+\r
+    }\r
 }\r