X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGSequenceLink.java;h=2689946e59952fce0141c9c809960e58040addbc;hb=3e29fb36af9c48e07837e32b7e99c081b2461b2f;hp=0616c798d4cedc3bf8bd069efdc2b8e8c7a49355;hpb=ab43013b7e357b84b4abade0dba949668dfb2a0e;p=jalview.git diff --git a/src/jalview/jbgui/GSequenceLink.java b/src/jalview/jbgui/GSequenceLink.java index 0616c79..2689946 100755 --- a/src/jalview/jbgui/GSequenceLink.java +++ b/src/jalview/jbgui/GSequenceLink.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -24,9 +24,21 @@ import jalview.gui.JvSwingUtils; import jalview.util.MessageManager; import jalview.util.UrlLink; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; +import java.awt.Font; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.Panel; +import java.awt.Rectangle; +import java.awt.event.KeyAdapter; +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; public class GSequenceLink extends Panel { @@ -48,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); @@ -76,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); @@ -85,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); @@ -100,6 +137,7 @@ public class GSequenceLink extends Panel urlTB.setText(url); } + @Override public String getName() { return nameTB.getText(); @@ -118,11 +156,10 @@ public class GSequenceLink extends Panel return true; } - JOptionPane - .showInternalMessageDialog( - jalview.gui.Desktop.desktop, - MessageManager.getString("warn.url_must_contain"), - MessageManager.getString("label.invalid_url"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showInternalMessageDialog(jalview.gui.Desktop.desktop, + MessageManager.getString("warn.url_must_contain"), + MessageManager.getString("label.invalid_url"), + JOptionPane.WARNING_MESSAGE); return false; } @@ -138,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();