X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPreferences.java;h=88f5df3b91919bb26857971afc696f6adca077c4;hb=c6c94d2adb0d156345065b1a7e18e26c7b8dd2b8;hp=ef9b030e182293402c41b7a7ae7fd1cca66e5b6d;hpb=f69e96788c2ae3a08f56c4461d8d197a3b3a06a2;p=jalview.git diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java index ef9b030..88f5df3 100755 --- a/src/jalview/gui/Preferences.java +++ b/src/jalview/gui/Preferences.java @@ -20,6 +20,17 @@ */ package jalview.gui; +import jalview.analysis.AnnotationSorter.SequenceAnnotationOrder; +import jalview.bin.Cache; +import jalview.gui.Help.HelpId; +import jalview.gui.StructureViewer.ViewerType; +import jalview.io.JalviewFileChooser; +import jalview.io.JalviewFileView; +import jalview.jbgui.GPreferences; +import jalview.jbgui.GSequenceLink; +import jalview.schemes.ColourSchemeProperty; +import jalview.util.MessageManager; + import java.awt.BorderLayout; import java.awt.Color; import java.awt.Dimension; @@ -42,17 +53,6 @@ import javax.swing.JPanel; import ext.edu.ucsf.rbvi.strucviz2.StructureManager; -import jalview.analysis.AnnotationSorter.SequenceAnnotationOrder; -import jalview.bin.Cache; -import jalview.gui.Help.HelpId; -import jalview.gui.StructureViewer.ViewerType; -import jalview.io.JalviewFileChooser; -import jalview.io.JalviewFileView; -import jalview.jbgui.GPreferences; -import jalview.jbgui.GSequenceLink; -import jalview.schemes.ColourSchemeProperty; -import jalview.util.MessageManager; - /** * DOCUMENT ME! * @@ -61,6 +61,7 @@ import jalview.util.MessageManager; */ public class Preferences extends GPreferences { + public static final String ENABLE_SPLIT_FRAME = "ENABLE_SPLIT_FRAME"; public static final String SCALE_PROTEIN_TO_CDNA = "SCALE_PROTEIN_TO_CDNA"; @@ -352,8 +353,8 @@ public class Preferences extends GPreferences epsRendering.setSelectedItem(Cache.getDefault("EPS_RENDERING", "Prompt each time")); autoIdWidth.setSelected(Cache.getDefault("FIGURE_AUTOIDWIDTH", false)); - userIdWidth.setEnabled(autoIdWidth.isSelected()); - userIdWidthlabel.setEnabled(autoIdWidth.isSelected()); + 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)); @@ -364,6 +365,8 @@ public class Preferences extends GPreferences pileupjv.setSelected(Cache.getDefault("PILEUP_JVSUFFIX", true)); pirjv.setSelected(Cache.getDefault("PIR_JVSUFFIX", true)); modellerOutput.setSelected(Cache.getDefault("PIR_MODELLER", false)); + embbedBioJSON.setSelected(Cache.getDefault("EXPORT_EMBBED_BIOJSON", + true)); /* * Set Editing tab defaults @@ -588,6 +591,8 @@ public class Preferences extends GPreferences Boolean.toString(pirjv.isSelected())); Cache.applicationProperties.setProperty("PIR_MODELLER", Boolean.toString(modellerOutput.isSelected())); + Cache.applicationProperties.setProperty("EXPORT_EMBBED_BIOJSON", + Boolean.toString(embbedBioJSON.isSelected())); jalview.io.PIRFile.useModellerOutput = modellerOutput.isSelected(); Cache.applicationProperties.setProperty("FIGURE_AUTOIDWIDTH",