JAL-1528 new Preference CHIMERA_PATH (Preferences | Structure)

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

diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index f3289a3..a232377 100755 (executable)
--- a/src/jalview/jbgui/GPreferences.java
+++ b/src/jalview/jbgui/GPreferences.java
@@ -140,6 +140,8 @@ public class GPreferences extends JPanel
 
   protected JComboBox<String> structViewer = new JComboBox<String>();
 
+  protected JTextField chimeraPath = new JTextField();
+
   /*
    * Colours tab components
    */
@@ -744,11 +746,26 @@ public class GPreferences extends JPanel
     structureTab.add(viewerLabel);
 
     structViewer.setFont(verdana11);
-    structViewer.setBounds(new Rectangle(150, ypos, 120, height));
+    structViewer.setBounds(new Rectangle(160, ypos, 120, height));
     structViewer.addItem(Viewer.JMOL.name());
     structViewer.addItem(Viewer.CHIMERA.name());
     structureTab.add(structViewer);
 
+    ypos += lineSpacing;
+    JLabel pathLabel = new JLabel();
+    pathLabel.setFont(new java.awt.Font("SansSerif", 0, 11));
+    pathLabel.setHorizontalAlignment(SwingConstants.LEFT);
+    pathLabel.setText(MessageManager.getString("label.chimera_path"));
+    pathLabel.setToolTipText(MessageManager
+            .getString("label.chimera_path_tip"));
+    pathLabel.setBounds(new Rectangle(10, ypos, 140, height));
+    structureTab.add(pathLabel);
+
+    chimeraPath.setFont(verdana11);
+    chimeraPath.setText("");
+    chimeraPath.setBounds(new Rectangle(160, ypos, 300, height));
+    structureTab.add(chimeraPath);
+
     return structureTab;
   }
 
@@ -912,9 +929,9 @@ public class GPreferences extends JPanel
     fontLabel.setHorizontalAlignment(SwingConstants.RIGHT);
     fontLabel.setText(MessageManager.getString("label.font"));
     fontSizeCB.setFont(verdana11);
-    fontSizeCB.setBounds(new Rectangle(319, 104, 49, 23));
+    fontSizeCB.setBounds(new Rectangle(320, 104, 65, 23));
     fontStyleCB.setFont(verdana11);
-    fontStyleCB.setBounds(new Rectangle(367, 104, 70, 23));
+    fontStyleCB.setBounds(new Rectangle(382, 104, 80, 23));
     fontNameCB.setFont(verdana11);
     fontNameCB.setBounds(new Rectangle(172, 104, 147, 23));
     gapSymbolCB.setFont(verdana11);
@@ -948,13 +965,13 @@ public class GPreferences extends JPanel
     sortLabel.setHorizontalAlignment(SwingConstants.RIGHT);
     sortLabel.setText(MessageManager.getString("label.sort_by"));
     sortAnnBy.setFont(verdana11);
-    sortAnnBy.setBounds(new Rectangle(172, 265, 120, 21));
+    sortAnnBy.setBounds(new Rectangle(172, 265, 110, 21));
     JLabel sortAnnLabel = new JLabel();
     sortAnnLabel.setFont(verdana11);
     sortAnnLabel.setHorizontalAlignment(SwingConstants.RIGHT);
     sortAnnLabel.setText(MessageManager.getString("label.sort_ann_by"));
     sortAutocalc.setFont(verdana11);
-    sortAutocalc.setBounds(new Rectangle(300, 265, 185, 21));
+    sortAutocalc.setBounds(new Rectangle(290, 265, 165, 21));
     JPanel annsettingsPanel = new JPanel();
     annsettingsPanel.setBounds(new Rectangle(173, 34, 300, 61));
     annsettingsPanel.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));