X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGStructureChooser.java;h=834e8734bb8647e2fbf630e2d487147edd1760fe;hb=e6e897ddf845d4e79ff5e6c7afddf66766c7d31d;hp=2a6c1f269506c094371eced16fdb34092fa53fe7;hpb=8c2df9aa1581b9fdea9ae6708f50e2a81f6efcb2;p=jalview.git diff --git a/src/jalview/jbgui/GStructureChooser.java b/src/jalview/jbgui/GStructureChooser.java index 2a6c1f2..834e873 100644 --- a/src/jalview/jbgui/GStructureChooser.java +++ b/src/jalview/jbgui/GStructureChooser.java @@ -21,17 +21,6 @@ package jalview.jbgui; -import jalview.datamodel.SequenceI; -import jalview.fts.api.FTSDataColumnI; -import jalview.fts.core.FTSDataColumnPreferences; -import jalview.fts.core.FTSDataColumnPreferences.PreferenceSource; -import jalview.fts.service.pdb.PDBFTSRestClient; -import jalview.gui.AlignmentPanel; -import jalview.gui.Desktop; -import jalview.gui.JvSwingUtils; -import jalview.gui.StructureViewer; -import jalview.util.MessageManager; - import java.awt.BorderLayout; import java.awt.CardLayout; import java.awt.Component; @@ -39,6 +28,8 @@ import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; import java.awt.GridLayout; +import java.awt.Insets; +import java.awt.Point; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; @@ -66,6 +57,7 @@ import javax.swing.JTabbedPane; import javax.swing.JTable; import javax.swing.JTextField; import javax.swing.ListCellRenderer; +import javax.swing.SwingConstants; import javax.swing.Timer; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -74,6 +66,15 @@ import javax.swing.event.DocumentListener; import javax.swing.event.InternalFrameEvent; import javax.swing.table.TableColumn; +import jalview.datamodel.SequenceI; +import jalview.fts.api.FTSDataColumnI; +import jalview.fts.core.FTSDataColumnPreferences; +import jalview.gui.AlignmentPanel; +import jalview.gui.Desktop; +import jalview.gui.JvSwingUtils; +import jalview.gui.StructureViewer; +import jalview.util.MessageManager; +import jalview.util.Platform; import net.miginfocom.swing.MigLayout; @SuppressWarnings("serial") @@ -120,6 +121,11 @@ public abstract class GStructureChooser extends JPanel protected JButton btn_pdbFromFile = new JButton(); + // holder for icon and button + protected JPanel pnl_queryTDB; + + protected JButton btn_queryTDB = new JButton(); + protected JCheckBox chk_superpose = new JCheckBox( MessageManager.getString("label.superpose_structures")); @@ -145,6 +151,9 @@ public abstract class GStructureChooser extends JPanel 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); @@ -162,8 +171,9 @@ public abstract class GStructureChooser extends JPanel protected JTabbedPane pnl_filter = new JTabbedPane(); protected abstract FTSDataColumnPreferences getFTSDocFieldPrefs(); - protected abstract void setFTSDocFieldPrefs(FTSDataColumnPreferences newPrefs); + protected abstract void setFTSDocFieldPrefs( + FTSDataColumnPreferences newPrefs); protected FTSDataColumnI[] previousWantedFields; @@ -250,6 +260,7 @@ public abstract class GStructureChooser extends JPanel public GStructureChooser() { } + protected void initDialog() { @@ -265,29 +276,33 @@ public abstract class GStructureChooser extends JPanel 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. - - private Timer timer; - - protected void txt_search_ActionPerformedDelayed() { - if (timer != null) { - timer.stop(); - } - timer = new Timer(300, new ActionListener() { - - @Override - public void actionPerformed(ActionEvent e) { - txt_search_ActionPerformed(); - } - }); - timer.setRepeats(false); - timer.start(); + + private Timer timer; + + protected void txt_search_ActionPerformedDelayed() + { + if (timer != null) + { + timer.stop(); + } + timer = new Timer(300, new ActionListener() + { + + @Override + public void actionPerformed(ActionEvent e) + { + txt_search_ActionPerformed(); + } + }); + timer.setRepeats(false); + timer.start(); } // - + /** * Initializes the GUI default properties * @@ -306,15 +321,44 @@ public abstract class GStructureChooser extends JPanel 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) { - validateSelections(); + 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() @@ -431,7 +475,9 @@ public abstract class GStructureChooser extends JPanel } }); - 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() { @@ -453,6 +499,9 @@ public abstract class GStructureChooser extends JPanel } }); + // 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); btn_add.addActionListener(new java.awt.event.ActionListener() @@ -547,6 +596,24 @@ public abstract class GStructureChooser extends JPanel }); chk_invertFilter.addItemListener(this); + btn_queryTDB = new JButton(); + if (Platform.isMac()) + { + // needed to make icon button have round corners in vaqua + btn_queryTDB.putClientProperty("JButton.buttonType", "bevel"); + } + btn_queryTDB.setMargin(new Insets(0, 16, 0, 20)); + btn_queryTDB + .setText(MessageManager.getString("label.search_3dbeacons")); + btn_queryTDB.setIconTextGap(12); + btn_queryTDB.setIcon(tdbImage); + btn_queryTDB.setVerticalTextPosition(SwingConstants.CENTER); + btn_queryTDB.setHorizontalTextPosition(SwingConstants.TRAILING); + btn_queryTDB.setFont(VERDANA_12); + btn_queryTDB.setToolTipText( + MessageManager.getString("label.find_models_from_3dbeacons")); + // btn_queryTDB.setPreferredSize(new Dimension(200, 32)); + btn_queryTDB.setVisible(false); targetView.setVisible(false); @@ -557,10 +624,19 @@ public abstract class GStructureChooser extends JPanel 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_queryTDB = new JPanel(); + pnl_queryTDB.setLayout(new FlowLayout(FlowLayout.CENTER, 4, 4)); + pnl_queryTDB.setBackground(getBackground()); + pnl_queryTDB.add(btn_queryTDB); + + pnl_queryTDB.setVisible(false); + pnl_main.add(pnl_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()); @@ -665,8 +741,9 @@ public abstract class GStructureChooser extends JPanel Desktop.addInternalFrame(mainFrame, frameTitle, width, height); } + protected abstract boolean showPopupFor(int selectedRow, int x, int y); -protected void closeAction(int preferredHeight) + protected void closeAction(int preferredHeight) { // System.out.println(">>>>>>>>>> closing internal frame!!!"); // System.out.println("width : " + mainFrame.getWidth()); @@ -883,4 +960,9 @@ protected void closeAction(int preferredHeight) protected abstract void tabRefresh(); protected abstract void validateSelections(); -} \ No newline at end of file + + public JInternalFrame getFrame() + { + return mainFrame; + } +}