X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fjbgui%2FGPreferences.java;h=bc4a37b09350bd129105af366dfd47da8bcd355d;hb=b0a90dcb797054f5e01a3b10969e782ef3aafa4a;hp=27a54d774e51e59eef3d5ad2d5ab3afd816570e9;hpb=174230b4233d9ce80f94527768d2cd2f76da11ab;p=jalview.git

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