From: amwaterhouse <Andrew Waterhouse>
Date: Mon, 5 Dec 2005 16:30:50 +0000 (+0000)
Subject: No more dbprefix
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e21fb8306a9efaf170d7354daa10e7ee42d37c17;p=jalview.git

No more dbprefix
---

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index 1e157cd..2243a3d 100755
--- a/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@ -79,7 +79,6 @@ public class Preferences extends GPreferences
         Desktop.addInternalFrame(frame, "Preferences", 480, 390);
         frame.setMinimumSize(new Dimension(480,390));
 
-        dbRef.setSelected(      Cache.getDefault("SHOW_DBREF", true));
         seqLimit.setSelected(    Cache.getDefault("SHOW_JVSUFFIX", true));
         fullScreen.setSelected(  Cache.getDefault("SHOW_FULLSCREEN", false));
         annotations.setSelected( Cache.getDefault("SHOW_ANNOTATIONS", true));
@@ -190,7 +189,6 @@ public class Preferences extends GPreferences
     public void ok_actionPerformed(ActionEvent e)
     {
 
-      Cache.applicationProperties.setProperty("SHOW_DBREF", Boolean.toString(dbRef.isSelected()));
       Cache.applicationProperties.setProperty("SHOW_JVSUFFIX", Boolean.toString(seqLimit.isSelected()));
       Cache.applicationProperties.setProperty("SHOW_FULLSCREEN", Boolean.toString(fullScreen.isSelected()));
 
diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index d68c2d5..2001efd 100755
--- a/src/jalview/jbgui/GPreferences.java
+++ b/src/jalview/jbgui/GPreferences.java
@@ -42,8 +42,7 @@ public class GPreferences extends JPanel
     BorderLayout borderLayout1 = new BorderLayout();
     protected JCheckBox quality = new JCheckBox();
     JPanel visualTab = new JPanel();
-    protected JCheckBox dbRef = new JCheckBox();
-    protected JCheckBox fullScreen = new JCheckBox();
+  protected JCheckBox fullScreen = new JCheckBox();
     protected JCheckBox conservation = new JCheckBox();
     protected JCheckBox identity = new JCheckBox();
     protected JCheckBox annotations = new JCheckBox();
@@ -151,11 +150,6 @@ public class GPreferences extends JPanel
         quality.setText("Quality");
     visualTab.setBorder(new TitledBorder("Open new alignment"));
     visualTab.setLayout(null);
-    dbRef.setFont(verdana11);
-    dbRef.setHorizontalAlignment(SwingConstants.RIGHT);
-    dbRef.setHorizontalTextPosition(SwingConstants.LEFT);
-    dbRef.setMargin(new Insets(4, 2, 2, 0));
-    dbRef.setText("DB prefix (DB|AccNo)");
     fullScreen.setFont(verdana11);
         fullScreen.setHorizontalAlignment(SwingConstants.RIGHT);
         fullScreen.setHorizontalTextPosition(SwingConstants.LEFT);
@@ -354,13 +348,13 @@ public class GPreferences extends JPanel
     pirjv.setFont(verdana11);
     pirjv.setHorizontalAlignment(SwingConstants.LEFT);
     seqLimit.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
+    seqLimit.setHorizontalAlignment(SwingConstants.RIGHT);
     seqLimit.setHorizontalTextPosition(SwingConstants.LEADING);
-    seqLimit.setText("Sequence Limits (/1-350)");
-    seqLimit.setBounds(new Rectangle(172, 82, 195, 23));
+    seqLimit.setText("Full Sequence Id");
     gridLayout3.setRows(8);
     jPanel2.add(fullScreen);
     jPanel2.add(annotations);
-    jPanel2.add(dbRef);
+    jPanel2.add(seqLimit);
     jPanel2.add(fontLabel);
     jPanel2.add(gapLabel);
     jPanel2.add(colourLabel);
@@ -368,7 +362,6 @@ public class GPreferences extends JPanel
     jPanel2.add(startupCheckbox);
     visualTab.add(gapSymbolCB);
     visualTab.add(colour);
-    visualTab.add(seqLimit);
     visualTab.add(jPanel3);
     jPanel3.add(conservation);
     jPanel3.add(identity);