From 7707cd3d41e4dd06e958c7b23bb94bc8e7e8d4af Mon Sep 17 00:00:00 2001 From: James Procter Date: Mon, 1 May 2023 17:08:57 +0100 Subject: [PATCH] JAL-4123 JAL-3914 JAL-3858 tweak wording and layout for structure chooser local pdb file UI --- resources/lang/Messages.properties | 2 ++ src/jalview/jbgui/GStructureChooser.java | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties index 271454a..463cab1 100644 --- a/resources/lang/Messages.properties +++ b/resources/lang/Messages.properties @@ -449,6 +449,7 @@ label.input_cut_paste_params = Cut & Paste Input - {0} label.alignment_output_command = Alignment output - {0} label.annotations = Annotations label.structure_options = Structure Options +label.structure_import_options = Structure Import Options label.features = Features label.overview_params = Overview {0} label.paste_newick_file = Paste Newick file @@ -1448,5 +1449,6 @@ label.tftype_default = Default label.tftype_plddt = pLDDT label.optional = (optional) label.choose_tempfac_type = Choose Temperature Factor type +label.interpret_tempfac_as = Interpret Temperature Factor as label.add_pae_matrix_file = Add PAE matrix file label.nothing_selected = Nothing selected diff --git a/src/jalview/jbgui/GStructureChooser.java b/src/jalview/jbgui/GStructureChooser.java index d317e97..64fffc4 100644 --- a/src/jalview/jbgui/GStructureChooser.java +++ b/src/jalview/jbgui/GStructureChooser.java @@ -569,10 +569,7 @@ public abstract class GStructureChooser extends JPanel lbl_pdbFile.setFont(VERDANA_10); lbl_chooseTempFacType.setFont(VERDANA_12); - lbl_chooseTempFacType.setText(new StringBuilder() - .append(MessageManager.getString("label.choose_tempfac_type")) - .append(" ").append(MessageManager.getString("label.optional")) - .toString()); + lbl_chooseTempFacType.setText(MessageManager.getString("label.interpret_tempfac_as")); combo_tempFacAs.setFont(VERDANA_12); for (TFType t : TFType.values()) @@ -590,10 +587,7 @@ public abstract class GStructureChooser extends JPanel }); btn_paeMatrixFile.setFont(VERDANA_12); - btn_paeMatrixFile.setText(new StringBuilder() - .append(MessageManager.getString("label.add_pae_matrix_file")) - .append(" ").append(MessageManager.getString("label.optional")) - .toString()); + btn_paeMatrixFile.setText(MessageManager.getString("label.add_pae_matrix_file")); btn_paeMatrixFile.addActionListener(new ActionListener() { @Override @@ -727,15 +721,21 @@ public abstract class GStructureChooser extends JPanel gbc.insets = new Insets(0, 0, 18, 0); pnl_fileOptions.add(lbl_pdbFile, gbc); gbc.gridy++; + gbc.insets = new Insets(0, 0, 2, 0); + pnl_fileOptions.add(new JLabel(MessageManager.getString("label.structure_import_options")), gbc); + gbc.gridy++; + + gbc.insets = new Insets(0, 0, 6, 0); pnl_fileOptions.add(lbl_chooseTempFacType, gbc); gbc.gridy++; gbc.insets = new Insets(0, 0, 18, 0); pnl_fileOptions.add(combo_tempFacAs, gbc); gbc.gridy++; - gbc.insets = new Insets(0, 0, 2, 0); + gbc.insets = new Insets(0, 0, 6, 0); pnl_fileOptions.add(btn_paeMatrixFile, gbc); gbc.gridy++; + gbc.insets = new Insets(0, 0, 2, 0); gbc.weighty = 1.0; pnl_fileOptions.add(lbl_paeFile, gbc); @@ -1070,5 +1070,6 @@ public abstract class GStructureChooser extends JPanel lbl_chooseTempFacType.setEnabled(b); combo_tempFacAs.setEnabled(b); btn_paeMatrixFile.setEnabled(b); + lbl_paeFile.setEnabled(b); } } -- 1.7.10.2