From d2e193bc02f93925ab33667737a57b223f30891c Mon Sep 17 00:00:00 2001 From: kiramt Date: Mon, 24 Oct 2016 13:37:22 +0100 Subject: [PATCH] Fixed dialog box messages in English and Spanish. Adjustments to dialog box spacing. --- resources/lang/Messages.properties | 4 +++- resources/lang/Messages_es.properties | 4 +++- src/jalview/jbgui/GSequenceLink.java | 34 +++++++++++++++++++++++++++++++-- 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties index 7a1f064..bcbc24b 100644 --- a/resources/lang/Messages.properties +++ b/resources/lang/Messages.properties @@ -788,7 +788,9 @@ label.hide_columns_not_containing = Hide columns that do not contain option.trim_retrieved_seqs = Trim retrieved sequences label.trim_retrieved_sequences = When the reference sequence is longer than the sequence that you are working with, only keep the relevant subsequences. label.use_sequence_id_1 = Use $SEQUENCE_ID$ or $SEQUENCE_ID=//=$ -label.use_sequence_id_2 = \nto embed sequence id in URL +label.use_sequence_id_2 = to embed sequence id in URL +label.use_sequence_id_3 = Use $SEQUENCE_NAME$ similarly to embed sequence name +label.use_sequence_id_4 = label.ws_parameters_for = Parameters for {0} label.switch_server = Switch server label.choose_jabaws_server = Choose a server for running this service diff --git a/resources/lang/Messages_es.properties b/resources/lang/Messages_es.properties index cf36638..4112d19 100644 --- a/resources/lang/Messages_es.properties +++ b/resources/lang/Messages_es.properties @@ -721,7 +721,9 @@ label.select_columns_not_containing = Seleccione las columnas que no contengan option.trim_retrieved_seqs = Ajustar las secuencias recuperadas label.trim_retrieved_sequences = Cuando la secuencia de referencia es más larga que la secuencia con la que está trabajando, sólo se mantienen las subsecuencias relevantes. label.use_sequence_id_1 = Utilice $SEQUENCE_ID$ o $SEQUENCE_ID=//=$ -label.use_sequence_id_2 = \nto para embeber el id de la secuencia en una URL +label.use_sequence_id_2 = para embeber el id de la secuencia en una URL +label.use_sequence_id_3 = Utilice $SEQUENCE_NAME$ de manera similar para embeber +label.use_sequence_id_4 = el nombre de la secuencia label.ws_parameters_for = Parámetros para {0} label.switch_server = Cambiar servidor label.open_jabaws_web_page = Abra el página principal del servidor JABAWS en un navegador web diff --git a/src/jalview/jbgui/GSequenceLink.java b/src/jalview/jbgui/GSequenceLink.java index 46580a2..b27752e 100755 --- a/src/jalview/jbgui/GSequenceLink.java +++ b/src/jalview/jbgui/GSequenceLink.java @@ -60,6 +60,7 @@ 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); @@ -70,6 +71,7 @@ public class GSequenceLink extends Panel 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(); @@ -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(); -- 1.7.10.2