No more dbprefix

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index 1e157cd..2243a3d 100755 (executable)
--- 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);\r
         frame.setMinimumSize(new Dimension(480,390));\r
 \r
-        dbRef.setSelected(      Cache.getDefault("SHOW_DBREF", true));\r
         seqLimit.setSelected(    Cache.getDefault("SHOW_JVSUFFIX", true));\r
         fullScreen.setSelected(  Cache.getDefault("SHOW_FULLSCREEN", false));\r
         annotations.setSelected( Cache.getDefault("SHOW_ANNOTATIONS", true));\r
@@ -190,7 +189,6 @@ public class Preferences extends GPreferences
     public void ok_actionPerformed(ActionEvent e)\r
     {\r
 \r
-      Cache.applicationProperties.setProperty("SHOW_DBREF", Boolean.toString(dbRef.isSelected()));\r
       Cache.applicationProperties.setProperty("SHOW_JVSUFFIX", Boolean.toString(seqLimit.isSelected()));\r
       Cache.applicationProperties.setProperty("SHOW_FULLSCREEN", Boolean.toString(fullScreen.isSelected()));\r
 \r

diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index d68c2d5..2001efd 100755 (executable)
--- 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();\r
     protected JCheckBox quality = new JCheckBox();\r
     JPanel visualTab = new JPanel();\r
-    protected JCheckBox dbRef = new JCheckBox();\r
-    protected JCheckBox fullScreen = new JCheckBox();\r
+  protected JCheckBox fullScreen = new JCheckBox();\r
     protected JCheckBox conservation = new JCheckBox();\r
     protected JCheckBox identity = new JCheckBox();\r
     protected JCheckBox annotations = new JCheckBox();\r
@@ -151,11 +150,6 @@ public class GPreferences extends JPanel
         quality.setText("Quality");\r
     visualTab.setBorder(new TitledBorder("Open new alignment"));\r
     visualTab.setLayout(null);\r
-    dbRef.setFont(verdana11);\r
-    dbRef.setHorizontalAlignment(SwingConstants.RIGHT);\r
-    dbRef.setHorizontalTextPosition(SwingConstants.LEFT);\r
-    dbRef.setMargin(new Insets(4, 2, 2, 0));\r
-    dbRef.setText("DB prefix (DB|AccNo)");\r
     fullScreen.setFont(verdana11);\r
         fullScreen.setHorizontalAlignment(SwingConstants.RIGHT);\r
         fullScreen.setHorizontalTextPosition(SwingConstants.LEFT);\r
@@ -354,13 +348,13 @@ public class GPreferences extends JPanel
     pirjv.setFont(verdana11);\r
     pirjv.setHorizontalAlignment(SwingConstants.LEFT);\r
     seqLimit.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    seqLimit.setHorizontalAlignment(SwingConstants.RIGHT);\r
     seqLimit.setHorizontalTextPosition(SwingConstants.LEADING);\r
-    seqLimit.setText("Sequence Limits (/1-350)");\r
-    seqLimit.setBounds(new Rectangle(172, 82, 195, 23));\r
+    seqLimit.setText("Full Sequence Id");\r
     gridLayout3.setRows(8);\r
     jPanel2.add(fullScreen);\r
     jPanel2.add(annotations);\r
-    jPanel2.add(dbRef);\r
+    jPanel2.add(seqLimit);\r
     jPanel2.add(fontLabel);\r
     jPanel2.add(gapLabel);\r
     jPanel2.add(colourLabel);\r
@@ -368,7 +362,6 @@ public class GPreferences extends JPanel
     jPanel2.add(startupCheckbox);\r
     visualTab.add(gapSymbolCB);\r
     visualTab.add(colour);\r
-    visualTab.add(seqLimit);\r
     visualTab.add(jPanel3);\r
     jPanel3.add(conservation);\r
     jPanel3.add(identity);\r