Align boxes

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

diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index 27a54d7..bc4a37b 100755 (executable)
--- a/src/jalview/jbgui/GPreferences.java
+++ b/src/jalview/jbgui/GPreferences.java
@@ -113,6 +113,7 @@ public class GPreferences extends JPanel
   protected JPanel dasPanel = new JPanel();\r
   BorderLayout borderLayout4 = new BorderLayout();\r
   protected JCheckBox wrap = new JCheckBox();\r
+  protected JCheckBox rightAlign = new JCheckBox();\r
   /**\r
      * Creates a new GPreferences object.\r
      */\r
@@ -163,7 +164,6 @@ public class GPreferences extends JPanel
     fullScreen.setFont(verdana11);\r
         fullScreen.setHorizontalAlignment(SwingConstants.RIGHT);\r
         fullScreen.setHorizontalTextPosition(SwingConstants.LEFT);\r
-    fullScreen.setMargin(new Insets(2, 2, 2, 0));\r
     fullScreen.setText("Maximise Window");\r
     conservation.setEnabled(false);\r
         conservation.setFont(verdana11);\r
@@ -180,7 +180,6 @@ public class GPreferences extends JPanel
     annotations.setFont(verdana11);\r
         annotations.setHorizontalAlignment(SwingConstants.RIGHT);\r
         annotations.setHorizontalTextPosition(SwingConstants.LEFT);\r
-    annotations.setMargin(new Insets(2, 2, 2, 0));\r
     annotations.setSelected(true);\r
         annotations.setText("Show Annotations");\r
     annotations.addActionListener(new ActionListener()\r
@@ -194,7 +193,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, 188, 155, 21));\r
+        colour.setBounds(new Rectangle(172, 203, 155, 21));\r
         colourLabel.setFont(verdana11);\r
         colourLabel.setHorizontalAlignment(SwingConstants.RIGHT);\r
         colourLabel.setText("Colour ");\r
@@ -202,20 +201,20 @@ public class GPreferences extends JPanel
         fontLabel.setHorizontalAlignment(SwingConstants.RIGHT);\r
         fontLabel.setText("Font ");\r
     fontSizeCB.setFont(verdana11);\r
-        fontSizeCB.setBounds(new Rectangle(317, 92, 49, 21));\r
+        fontSizeCB.setBounds(new Rectangle(319, 111, 49, 21));\r
         fontStyleCB.setFont(verdana11);\r
-        fontStyleCB.setBounds(new Rectangle(364, 92, 70, 21));\r
+        fontStyleCB.setBounds(new Rectangle(367, 111, 70, 21));\r
         fontNameCB.setFont(verdana11);\r
-        fontNameCB.setBounds(new Rectangle(171, 92, 147, 21));\r
+        fontNameCB.setBounds(new Rectangle(172, 111, 147, 21));\r
         gapSymbolCB.setFont(verdana11);\r
-        gapSymbolCB.setBounds(new Rectangle(172, 163, 69, 21));\r
+        gapSymbolCB.setBounds(new Rectangle(172, 179, 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(171, 236, 270, 20));\r
+        startupFileTextfield.setBounds(new Rectangle(172, 249, 270, 20));\r
         startupFileTextfield.addMouseListener(new MouseAdapter()\r
             {\r
                 public void mouseClicked(MouseEvent e)\r
@@ -313,13 +312,13 @@ public class GPreferences extends JPanel
     jPanel1.setBorder(titledBorder1);\r
     jPanel1.setLayout(gridBagLayout1);\r
     sortby.setFont(verdana11);\r
-    sortby.setBounds(new Rectangle(171, 213, 155, 21));\r
+    sortby.setBounds(new Rectangle(172, 225, 155, 21));\r
     sortLabel.setFont(verdana11);\r
     sortLabel.setHorizontalAlignment(SwingConstants.RIGHT);\r
     sortLabel.setText("Sort by ");\r
-    jPanel2.setBounds(new Rectangle(7, 17, 158, 245));\r
+    jPanel2.setBounds(new Rectangle(7, 17, 158, 257));\r
     jPanel2.setLayout(gridLayout2);\r
-    gridLayout2.setRows(10);\r
+    gridLayout2.setRows(11);\r
     jPanel3.setBounds(new Rectangle(169, 39, 274, 26));\r
     exportTab.setLayout(null);\r
     epsLabel.setFont(verdana11);\r
@@ -360,7 +359,6 @@ public class GPreferences extends JPanel
     seqLimit.setFont(verdana11);\r
     seqLimit.setHorizontalAlignment(SwingConstants.RIGHT);\r
     seqLimit.setHorizontalTextPosition(SwingConstants.LEFT);\r
-    seqLimit.setMargin(new Insets(2, 2, 2, 0));\r
     seqLimit.setText("Full Sequence Id");\r
     gridLayout3.setRows(8);\r
     smoothFont.setFont(verdana11);\r
@@ -382,10 +380,16 @@ public class GPreferences extends JPanel
     wrap.setHorizontalAlignment(SwingConstants.TRAILING);\r
     wrap.setHorizontalTextPosition(SwingConstants.LEADING);\r
     wrap.setText("Wrap Alignment");\r
+    rightAlign.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    rightAlign.setForeground(Color.black);\r
+    rightAlign.setHorizontalAlignment(SwingConstants.RIGHT);\r
+    rightAlign.setHorizontalTextPosition(SwingConstants.LEFT);\r
+    rightAlign.setText("Right Align Ids");\r
     jPanel2.add(fullScreen);\r
 \r
     jPanel2.add(annotations);\r
     jPanel2.add(seqLimit);\r
+    jPanel2.add(rightAlign);\r
     jPanel2.add(fontLabel);\r
     jPanel2.add(smoothFont);\r
     jPanel2.add(wrap);\r
@@ -393,14 +397,14 @@ public class GPreferences extends JPanel
     jPanel2.add(colourLabel);\r
     jPanel2.add(sortLabel);\r
     jPanel2.add(startupCheckbox);\r
-    visualTab.add(sortby);\r
-    visualTab.add(gapSymbolCB);\r
-    visualTab.add(colour);\r
     visualTab.add(fontNameCB);\r
     visualTab.add(fontSizeCB);\r
     visualTab.add(fontStyleCB);\r
-    visualTab.add(jPanel3);\r
     visualTab.add(startupFileTextfield);\r
+    visualTab.add(gapSymbolCB);\r
+    visualTab.add(colour);\r
+    visualTab.add(sortby);\r
+    visualTab.add(jPanel3);\r
     jPanel3.add(conservation);\r
     jPanel3.add(identity);\r
     jPanel3.add(quality);\r