X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGStructureChooser.java;h=5af9cecb1cb6341134286fbee50f91f33d3d3fd3;hb=d3ac600aefbd927a1c6dafb8eca069b966a99c52;hp=834e8734bb8647e2fbf630e2d487147edd1760fe;hpb=44ac7ea37b8cb3d4562a5575ddadba296d649a7a;p=jalview.git

diff --git a/src/jalview/jbgui/GStructureChooser.java b/src/jalview/jbgui/GStructureChooser.java
index 834e873..5af9cec 100644
--- a/src/jalview/jbgui/GStructureChooser.java
+++ b/src/jalview/jbgui/GStructureChooser.java
@@ -42,6 +42,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.swing.BoxLayout;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
@@ -73,6 +74,8 @@ import jalview.gui.AlignmentPanel;
 import jalview.gui.Desktop;
 import jalview.gui.JvSwingUtils;
 import jalview.gui.StructureViewer;
+import jalview.structure.StructureImportSettings;
+import jalview.structure.StructureImportSettings.TFType;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
 import net.miginfocom.swing.MigLayout;
@@ -121,6 +124,10 @@ public abstract class GStructureChooser extends JPanel
 
   protected JButton btn_pdbFromFile = new JButton();
 
+  protected JComboBox<StructureImportSettings.TFType> combo_tempFacAs = new JComboBox<>();
+
+  protected JButton btn_paeMatrixFile = new JButton();
+
   // holder for icon and button
   protected JPanel pnl_queryTDB;
 
@@ -547,6 +554,23 @@ public abstract class GStructureChooser extends JPanel
       }
     });
 
+    JLabel lbl_chooseTempFacType = new JLabel(new StringBuilder()
+            .append(MessageManager.getString("label.choose_tempfac_type"))
+            .append(" ").append("label.optional").toString());
+
+    for (TFType t : TFType.values())
+    {
+      combo_tempFacAs.addItem(t);
+    }
+    // add changelistener
+
+    btn_paeMatrixFile.setText(new StringBuilder()
+            .append(MessageManager.getString("label.add_pae_matrix_file"))
+            .append(" ").append(MessageManager.getString("label.optional"))
+            .toString());
+    ;
+    // add actionlistener
+
     JScrollPane scrl_foundStructures = new JScrollPane(tbl_summary);
     scrl_foundStructures.setPreferredSize(new Dimension(width, height));
 
@@ -642,9 +666,18 @@ public abstract class GStructureChooser extends JPanel
     JPanel pnl_fileChooser = new JPanel(new FlowLayout());
     pnl_fileChooser.add(btn_pdbFromFile);
     pnl_fileChooser.add(lbl_fromFileStatus);
+
+    JPanel pnl_pdbOptions = new JPanel();
+    pnl_pdbOptions
+            .setLayout(new BoxLayout(pnl_pdbOptions, BoxLayout.PAGE_AXIS));
+    pnl_pdbOptions.add(lbl_chooseTempFacType);
+    pnl_pdbOptions.add(combo_tempFacAs);
+    pnl_pdbOptions.add(btn_paeMatrixFile);
+
     JPanel pnl_fileChooserBL = new JPanel(new BorderLayout());
-    pnl_fileChooserBL.add(fileChooserAssSeqPanel, BorderLayout.NORTH);
+    pnl_fileChooserBL.add(fileChooserAssSeqPanel, BorderLayout.PAGE_START);
     pnl_fileChooserBL.add(pnl_fileChooser, BorderLayout.CENTER);
+    // pnl_fileChooserBL.add(pnl_pdbOptions, BorderLayout.PAGE_END);
 
     JPanel pnl_idInput = new JPanel(new FlowLayout());
     pnl_idInput.add(txt_search);