2.08, not 2.07

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

diff --git a/src/jalview/jbgui/GUserDefinedColours.java b/src/jalview/jbgui/GUserDefinedColours.java
index 49174a0..131f202 100755 (executable)
--- a/src/jalview/jbgui/GUserDefinedColours.java
+++ b/src/jalview/jbgui/GUserDefinedColours.java
@@ -41,9 +41,23 @@ public class GUserDefinedColours extends JPanel
     protected JButton loadbutton = new JButton();\r
     protected JButton savebutton = new JButton();\r
     protected JButton cancelButton = new JButton();\r
-    FlowLayout flowLayout1 = new FlowLayout();\r
-\r
-    /**\r
+  JPanel namePanel = new JPanel();\r
+  JLabel jLabel1 = new JLabel();\r
+  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
+  BorderLayout borderLayout3 = new BorderLayout();\r
+  GridBagLayout gridBagLayout1 = new GridBagLayout();\r
+  BorderLayout borderLayout2 = new BorderLayout();\r
+  FlowLayout flowLayout1 = new FlowLayout();\r
+  BorderLayout borderLayout4 = new BorderLayout();\r
+  JPanel jPanel4 = new JPanel();\r
+  BorderLayout borderLayout5 = new BorderLayout();\r
+  JPanel jPanel6 = new JPanel();\r
+  JTextArea jTextArea1 = new JTextArea();\r
+  /**\r
      * Creates a new GUserDefinedColours object.\r
      */\r
     public GUserDefinedColours()\r
@@ -65,10 +79,10 @@ public class GUserDefinedColours extends JPanel
      */\r
     private void jbInit() throws Exception\r
     {\r
-        this.setLayout(flowLayout1);\r
+        this.setLayout(borderLayout4);\r
         buttonPanel.setLayout(gridLayout);\r
-        gridLayout.setColumns(6);\r
-        gridLayout.setRows(4);\r
+        gridLayout.setColumns(4);\r
+        gridLayout.setRows(6);\r
         okButton.setFont(new java.awt.Font("Verdana", 0, 11));\r
         okButton.setText("OK");\r
         okButton.addActionListener(new java.awt.event.ActionListener()\r
@@ -116,16 +130,58 @@ public class GUserDefinedColours extends JPanel
             });\r
         this.setBackground(new Color(212, 208, 223));\r
         jPanel2.setOpaque(false);\r
-        colorChooser.setOpaque(false);\r
-        this.add(colorChooser, null);\r
-        this.add(buttonPanel, null);\r
-        this.add(jPanel2, null);\r
-        jPanel2.add(okButton, null);\r
-        jPanel2.add(applyButton, null);\r
-        jPanel2.add(loadbutton, null);\r
-        jPanel2.add(savebutton, null);\r
-        jPanel2.add(cancelButton, null);\r
-    }\r
+    jPanel2.setLayout(borderLayout3);\r
+    colorChooser.setOpaque(false);\r
+    jLabel1.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    jLabel1.setText("Name");\r
+    namePanel.setMinimumSize(new Dimension(300, 31));\r
+    namePanel.setOpaque(false);\r
+    namePanel.setPreferredSize(new Dimension(240, 25));\r
+    namePanel.setToolTipText("");\r
+    namePanel.setLayout(borderLayout1);\r
+    schemeName.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    schemeName.setPreferredSize(new Dimension(105, 21));\r
+    schemeName.setText("");\r
+    schemeName.setHorizontalAlignment(SwingConstants.CENTER);\r
+    panel1.setLayout(flowLayout1);\r
+    panel1.setOpaque(false);\r
+    jPanel1.setOpaque(false);\r
+    jPanel3.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
+    jTextArea1.setFont(new java.awt.Font("Verdana", Font.ITALIC, 10));\r
+    jTextArea1.setOpaque(false);\r
+    jTextArea1.setPreferredSize(new Dimension(260, 34));\r
+    jTextArea1.setText(\r
+        "Save your colour scheme with a unique name and it will be added " +\r
+        "to the Colour menu.");\r
+    jTextArea1.setLineWrap(true);\r
+    jTextArea1.setRows(2);\r
+    jTextArea1.setWrapStyleWord(true);\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
+\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(jTextArea1);\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
 \r
     /**\r
      * DOCUMENT ME!\r