import jalview.bin.Cache;
import jalview.gui.Help.HelpId;
import jalview.gui.StructureViewer.ViewerType;
+import jalview.io.FileFormatI;
import jalview.io.JalviewFileChooser;
import jalview.io.JalviewFileView;
import jalview.jbgui.GPreferences;
private WsPreferences wsPrefs;
+ private OptionsParam promptEachTimeOpt = new OptionsParam(
+ MessageManager.getString("label.prompt_each_time"),
+ "Prompt each time");
+
+ private OptionsParam lineArtOpt = new OptionsParam(
+ MessageManager.getString("label.lineart"), "Lineart");
+
+ private OptionsParam textOpt = new OptionsParam(
+ MessageManager.getString("action.text"), "Text");
+
/**
* Creates a new Preferences object.
*/
/*
* Set Output tab defaults
*/
- epsRendering.addItem(new OptionsParam(MessageManager
- .getString("label.prompt_each_time"), "Prompt each time"));
- epsRendering.addItem(new OptionsParam(MessageManager
- .getString("label.lineart"), "Lineart"));
- epsRendering.addItem(new OptionsParam(MessageManager
- .getString("action.text"), "Text"));
+ epsRendering.addItem(promptEachTimeOpt);
+ epsRendering.addItem(lineArtOpt);
+ epsRendering.addItem(textOpt);
String defaultEPS = Cache.getDefault("EPS_RENDERING",
"Prompt each time");
if (defaultEPS.equalsIgnoreCase("Text"))
{
- epsRendering.setSelectedItem(new OptionsParam(MessageManager
- .getString("action.text"), "Text"));
+ epsRendering.setSelectedItem(textOpt);
}
else if (defaultEPS.equalsIgnoreCase("Lineart"))
{
- epsRendering.setSelectedItem(new OptionsParam(MessageManager
- .getString("label.lineart"), "Lineart"));
+ epsRendering.setSelectedItem(lineArtOpt);
}
else
{
- epsRendering.setSelectedItem(new OptionsParam(MessageManager
- .getString("label.prompt_each_time"), "Prompt each time"));
+ epsRendering.setSelectedItem(promptEachTimeOpt);
}
autoIdWidth.setSelected(Cache.getDefault("FIGURE_AUTOIDWIDTH", false));
userIdWidth.setEnabled(!autoIdWidth.isSelected());
/*
* Save Output settings
*/
- if (epsRendering.getSelectedItem().equals("Prompt each time"))
- {
- Cache.applicationProperties.remove("EPS_RENDERING");
- }
- else
- {
Cache.applicationProperties.setProperty("EPS_RENDERING",
((OptionsParam) epsRendering.getSelectedItem()).getCode());
- }
/*
* Save Connections settings
@Override
public void startupFileTextfield_mouseClicked()
{
- JalviewFileChooser chooser = new JalviewFileChooser(
- jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[] {
- "fa, fasta, fastq", "aln", "pfam", "msf", "pir", "blc",
- "jar" }, new String[] { "Fasta", "Clustal", "PFAM", "MSF",
- "PIR", "BLC", "Jalview" },
- jalview.bin.Cache.getProperty("DEFAULT_FILE_FORMAT"));
+ String fileFormat = Cache.getProperty("DEFAULT_FILE_FORMAT");
+ JalviewFileChooser chooser = JalviewFileChooser.forRead(
+ Cache.getProperty("LAST_DIRECTORY"), fileFormat, true);
+ // new String[] {
+ // "fa, fasta, fastq", "aln", "pfam", "msf", "pir", "blc",
+ // "jar" }, new String[] { "Fasta", "Clustal", "PFAM", "MSF",
+ // "PIR", "BLC", "Jalview" },
+ // fileFormat);
chooser.setFileView(new JalviewFileView());
chooser.setDialogTitle(MessageManager
.getString("label.select_startup_file"));
if (value == JalviewFileChooser.APPROVE_OPTION)
{
- jalview.bin.Cache.applicationProperties.setProperty(
- "DEFAULT_FILE_FORMAT", chooser.getSelectedFormat());
+ FileFormatI format = chooser.getSelectedFormat();
+ if (format != null)
+ {
+ Cache.applicationProperties.setProperty("DEFAULT_FILE_FORMAT",
+ format.toString());
+ }
startupFileTextfield.setText(chooser.getSelectedFile()
.getAbsolutePath());
}