X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGDasSourceBrowser.java;h=5efa6c05c7966420af626c75c87c7da692cfff15;hb=32a259190463ee06a81886db9d7843b565dea6df;hp=953f9955585feeebae101375aa466fd547f6d71d;hpb=d2735d899ea977b635ca89378daa9ae16c5f55b9;p=jalview.git diff --git a/src/jalview/jbgui/GDasSourceBrowser.java b/src/jalview/jbgui/GDasSourceBrowser.java index 953f995..5efa6c0 100755 --- a/src/jalview/jbgui/GDasSourceBrowser.java +++ b/src/jalview/jbgui/GDasSourceBrowser.java @@ -27,6 +27,8 @@ import javax.swing.BorderFactory; import javax.swing.event.HyperlinkListener; import javax.swing.event.HyperlinkEvent; import java.awt.Dimension; +import java.awt.Font; +import java.awt.Insets; public class GDasSourceBrowser extends JPanel @@ -67,11 +69,9 @@ public class GDasSourceBrowser fullDetails_hyperlinkUpdate(e); } }); + fullDetails.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); fullDetails.setEditable(false); - jLabel1.setText("

Show sources serving

"); - jLabel2.setText("and"); - jLabel3.setHorizontalAlignment(SwingConstants.RIGHT); - jLabel3.setText("

using coordinates

"); + registryLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); registryLabel.setHorizontalAlignment(SwingConstants.TRAILING); registryLabel.setText("Use Registry"); addLocal.setText("Add Local Source"); @@ -85,60 +85,71 @@ public class GDasSourceBrowser jPanel1.setLayout(flowLayout1); jPanel1.setMinimumSize(new Dimension(596, 30)); jPanel1.setPreferredSize(new Dimension(596, 30)); + jScrollPane2.setBorder(titledBorder3); + jScrollPane3.setBorder(titledBorder4); + jScrollPane4.setBorder(titledBorder5); + titledBorder2.setTitleFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); + titledBorder3.setTitleFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); + titledBorder4.setTitleFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); + filter1.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); + filter2.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); + filter3.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); + table.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); + reset.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); + reset.setMargin(new Insets(2, 2, 2, 2)); + reset.setText("Reset"); + reset.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + reset_actionPerformed(e); + } + }); + jPanel2.setLayout(borderLayout1); + borderLayout1.setHgap(5); + registryURL.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); scrollPane.getViewport().add(table); fullDetailsScrollpane.getViewport().add(fullDetails); - jScrollPane3.getViewport().add(coords1); - jScrollPane2.getViewport().add(capabilities); - jScrollPane4.getViewport().add(coords2); + jScrollPane3.getViewport().add(filter2); + jScrollPane4.getViewport().add(filter3); jPanel1.add(refresh, null); jPanel1.add(addLocal, null); jPanel1.add(progressBar, null); - this.add(registryLabel, new GridBagConstraints(0, 2, 2, 1, 0.0, 0.0 - , GridBagConstraints.WEST, GridBagConstraints.NONE, - new Insets(11, 2, 0, 0), 9, 2)); - this.add(registryURL, new GridBagConstraints(2, 2, 5, 1, 1.0, 0.0 - , GridBagConstraints.WEST, - GridBagConstraints.HORIZONTAL, - new Insets(6, 7, 0, 10), 393, - 3)); - this.add(jLabel2, new GridBagConstraints(5, 1, 1, 1, 0.0, 0.0 - , GridBagConstraints.WEST, - GridBagConstraints.NONE, - new Insets(36, 7, 35, 0), 5, 21)); - this.add(jLabel3, new GridBagConstraints(3, 1, 1, 1, 0.0, 0.0 - , GridBagConstraints.WEST, - GridBagConstraints.NONE, - new Insets(33, 0, 29, 0), 5, 16)); - this.add(jLabel1, - new GridBagConstraints(0, 1, 1, GridBagConstraints.REMAINDER, 0.0, - 0.0 - , GridBagConstraints.WEST, - GridBagConstraints.NONE, - new Insets( -60, 2, 0, 0), 5, 20)); - this.add(jPanel1, new GridBagConstraints(0, 3, 7, 1, 1.0, 1.0 + jScrollPane2.getViewport().add(filter1); + this.add(jPanel1, new GridBagConstraints(0, 3, 3, 1, 1.0, 1.0 , GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); - this.add(fullDetailsScrollpane, new GridBagConstraints(3, 0, 4, 1, 1.0, 1.0 + this.add(fullDetailsScrollpane, new GridBagConstraints(1, 0, 2, 1, 1.0, 1.0 , GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(3, 0, 0, 3), 240, 130)); - this.add(scrollPane, new GridBagConstraints(0, 0, 3, 1, 1.0, 1.0 + this.add(scrollPane, new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0 , GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(3, 2, 0, 0), 150, 130)); - this.add(jScrollPane3, new GridBagConstraints(4, 1, 1, 1, 1.0, 1.0 + jPanel2.add(registryLabel, java.awt.BorderLayout.WEST); + jPanel2.add(registryURL, java.awt.BorderLayout.CENTER); + jPanel2.add(reset, java.awt.BorderLayout.EAST); + this.add(jPanel2, new GridBagConstraints(0, 2, 3, 1, 0.0, 0.0 + , GridBagConstraints.CENTER, + GridBagConstraints.HORIZONTAL, + new Insets(5, 10, 0, 10), 339, 0)); + this.add(jScrollPane2, new GridBagConstraints(0, 1, 1, 1, 1.0, 1.0 , GridBagConstraints.CENTER, GridBagConstraints.BOTH, - new Insets(9, 0, 0, 0), 80, 0)); - this.add(jScrollPane2, new GridBagConstraints(1, 1, 2, 1, 1.0, 1.0 + new Insets(0, 0, 0, 60), 80, + 60)); + this.add(jScrollPane4, new GridBagConstraints(2, 1, 1, 1, 1.0, 1.0 , GridBagConstraints.CENTER, GridBagConstraints.BOTH, - new Insets(9, 0, 0, 0), 80, 0)); - this.add(jScrollPane4, new GridBagConstraints(6, 1, 1, 1, 1.0, 1.0 + new Insets(0, -80, 0, 0), 80, + 60)); + this.add(jScrollPane3, new GridBagConstraints(1, 1, 1, 1, 1.0, 1.0 , GridBagConstraints.CENTER, GridBagConstraints.BOTH, - new Insets(9, 0, 0, 9), 80, 0)); + new Insets(0, -60, 0, 80), 80, + 60)); } protected JTable table = new JTable(); @@ -149,12 +160,9 @@ public class GDasSourceBrowser protected JScrollPane scrollPane = new JScrollPane(); TitledBorder titledBorder2 = new TitledBorder("Full Details"); protected JScrollPane fullDetailsScrollpane = new JScrollPane(); - protected JList capabilities = new JList(); - protected JList coords1 = new JList(); - protected JList coords2 = new JList(); - JLabel jLabel1 = new JLabel(); - JLabel jLabel2 = new JLabel(); - JLabel jLabel3 = new JLabel(); + protected JList filter1 = new JList(); + protected JList filter2 = new JList(); + protected JList filter3 = new JList(); JScrollPane jScrollPane2 = new JScrollPane(); JScrollPane jScrollPane3 = new JScrollPane(); JScrollPane jScrollPane4 = new JScrollPane(); @@ -164,6 +172,12 @@ public class GDasSourceBrowser JPanel jPanel1 = new JPanel(); FlowLayout flowLayout1 = new FlowLayout(); GridBagLayout gridBagLayout1 = new GridBagLayout(); + TitledBorder titledBorder3 = new TitledBorder("Authority:"); + TitledBorder titledBorder4 = new TitledBorder("Type:"); + TitledBorder titledBorder5 = new TitledBorder("Label:"); + JButton reset = new JButton(); + JPanel jPanel2 = new JPanel(); + BorderLayout borderLayout1 = new BorderLayout(); public void refresh_actionPerformed(ActionEvent e) { @@ -188,4 +202,9 @@ public class GDasSourceBrowser } + public void reset_actionPerformed(ActionEvent e) + { + + } + }