X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGPreferences.java;h=d2d30911e80bda9f378546e2d816f01f1c947c70;hb=27e04880edb301447f2e57b5156b8c685b853b68;hp=a1ec0a9669f46599e0a60c1a7b147ff828bdce56;hpb=d8d6f16acc71a3929e2fd8ae54a680618f9af8b6;p=jalview.git

diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index a1ec0a9..d2d3091 100755
--- a/src/jalview/jbgui/GPreferences.java
+++ b/src/jalview/jbgui/GPreferences.java
@@ -1,6 +1,6 @@
 /*
 * Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+* Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -24,7 +24,9 @@ import javax.swing.*;
 import javax.swing.border.TitledBorder;
 import java.awt.event.*;
 import javax.swing.event.*;
-
+import java.awt.Font;
+import java.awt.Rectangle;
+import java.awt.Insets;
 
 /**
  * DOCUMENT ME!
@@ -108,6 +110,10 @@ public class GPreferences extends JPanel
   protected JCheckBox autoCalculateConsCheck = new JCheckBox();
   protected JCheckBox padGaps = new JCheckBox();
   protected JCheckBox modellerOutput = new JCheckBox();
+  protected JPanel dasPanel = new JPanel();
+  BorderLayout borderLayout4 = new BorderLayout();
+  protected JCheckBox wrap = new JCheckBox();
+  protected JCheckBox rightAlign = new JCheckBox();
   /**
      * Creates a new GPreferences object.
      */
@@ -175,7 +181,7 @@ public class GPreferences extends JPanel
     annotations.setFont(verdana11);
         annotations.setHorizontalAlignment(SwingConstants.RIGHT);
         annotations.setHorizontalTextPosition(SwingConstants.LEFT);
-    annotations.setMargin(new Insets(2, 4, 2, 0));
+    annotations.setMargin(new Insets(2, 2, 2, 0));
     annotations.setSelected(true);
         annotations.setText("Show Annotations");
     annotations.addActionListener(new ActionListener()
@@ -189,7 +195,7 @@ public class GPreferences extends JPanel
         gapLabel.setHorizontalAlignment(SwingConstants.RIGHT);
         gapLabel.setText("Gap Symbol ");
     colour.setFont(verdana11);
-        colour.setBounds(new Rectangle(171, 180, 155, 21));
+        colour.setBounds(new Rectangle(172, 203, 155, 21));
         colourLabel.setFont(verdana11);
         colourLabel.setHorizontalAlignment(SwingConstants.RIGHT);
         colourLabel.setText("Colour ");
@@ -197,20 +203,20 @@ public class GPreferences extends JPanel
         fontLabel.setHorizontalAlignment(SwingConstants.RIGHT);
         fontLabel.setText("Font ");
     fontSizeCB.setFont(verdana11);
-        fontSizeCB.setBounds(new Rectangle(318, 100, 49, 21));
+        fontSizeCB.setBounds(new Rectangle(319, 111, 49, 21));
         fontStyleCB.setFont(verdana11);
-        fontStyleCB.setBounds(new Rectangle(366, 100, 70, 21));
+        fontStyleCB.setBounds(new Rectangle(367, 111, 70, 21));
         fontNameCB.setFont(verdana11);
-        fontNameCB.setBounds(new Rectangle(171, 100, 147, 21));
+        fontNameCB.setBounds(new Rectangle(172, 111, 147, 21));
         gapSymbolCB.setFont(verdana11);
-        gapSymbolCB.setBounds(new Rectangle(171, 153, 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)
@@ -308,14 +314,14 @@ public class GPreferences extends JPanel
     jPanel1.setBorder(titledBorder1);
     jPanel1.setLayout(gridBagLayout1);
     sortby.setFont(verdana11);
-    sortby.setBounds(new Rectangle(171, 208, 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(9);
-    jPanel3.setBounds(new Rectangle(167, 41, 274, 26));
+    gridLayout2.setRows(11);
+    jPanel3.setBounds(new Rectangle(169, 39, 274, 26));
     exportTab.setLayout(null);
     epsLabel.setFont(verdana11);
     epsLabel.setHorizontalAlignment(SwingConstants.RIGHT);
@@ -355,6 +361,7 @@ 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);
@@ -371,23 +378,34 @@ public class GPreferences extends JPanel
     modellerOutput.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
     modellerOutput.setText("Use Modeller Output");
     modellerOutput.setBounds(new Rectangle(228, 226, 168, 23));
+    dasPanel.setLayout(borderLayout4);
+    wrap.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
+    wrap.setHorizontalAlignment(SwingConstants.TRAILING);
+    wrap.setHorizontalTextPosition(SwingConstants.LEADING);
+    wrap.setText("Wrap Alignment");
+    rightAlign.setForeground(Color.black);
+    rightAlign.setHorizontalAlignment(SwingConstants.RIGHT);
+    rightAlign.setHorizontalTextPosition(SwingConstants.LEADING);
+    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);
     jPanel2.add(gapLabel);
     jPanel2.add(colourLabel);
     jPanel2.add(sortLabel);
     jPanel2.add(startupCheckbox);
-    visualTab.add(colour);
-    visualTab.add(gapSymbolCB);
-    visualTab.add(startupFileTextfield);
-    visualTab.add(sortby);
     visualTab.add(fontNameCB);
     visualTab.add(fontSizeCB);
     visualTab.add(fontStyleCB);
+    visualTab.add(startupFileTextfield);
+    visualTab.add(gapSymbolCB);
+    visualTab.add(colour);
+    visualTab.add(sortby);
     visualTab.add(jPanel3);
     jPanel3.add(conservation);
     jPanel3.add(identity);
@@ -457,6 +475,7 @@ public class GPreferences extends JPanel
     tabbedPane.add(calcTab, "Editing");
     calcTab.add(autoCalculateConsCheck);
     calcTab.add(padGaps);
+    tabbedPane.add(dasPanel, "DAS Settings");
 
     exportTab.add(epsLabel);
     exportTab.add(epsRendering);