import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.GridLayout;
+import java.awt.Point;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import javax.swing.JTextField;
import javax.swing.ListCellRenderer;
import javax.swing.Timer;
+import javax.swing.UIManager;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.DocumentEvent;
{
private static final Font VERDANA_12 = new Font("Verdana", 0, 12);
- protected static final String VIEWS_FILTER = "VIEWS_FILTER";
+ public static final String VIEWS_FILTER = "VIEWS_FILTER";
protected static final String VIEWS_FROM_FILE = "VIEWS_FROM_FILE";
protected JButton btn_newView;
protected JButton btn_pdbFromFile = new JButton();
+
+ protected JButton btn_queryTDB = new JButton();
protected JCheckBox chk_superpose = new JCheckBox(
MessageManager.getString("label.superpose_structures"));
protected ImageIcon warningImage = new ImageIcon(
getClass().getResource("/images/warning.gif"));
+ protected ImageIcon tdbImage = new ImageIcon(
+ getClass().getResource("/images/3d-beacons-logo-transparent.png"));
+
protected JLabel lbl_loading = new JLabel(loadingImage);
protected JLabel lbl_pdbManualFetchStatus = new JLabel(errorImage);
protected JTabbedPane pnl_filter = new JTabbedPane();
- protected FTSDataColumnPreferences pdbDocFieldPrefs = new FTSDataColumnPreferences(
- PreferenceSource.STRUCTURE_CHOOSER,
- PDBFTSRestClient.getInstance());
+ protected abstract FTSDataColumnPreferences getFTSDocFieldPrefs();
+ protected abstract void setFTSDocFieldPrefs(FTSDataColumnPreferences newPrefs);
+
protected FTSDataColumnI[] previousWantedFields;
+ "...\"")
: JvSwingUtils.wrapTooltip(true, toolTipText)));
return toolTipText;
- }
+ }
};
public GStructureChooser()
{
+ }
+ protected void initDialog()
+ {
+
try
{
jbInit();
e.printStackTrace();
}
}
-
+
// BH SwingJS optimization
// (a) 100-ms interruptable timer for text entry -- BH 1/10/2019
// (b) two-character minimum, at least for JavaScript.
tbl_summary.addMouseListener(new MouseAdapter()
{
@Override
+ public void mousePressed(MouseEvent e)
+ {
+ if (!popupAction(e))
+ {
+ super.mousePressed(e);
+ }
+ }
+ @Override
public void mouseClicked(MouseEvent e)
{
- validateSelections();
+ if (!popupAction(e))
+ {
+ validateSelections();
+ }
}
@Override
public void mouseReleased(MouseEvent e)
{
+ if (!popupAction(e))
+ {
validateSelections();
+ }
+ }
+ boolean popupAction(MouseEvent e)
+ {
+ if (e.isPopupTrigger())
+ {
+ Point pt = e.getPoint();
+ int selectedRow = tbl_summary.rowAtPoint(pt);
+ if (showPopupFor(selectedRow,pt.x,pt.y))
+ {
+ return true;
+ }
+ }
+ return false;
}
});
tbl_summary.addKeyListener(new KeyAdapter()
}
});
- btn_newView = new JButton(MessageManager.getString("action.new_view"));
+ btn_newView = new JButton(
+ MessageManager.formatMessage("action.new_structure_view_with",
+ StructureViewer.getViewerType().toString()));
btn_newView.setFont(VERDANA_12);
btn_newView.addActionListener(new java.awt.event.ActionListener()
{
}
}
});
+
+ // TODO: JAL-3898 - get list of available external programs to view structures with
btn_add = new JButton(MessageManager.getString("action.add"));
btn_add.setFont(VERDANA_12);
});
chk_invertFilter.addItemListener(this);
+ btn_queryTDB.setFont(VERDANA_12);
+ //btn_queryTDB.setPreferredSize(new Dimension(200,22));
+ btn_queryTDB.setText(MessageManager.getString("label.search_3dbeacons"));
+ btn_queryTDB.setToolTipText(MessageManager.getString("label.find_models_from_3dbeacons"));
+ btn_queryTDB.setIcon(tdbImage);
+ btn_queryTDB.setVisible(false);
targetView.setVisible(false);
actionsPanel.add(btn_newView);
actionsPanel.add(btn_cancel, "right");
- JPanel pnl_main = new JPanel();
- pnl_main.add(cmb_filterOption);
- pnl_main.add(lbl_loading);
- pnl_main.add(chk_invertFilter);
+ JPanel pnl_main = new JPanel(new BorderLayout());
+ JPanel pnl_controls = new JPanel();
+ pnl_main.add(btn_queryTDB,BorderLayout.NORTH);
+ pnl_controls.add(cmb_filterOption);
+ pnl_controls.add(lbl_loading);
+ pnl_controls.add(chk_invertFilter);
+ pnl_main.add(pnl_controls,BorderLayout.CENTER);
lbl_loading.setVisible(false);
JPanel pnl_fileChooser = new JPanel(new FlowLayout());
btn_add.setVisible(false);
btn_newView.setEnabled(false);
btn_cancel.setVisible(false);
- previousWantedFields = pdbDocFieldPrefs
+ previousWantedFields = getFTSDocFieldPrefs()
.getStructureSummaryFields()
.toArray(new FTSDataColumnI[0]);
}
pnl_filter.addChangeListener(changeListener);
pnl_filter.setPreferredSize(new Dimension(width, height));
pnl_filter.add(foundStructureSummary, scrl_foundStructures);
- pnl_filter.add(configureCols, pdbDocFieldPrefs);
+ pnl_filter.add(configureCols, getFTSDocFieldPrefs());
JPanel pnl_locPDB = new JPanel(new BorderLayout());
pnl_locPDB.add(scrl_localPDB);
}
+protected abstract boolean showPopupFor(int selectedRow, int x, int y);
protected void closeAction(int preferredHeight)
{
// System.out.println(">>>>>>>>>> closing internal frame!!!");
return true;
}
- FTSDataColumnI[] currentWantedFields = pdbDocFieldPrefs
+ FTSDataColumnI[] currentWantedFields = getFTSDocFieldPrefs()
.getStructureSummaryFields().toArray(new FTSDataColumnI[0]);
return Arrays.equals(currentWantedFields, previousWantedFields) ? false
: true;
}
/**
- * This inner class provides the data model for the structure filter combo-box
- *
- * @author tcnofoegbu
- *
- */
- public class FilterOption
- {
- private String name;
-
- private String value;
-
- private String view;
-
- private boolean addSeparatorAfter;
-
- /**
- * Model for structure filter option
- *
- * @param name
- * - the name of the Option
- * @param value
- * - the value of the option
- * @param view
- * - the category of the filter option
- * @param addSeparatorAfter
- * - if true, a horizontal separator is rendered immediately after
- * this filter option, otherwise
- */
- public FilterOption(String name, String value, String view,
- boolean addSeparatorAfter)
- {
- this.name = name;
- this.value = value;
- this.view = view;
- this.addSeparatorAfter = addSeparatorAfter;
- }
-
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- public String getValue()
- {
- return value;
- }
-
- public void setValue(String value)
- {
- this.value = value;
- }
-
- public String getView()
- {
- return view;
- }
-
- public void setView(String view)
- {
- this.view = view;
- }
-
- @Override
- public String toString()
- {
- return this.name;
- }
-
- public boolean isAddSeparatorAfter()
- {
- return addSeparatorAfter;
- }
-
- public void setAddSeparatorAfter(boolean addSeparatorAfter)
- {
- this.addSeparatorAfter = addSeparatorAfter;
- }
- }
-
- /**
* This inner class provides the provides the data model for associate
* sequence combo-box - cmb_assSeq
*
git://source.jalview.org / jalview.git / blobdiff