Merge commit

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

diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index bec4cdb..1d35477 100755 (executable)
--- a/src/jalview/jbgui/GPreferences.java
+++ b/src/jalview/jbgui/GPreferences.java
@@ -22,6 +22,7 @@ package jalview.jbgui;
 
 import jalview.gui.JvSwingUtils;
 import jalview.gui.StructureViewer.ViewerType;
+import jalview.jbgui.PDBDocFieldPreferences.PreferenceSource;
 import jalview.util.MessageManager;
 
 import java.awt.BorderLayout;
@@ -149,6 +150,7 @@ public class GPreferences extends JPanel
 
   protected JTextField chimeraPath = new JTextField();
 
+
   /*
    * Colours tab components
    */
@@ -745,8 +747,8 @@ public class GPreferences extends JPanel
             .getString("label.structure_options")));
     structureTab.setLayout(null);
     final int width = 400;
-    final int height = 23;
-    final int lineSpacing = 30;
+    final int height = 22;
+    final int lineSpacing = 25;
     int ypos = 30;
 
     structFromPdb.setFont(verdana11);
@@ -840,9 +842,23 @@ public class GPreferences extends JPanel
     });
     structureTab.add(chimeraPath);
 
+    ypos += lineSpacing;
+    // scrl_pdbDocFieldConfig.setPreferredSize(new Dimension(450, 100));
+    // scrl_pdbDocFieldConfig
+    // .setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+    // scrl_pdbDocFieldConfig.setBounds();
+    PDBDocFieldPreferences docFieldPref = new PDBDocFieldPreferences(
+            PreferenceSource.PREFERENCES);
+    docFieldPref.setBounds(new Rectangle(10, ypos + 5, 450, 120));
+    structureTab.add(docFieldPref);
+
+
+
+
     return structureTab;
   }
 
+
   /**
    * Action on choosing a structure viewer from combobox options.
    *