spelling err

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

diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index 02756f1..a1ec0a9 100755 (executable)
--- a/src/jalview/jbgui/GPreferences.java
+++ b/src/jalview/jbgui/GPreferences.java
@@ -104,6 +104,10 @@ public class GPreferences extends JPanel
   protected JCheckBox seqLimit = new JCheckBox();\r
   GridLayout gridLayout3 = new GridLayout();\r
   protected JCheckBox smoothFont = new JCheckBox();\r
+  JPanel calcTab = new JPanel();\r
+  protected JCheckBox autoCalculateConsCheck = new JCheckBox();\r
+  protected JCheckBox padGaps = new JCheckBox();\r
+  protected JCheckBox modellerOutput = new JCheckBox();\r
   /**\r
      * Creates a new GPreferences object.\r
      */\r
@@ -185,7 +189,7 @@ public class GPreferences extends JPanel
         gapLabel.setHorizontalAlignment(SwingConstants.RIGHT);\r
         gapLabel.setText("Gap Symbol ");\r
     colour.setFont(verdana11);\r
-        colour.setBounds(new Rectangle(172, 180, 155, 21));\r
+        colour.setBounds(new Rectangle(171, 180, 155, 21));\r
         colourLabel.setFont(verdana11);\r
         colourLabel.setHorizontalAlignment(SwingConstants.RIGHT);\r
         colourLabel.setText("Colour ");\r
@@ -199,14 +203,14 @@ public class GPreferences extends JPanel
         fontNameCB.setFont(verdana11);\r
         fontNameCB.setBounds(new Rectangle(171, 100, 147, 21));\r
         gapSymbolCB.setFont(verdana11);\r
-        gapSymbolCB.setBounds(new Rectangle(172, 153, 69, 21));\r
+        gapSymbolCB.setBounds(new Rectangle(171, 153, 69, 21));\r
         startupCheckbox.setText("Open file");\r
     startupCheckbox.setFont(verdana11);\r
         startupCheckbox.setHorizontalAlignment(SwingConstants.RIGHT);\r
         startupCheckbox.setHorizontalTextPosition(SwingConstants.LEFT);\r
         startupCheckbox.setSelected(true);\r
         startupFileTextfield.setFont(verdana11);\r
-        startupFileTextfield.setBounds(new Rectangle(170, 236, 271, 20));\r
+        startupFileTextfield.setBounds(new Rectangle(171, 236, 270, 20));\r
         startupFileTextfield.addMouseListener(new MouseAdapter()\r
             {\r
                 public void mouseClicked(MouseEvent e)\r
@@ -308,7 +312,7 @@ public class GPreferences extends JPanel
     sortLabel.setFont(verdana11);\r
     sortLabel.setHorizontalAlignment(SwingConstants.RIGHT);\r
     sortLabel.setText("Sort by ");\r
-    jPanel2.setBounds(new Rectangle(7, 17, 158, 246));\r
+    jPanel2.setBounds(new Rectangle(7, 17, 158, 245));\r
     jPanel2.setLayout(gridLayout2);\r
     gridLayout2.setRows(9);\r
     jPanel3.setBounds(new Rectangle(167, 41, 274, 26));\r
@@ -350,13 +354,23 @@ public class GPreferences extends JPanel
     pirjv.setHorizontalAlignment(SwingConstants.LEFT);\r
     seqLimit.setFont(verdana11);\r
     seqLimit.setHorizontalAlignment(SwingConstants.RIGHT);\r
-    seqLimit.setHorizontalTextPosition(SwingConstants.LEADING);\r
+    seqLimit.setHorizontalTextPosition(SwingConstants.LEFT);\r
     seqLimit.setText("Full Sequence Id");\r
     gridLayout3.setRows(8);\r
     smoothFont.setFont(verdana11);\r
     smoothFont.setHorizontalAlignment(SwingConstants.RIGHT);\r
     smoothFont.setHorizontalTextPosition(SwingConstants.LEADING);\r
     smoothFont.setText("Smooth Font");\r
+    calcTab.setLayout(null);\r
+    autoCalculateConsCheck.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    autoCalculateConsCheck.setText("AutoCalculate Consensus");\r
+    autoCalculateConsCheck.setBounds(new Rectangle(21, 52, 209, 23));\r
+    padGaps.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    padGaps.setText("Pad gaps when editing");\r
+    padGaps.setBounds(new Rectangle(22, 94, 168, 23));\r
+    modellerOutput.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    modellerOutput.setText("Use Modeller Output");\r
+    modellerOutput.setBounds(new Rectangle(228, 226, 168, 23));\r
     jPanel2.add(fullScreen);\r
 \r
     jPanel2.add(annotations);\r
@@ -367,10 +381,10 @@ public class GPreferences extends JPanel
     jPanel2.add(colourLabel);\r
     jPanel2.add(sortLabel);\r
     jPanel2.add(startupCheckbox);\r
-    visualTab.add(startupFileTextfield);\r
-    visualTab.add(sortby);\r
     visualTab.add(colour);\r
     visualTab.add(gapSymbolCB);\r
+    visualTab.add(startupFileTextfield);\r
+    visualTab.add(sortby);\r
     visualTab.add(fontNameCB);\r
     visualTab.add(fontSizeCB);\r
     visualTab.add(fontStyleCB);\r
@@ -428,7 +442,7 @@ public class GPreferences extends JPanel
         dlcr.setHorizontalAlignment(DefaultListCellRenderer.CENTER);\r
         gapSymbolCB.setRenderer(dlcr);\r
 \r
-    tabbedPane.add(visualTab, "visualTab");\r
+    tabbedPane.add(visualTab, "Visual");\r
     tabbedPane.add(connectTab,"Connections");\r
     tabbedPane.add(exportTab, "Output");\r
     jPanel11.add(jLabel1);\r
@@ -439,6 +453,10 @@ public class GPreferences extends JPanel
     jPanel11.add(pfamjv);\r
     jPanel11.add(pileupjv);\r
     jPanel11.add(pirjv);\r
+    exportTab.add(modellerOutput);\r
+    tabbedPane.add(calcTab, "Editing");\r
+    calcTab.add(autoCalculateConsCheck);\r
+    calcTab.add(padGaps);\r
 \r
     exportTab.add(epsLabel);\r
     exportTab.add(epsRendering);\r