X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGSequenceLink.java;h=dbce5f3852839bdbc8988be447eac2967ea4f8d9;hb=7d6bf4ac01167499c0f4e07de63edcdd72a6d595;hp=46580a29d44c0c462a00446ab4cd7b04632c614f;hpb=4d7f98a6dd54d9863ba449ec79dcd95d25ed863d;p=jalview.git diff --git a/src/jalview/jbgui/GSequenceLink.java b/src/jalview/jbgui/GSequenceLink.java index 46580a2..dbce5f3 100755 --- a/src/jalview/jbgui/GSequenceLink.java +++ b/src/jalview/jbgui/GSequenceLink.java @@ -20,6 +20,7 @@ */ package jalview.jbgui; +import jalview.gui.JvOptionPane; import jalview.gui.JvSwingUtils; import jalview.util.MessageManager; import jalview.util.UrlLink; @@ -35,7 +36,6 @@ import java.awt.event.KeyEvent; import javax.swing.BorderFactory; import javax.swing.JLabel; -import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JTextField; import javax.swing.SwingConstants; @@ -60,16 +60,18 @@ public class GSequenceLink extends Panel nameTB.setBounds(new Rectangle(77, 10, 310, 23)); nameTB.addKeyListener(new KeyAdapter() { + @Override public void keyTyped(KeyEvent e) { nameTB_keyTyped(e); } }); urlTB.setFont(JvSwingUtils.getLabelFont()); - urlTB.setText("http://www."); + urlTB.setText("http://"); urlTB.setBounds(new Rectangle(78, 40, 309, 23)); urlTB.addKeyListener(new KeyAdapter() { + @Override public void keyTyped(KeyEvent e) { urlTB_keyTyped(e); @@ -88,7 +90,20 @@ public class GSequenceLink extends Panel jLabel3.setBounds(new Rectangle(21, 72, 351, 15)); jLabel4.setFont(new java.awt.Font("Verdana", Font.ITALIC, 11)); jLabel4.setText(MessageManager.getString("label.use_sequence_id_2")); - jLabel4.setBounds(new Rectangle(21, 93, 351, 15)); + jLabel4.setBounds(new Rectangle(21, 88, 351, 15)); + jLabel5.setFont(new java.awt.Font("Verdana", Font.ITALIC, 11)); + jLabel5.setText(MessageManager.getString("label.use_sequence_id_3")); + jLabel5.setBounds(new Rectangle(21, 106, 351, 15)); + + String lastLabel = MessageManager.getString("label.use_sequence_id_4"); + if (lastLabel.length() > 0) + { + // e.g. Spanish version has longer text + jLabel6.setFont(new java.awt.Font("Verdana", Font.ITALIC, 11)); + jLabel6.setText(lastLabel); + jLabel6.setBounds(new Rectangle(21, 122, 351, 15)); + } + jPanel1.setBorder(BorderFactory.createEtchedBorder()); jPanel1.setLayout(null); jPanel1.add(jLabel1); @@ -97,11 +112,21 @@ public class GSequenceLink extends Panel jPanel1.add(jLabel2); jPanel1.add(jLabel3); jPanel1.add(jLabel4); + jPanel1.add(jLabel5); + + int height = 130; + if (lastLabel.length() > 0) + { + jPanel1.add(jLabel6); + height = 146; + } + this.add(jPanel1, new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets( - 5, 4, 6, 5), 390, 130)); + 5, 4, 6, 5), 390, height)); } + @Override public void setName(String name) { nameTB.setText(name); @@ -112,6 +137,7 @@ public class GSequenceLink extends Panel urlTB.setText(url); } + @Override public String getName() { return nameTB.getText(); @@ -130,10 +156,10 @@ public class GSequenceLink extends Panel return true; } - JOptionPane.showInternalMessageDialog(jalview.gui.Desktop.desktop, + JvOptionPane.showInternalMessageDialog(jalview.gui.Desktop.desktop, MessageManager.getString("warn.url_must_contain"), MessageManager.getString("label.invalid_url"), - JOptionPane.WARNING_MESSAGE); + JvOptionPane.WARNING_MESSAGE); return false; } @@ -149,6 +175,10 @@ public class GSequenceLink extends Panel JLabel jLabel4 = new JLabel(); + JLabel jLabel5 = new JLabel(); + + JLabel jLabel6 = new JLabel(); + JPanel jPanel1 = new JPanel(); GridBagLayout gridBagLayout1 = new GridBagLayout();