X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPreferences.java;h=06b42bf80f861c28a7783346e91738f6efea499f;hb=4cea7a0328724b90a6a7c16ae8c926e0cc12cedd;hp=9267800568839bf3accede9c22abce0ad0f1a6de;hpb=94ba49f66ae87b3aa18201b8b9b8baee4888bb05;p=jalview.git diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java index 9267800..06b42bf 100755 --- a/src/jalview/gui/Preferences.java +++ b/src/jalview/gui/Preferences.java @@ -1,13 +1,13 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6) - * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8) + * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle * * This file is part of Jalview. * * Jalview is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - * + * * Jalview is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty * of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -28,7 +28,7 @@ import jalview.bin.*; import jalview.io.*; import jalview.jbgui.*; import jalview.schemes.*; -import jalview.ws.EnfinEnvision2OneWay; +import jalview.util.MessageManager; /** * DOCUMENT ME! @@ -119,7 +119,7 @@ public class Preferences extends GPreferences height = 460; } - Desktop.addInternalFrame(frame, "Preferences", width, height); + Desktop.addInternalFrame(frame, MessageManager.getString("label.preferences"), width, height); frame.setMinimumSize(new Dimension(width, height)); seqLimit.setSelected(Cache.getDefault("SHOW_JVSUFFIX", true)); @@ -137,7 +137,7 @@ public class Preferences extends GPreferences .getDefault("SHOW_NPFEATS_TOOLTIP", true)); showDbRefTooltip.setSelected(Cache.getDefault("SHOW_DBREFS_TOOLTIP", true)); - + sortByTree.setSelected(Cache.getDefault("SORT_BY_TREE", false)); for (int i = ColourSchemeProperty.FIRST_COLOUR; i <= ColourSchemeProperty.LAST_COLOUR; i++) { colour.addItem(ColourSchemeProperty.getColourName(i)); @@ -150,8 +150,10 @@ public class Preferences extends GPreferences /** * default min-max colours for annotation shading */ - minColour.setBackground(Cache.getDefaultColour("ANNOTATIONCOLOUR_MIN", Color.orange)); - maxColour.setBackground(Cache.getDefaultColour("ANNOTATIONCOLOUR_MAX", Color.red)); + minColour.setBackground(Cache.getDefaultColour("ANNOTATIONCOLOUR_MIN", + Color.orange)); + maxColour.setBackground(Cache.getDefaultColour("ANNOTATIONCOLOUR_MAX", + Color.red)); String[] fonts = java.awt.GraphicsEnvironment .getLocalGraphicsEnvironment().getAvailableFontFamilyNames(); @@ -189,7 +191,8 @@ public class Preferences extends GPreferences startupCheckbox .setSelected(Cache.getDefault("SHOW_STARTUP_FILE", true)); startupFileTextfield.setText(Cache.getDefault("STARTUP_FILE", - Cache.getDefault("www.jalview.org","http://www.jalview.org")+"/examples/exampleFile_2_3.jar")); + Cache.getDefault("www.jalview.org", "http://www.jalview.org") + + "/examples/exampleFile_2_3.jar")); sortby.addItem("No sort"); sortby.addItem("Id"); @@ -201,7 +204,11 @@ public class Preferences extends GPreferences epsRendering.addItem("Text"); epsRendering.setSelectedItem(Cache.getDefault("EPS_RENDERING", "Prompt each time")); - + autoIdWidth.setSelected(Cache.getDefault("FIGURE_AUTOIDWIDTH", false)); + userIdWidth.setEnabled(autoIdWidth.isSelected()); + userIdWidthlabel.setEnabled(autoIdWidth.isSelected()); + Integer wi = Cache.getIntegerProperty("FIGURE_USERIDWIDTH"); + userIdWidth.setText(wi == null ? "" : wi.toString()); blcjv.setSelected(Cache.getDefault("BLC_JVSUFFIX", true)); clustaljv.setSelected(Cache.getDefault("CLUSTAL_JVSUFFIX", true)); fastajv.setSelected(Cache.getDefault("FASTA_JVSUFFIX", true)); @@ -335,9 +342,11 @@ public class Preferences extends GPreferences Cache.applicationProperties.setProperty("SORT_ALIGNMENT", sortby .getSelectedItem().toString()); - Cache.setColourProperty("ANNOTATIONCOLOUR_MIN", minColour.getBackground()); - Cache.setColourProperty("ANNOTATIONCOLOUR_MAX", maxColour.getBackground()); - + Cache.setColourProperty("ANNOTATIONCOLOUR_MIN", + minColour.getBackground()); + Cache.setColourProperty("ANNOTATIONCOLOUR_MAX", + maxColour.getBackground()); + if (epsRendering.getSelectedItem().equals("Prompt each time")) { Cache.applicationProperties.remove("EPS_RENDERING"); @@ -450,8 +459,16 @@ public class Preferences extends GPreferences Boolean.toString(modellerOutput.isSelected())); jalview.io.PIRFile.useModellerOutput = modellerOutput.isSelected(); + Cache.applicationProperties.setProperty("FIGURE_AUTOIDWIDTH", + Boolean.toString(autoIdWidth.isSelected())); + userIdWidth_actionPerformed(); + Cache.applicationProperties.setProperty("FIGURE_USERIDWIDTH", + userIdWidth.getText()); + Cache.applicationProperties.setProperty("AUTO_CALC_CONSENSUS", Boolean.toString(autoCalculateConsCheck.isSelected())); + Cache.applicationProperties.setProperty("SORT_BY_TREE", + Boolean.toString(sortByTree.isSelected())); Cache.applicationProperties.setProperty("PAD_GAPS", Boolean.toString(padGaps.isSelected())); @@ -537,7 +554,7 @@ public class Preferences extends GPreferences while (!valid) { if (JOptionPane.showInternalConfirmDialog(Desktop.desktop, link, - "New sequence URL link", JOptionPane.OK_CANCEL_OPTION, -1, + MessageManager.getString("label.new_sequence_url_link"), JOptionPane.OK_CANCEL_OPTION, -1, null) == JOptionPane.OK_OPTION) { if (link.checkValid()) @@ -563,7 +580,7 @@ public class Preferences extends GPreferences if (index == -1) { JOptionPane.showInternalMessageDialog(Desktop.desktop, - "No link selected!", "No link selected", + MessageManager.getString("label.no_link_selected"), MessageManager.getString("label.no_link_selected"), JOptionPane.WARNING_MESSAGE); return; } @@ -576,7 +593,7 @@ public class Preferences extends GPreferences { if (JOptionPane.showInternalConfirmDialog(Desktop.desktop, link, - "New sequence URL link", JOptionPane.OK_CANCEL_OPTION, -1, + MessageManager.getString("label.new_sequence_url_link"), JOptionPane.OK_CANCEL_OPTION, -1, null) == JOptionPane.OK_OPTION) { if (link.checkValid()) @@ -601,7 +618,7 @@ public class Preferences extends GPreferences if (index == -1) { JOptionPane.showInternalMessageDialog(Desktop.desktop, - "No link selected!", "No link selected", + MessageManager.getString("label.no_link_selected"), MessageManager.getString("label.no_link_selected"), JOptionPane.WARNING_MESSAGE); return; } @@ -651,6 +668,7 @@ public class Preferences extends GPreferences { return groupURLLinks; } + public void minColour_actionPerformed() { Color col = JColorChooser.showDialog(this, @@ -673,4 +691,38 @@ public class Preferences extends GPreferences maxColour.repaint(); } + @Override + protected void userIdWidth_actionPerformed() + { + try + { + String val = userIdWidth.getText().trim(); + if (val.length() > 0) + { + Integer iw = Integer.parseInt(val); + if (iw.intValue() < 12) + { + throw new NumberFormatException(); + } + userIdWidth.setText(iw.toString()); + } + } catch (NumberFormatException x) + { + JOptionPane + .showInternalMessageDialog( + Desktop.desktop, + "The user defined width for the\nannotation and sequence ID columns\nin exported figures must be\nat least 12 pixels wide.", + "Invalid ID Column width", + JOptionPane.WARNING_MESSAGE); + userIdWidth.setText(""); + } + } + + @Override + protected void autoIdWidth_actionPerformed() + { + userIdWidth.setEnabled(!autoIdWidth.isSelected()); + userIdWidthlabel.setEnabled(!autoIdWidth.isSelected()); + } + }