X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGUserDefinedColours.java;h=131f20235e93c02841268f10e6bf407ea75e17b3;hb=d8d6f16acc71a3929e2fd8ae54a680618f9af8b6;hp=3cd9f517aed5273aa023906f7e843aa330c4485f;hpb=588042b69abf8e60bcc950b24c283933c7dd422f;p=jalview.git

diff --git a/src/jalview/jbgui/GUserDefinedColours.java b/src/jalview/jbgui/GUserDefinedColours.java
index 3cd9f51..131f202 100755
--- a/src/jalview/jbgui/GUserDefinedColours.java
+++ b/src/jalview/jbgui/GUserDefinedColours.java
@@ -24,7 +24,14 @@ import java.awt.event.*;
 import javax.swing.*;
 
 
-public class GUserDefinedColours extends JPanel {
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+public class GUserDefinedColours extends JPanel
+{
     protected JColorChooser colorChooser = new JColorChooser();
     protected JPanel buttonPanel = new JPanel();
     protected GridLayout gridLayout = new GridLayout();
@@ -34,81 +41,190 @@ public class GUserDefinedColours extends JPanel {
     protected JButton loadbutton = new JButton();
     protected JButton savebutton = new JButton();
     protected JButton cancelButton = new JButton();
-    FlowLayout flowLayout1 = new FlowLayout();
-
-    public GUserDefinedColours() {
-        try {
+  JPanel namePanel = new JPanel();
+  JLabel jLabel1 = new JLabel();
+  protected JTextField schemeName = new JTextField();
+  BorderLayout borderLayout1 = new BorderLayout();
+  JPanel panel1 = new JPanel();
+  JPanel jPanel1 = new JPanel();
+  JPanel jPanel3 = new JPanel();
+  BorderLayout borderLayout3 = new BorderLayout();
+  GridBagLayout gridBagLayout1 = new GridBagLayout();
+  BorderLayout borderLayout2 = new BorderLayout();
+  FlowLayout flowLayout1 = new FlowLayout();
+  BorderLayout borderLayout4 = new BorderLayout();
+  JPanel jPanel4 = new JPanel();
+  BorderLayout borderLayout5 = new BorderLayout();
+  JPanel jPanel6 = new JPanel();
+  JTextArea jTextArea1 = new JTextArea();
+  /**
+     * Creates a new GUserDefinedColours object.
+     */
+    public GUserDefinedColours()
+    {
+        try
+        {
             jbInit();
-        } catch (Exception e) {
+        }
+        catch (Exception e)
+        {
             e.printStackTrace();
         }
     }
 
-    private void jbInit() throws Exception {
-        this.setLayout(flowLayout1);
+    /**
+     * DOCUMENT ME!
+     *
+     * @throws Exception DOCUMENT ME!
+     */
+    private void jbInit() throws Exception
+    {
+        this.setLayout(borderLayout4);
         buttonPanel.setLayout(gridLayout);
-        gridLayout.setColumns(6);
-        gridLayout.setRows(4);
+        gridLayout.setColumns(4);
+        gridLayout.setRows(6);
         okButton.setFont(new java.awt.Font("Verdana", 0, 11));
         okButton.setText("OK");
-        okButton.addActionListener(new java.awt.event.ActionListener() {
-                public void actionPerformed(ActionEvent e) {
+        okButton.addActionListener(new java.awt.event.ActionListener()
+            {
+                public void actionPerformed(ActionEvent e)
+                {
                     okButton_actionPerformed(e);
                 }
             });
         applyButton.setFont(new java.awt.Font("Verdana", 0, 11));
         applyButton.setText("Apply");
-        applyButton.addActionListener(new java.awt.event.ActionListener() {
-                public void actionPerformed(ActionEvent e) {
+        applyButton.addActionListener(new java.awt.event.ActionListener()
+            {
+                public void actionPerformed(ActionEvent e)
+                {
                     applyButton_actionPerformed(e);
                 }
             });
         loadbutton.setFont(new java.awt.Font("Verdana", 0, 11));
         loadbutton.setText("Load scheme");
-        loadbutton.addActionListener(new java.awt.event.ActionListener() {
-                public void actionPerformed(ActionEvent e) {
+        loadbutton.addActionListener(new java.awt.event.ActionListener()
+            {
+                public void actionPerformed(ActionEvent e)
+                {
                     loadbutton_actionPerformed(e);
                 }
             });
         savebutton.setFont(new java.awt.Font("Verdana", 0, 11));
         savebutton.setText("Save scheme");
-        savebutton.addActionListener(new java.awt.event.ActionListener() {
-                public void actionPerformed(ActionEvent e) {
+        savebutton.addActionListener(new java.awt.event.ActionListener()
+            {
+                public void actionPerformed(ActionEvent e)
+                {
                     savebutton_actionPerformed(e);
                 }
             });
         cancelButton.setFont(new java.awt.Font("Verdana", 0, 11));
         cancelButton.setText("Cancel");
-        cancelButton.addActionListener(new java.awt.event.ActionListener() {
-                public void actionPerformed(ActionEvent e) {
+        cancelButton.addActionListener(new java.awt.event.ActionListener()
+            {
+                public void actionPerformed(ActionEvent e)
+                {
                     cancelButton_actionPerformed(e);
                 }
             });
         this.setBackground(new Color(212, 208, 223));
         jPanel2.setOpaque(false);
-        colorChooser.setOpaque(false);
-        this.add(colorChooser, null);
-        this.add(buttonPanel, null);
-        this.add(jPanel2, null);
-        jPanel2.add(okButton, null);
-        jPanel2.add(applyButton, null);
-        jPanel2.add(loadbutton, null);
-        jPanel2.add(savebutton, null);
-        jPanel2.add(cancelButton, null);
-    }
+    jPanel2.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));
+    schemeName.setText("");
+    schemeName.setHorizontalAlignment(SwingConstants.CENTER);
+    panel1.setLayout(flowLayout1);
+    panel1.setOpaque(false);
+    jPanel1.setOpaque(false);
+    jPanel3.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);
+    jTextArea1.setFont(new java.awt.Font("Verdana", Font.ITALIC, 10));
+    jTextArea1.setOpaque(false);
+    jTextArea1.setPreferredSize(new Dimension(260, 34));
+    jTextArea1.setText(
+        "Save your colour scheme with a unique name and it will be added " +
+        "to the Colour menu.");
+    jTextArea1.setLineWrap(true);
+    jTextArea1.setRows(2);
+    jTextArea1.setWrapStyleWord(true);
+    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);
+
+    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(jTextArea1);
+
+    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);
+  }
 
-    protected void okButton_actionPerformed(ActionEvent e) {
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    protected void okButton_actionPerformed(ActionEvent e)
+    {
     }
 
-    protected void applyButton_actionPerformed(ActionEvent e) {
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    protected void applyButton_actionPerformed(ActionEvent e)
+    {
     }
 
-    protected void loadbutton_actionPerformed(ActionEvent e) {
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    protected void loadbutton_actionPerformed(ActionEvent e)
+    {
     }
 
-    protected void savebutton_actionPerformed(ActionEvent e) {
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    protected void savebutton_actionPerformed(ActionEvent e)
+    {
     }
 
-    protected void cancelButton_actionPerformed(ActionEvent e) {
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    protected void cancelButton_actionPerformed(ActionEvent e)
+    {
     }
 }