*/
package jalview.jbgui;
+import jalview.fts.core.FTSDataColumnPreferences;
+import jalview.fts.core.FTSDataColumnPreferences.PreferenceSource;
+import jalview.fts.service.pdb.PDBFTSRestClient;
import jalview.gui.JvSwingUtils;
import jalview.gui.StructureViewer.ViewerType;
-import jalview.jbgui.PDBDocFieldPreferences.PreferenceSource;
import jalview.util.MessageManager;
import java.awt.BorderLayout;
protected JCheckBox wrap = new JCheckBox();
- protected JCheckBox hideIntrons = new JCheckBox();
-
protected JComboBox<String> sortby = new JComboBox<String>();
protected JComboBox<String> sortAnnBy = new JComboBox<String>();
ypos += lineSpacing;
ypos += lineSpacing;
- PDBDocFieldPreferences docFieldPref = new PDBDocFieldPreferences(
- PreferenceSource.PREFERENCES);
+ FTSDataColumnPreferences docFieldPref = new FTSDataColumnPreferences(
+ PreferenceSource.PREFERENCES, PDBFTSRestClient.getInstance());
docFieldPref.setBounds(new Rectangle(10, ypos, 450, 120));
structureTab.add(docFieldPref);
startupCheckbox.setHorizontalTextPosition(SwingConstants.LEFT);
startupCheckbox.setSelected(true);
startupFileTextfield.setFont(LABEL_FONT);
- startupFileTextfield.setBounds(new Rectangle(173, 328, 330, 20));
+ startupFileTextfield.setBounds(new Rectangle(172, 310, 330, 20));
startupFileTextfield.addMouseListener(new MouseAdapter()
{
@Override
});
sortby.setFont(LABEL_FONT);
- sortby.setBounds(new Rectangle(172, 280, 155, 20));
+ sortby.setBounds(new Rectangle(172, 260, 155, 21));
JLabel sortLabel = new JLabel();
sortLabel.setFont(LABEL_FONT);
sortLabel.setHorizontalAlignment(SwingConstants.RIGHT);
sortLabel.setText(MessageManager.getString("label.sort_by"));
sortAnnBy.setFont(LABEL_FONT);
- sortAnnBy.setBounds(new Rectangle(172, 305, 110, 20));
+ sortAnnBy.setBounds(new Rectangle(172, 285, 110, 21));
JLabel sortAnnLabel = new JLabel();
sortAnnLabel.setFont(LABEL_FONT);
sortAnnLabel.setHorizontalAlignment(SwingConstants.RIGHT);
sortAnnLabel.setText(MessageManager.getString("label.sort_ann_by"));
sortAutocalc.setFont(LABEL_FONT);
- sortAutocalc.setBounds(new Rectangle(290, 305, 165, 20));
+ sortAutocalc.setBounds(new Rectangle(290, 285, 165, 21));
JPanel annsettingsPanel = new JPanel();
annsettingsPanel.setBounds(new Rectangle(173, 34, 320, 75));
wrap.setHorizontalAlignment(SwingConstants.TRAILING);
wrap.setHorizontalTextPosition(SwingConstants.LEADING);
wrap.setText(MessageManager.getString("label.wrap_alignment"));
- hideIntrons.setFont(LABEL_FONT);
- hideIntrons.setHorizontalAlignment(SwingConstants.TRAILING);
- hideIntrons.setHorizontalTextPosition(SwingConstants.LEADING);
- hideIntrons.setText(MessageManager.getString("label.hide_introns"));
- hideIntrons.setToolTipText(MessageManager
- .getString("label.hide_introns_tip"));
rightAlign.setFont(LABEL_FONT);
rightAlign.setForeground(Color.black);
rightAlign.setHorizontalAlignment(SwingConstants.RIGHT);
openoverv.setHorizontalTextPosition(SwingConstants.LEFT);
openoverv.setText(MessageManager.getString(("label.open_overview")));
JPanel jPanel2 = new JPanel();
- jPanel2.setBounds(new Rectangle(7, 17, 158, 330));
- jPanel2.setLayout(new GridLayout(15, 1));
+ jPanel2.setBounds(new Rectangle(7, 17, 158, 310));
+ jPanel2.setLayout(new GridLayout(14, 1));
jPanel2.add(fullScreen);
jPanel2.add(openoverv);
jPanel2.add(seqLimit);
jPanel2.add(scaleProteinToCdna);
jPanel2.add(gapLabel);
jPanel2.add(wrap);
- jPanel2.add(hideIntrons);
jPanel2.add(sortLabel);
jPanel2.add(sortAnnLabel);
jPanel2.add(startupCheckbox);