X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPreferences.java;h=777ab486b17658d06ee6336ad5c9a3b3afdb3b4e;hb=d248065f96125e06c038bc0b641558d8a878833f;hp=62c1239c4c093f16c1da037289987b032653642f;hpb=d82d17a7ba88f90e6b8b1b591245a7ee70b3975c;p=jalview.git diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java index 62c1239..777ab48 100755 --- a/src/jalview/gui/Preferences.java +++ b/src/jalview/gui/Preferences.java @@ -84,75 +84,136 @@ import ext.edu.ucsf.rbvi.strucviz2.StructureManager; @SuppressWarnings("serial") public class Preferences extends GPreferences { + public static final String ADD_SS_ANN = "ADD_SS_ANN"; + + public static final String ADD_TEMPFACT_ANN = "ADD_TEMPFACT_ANN"; + + public static final String ALLOW_UNPUBLISHED_PDB_QUERYING = "ALLOW_UNPUBLISHED_PDB_QUERYING"; + public static final String ANNOTATIONCOLOUR_MAX = "ANNOTATIONCOLOUR_MAX"; public static final String ANNOTATIONCOLOUR_MIN = "ANNOTATIONCOLOUR_MIN"; - public static final String ENABLE_SPLIT_FRAME = "ENABLE_SPLIT_FRAME"; + public static final String ANTI_ALIAS = "ANTI_ALIAS"; - public static final String SCALE_PROTEIN_TO_CDNA = "SCALE_PROTEIN_TO_CDNA"; + public static final String AUTO_CALC_CONSENSUS = "AUTO_CALC_CONSENSUS"; + + public static final String AUTOASSOCIATE_PDBANDSEQS = "AUTOASSOCIATE_PDBANDSEQS"; + + public static final String CENTRE_COLUMN_LABELS = "CENTRE_COLUMN_LABELS"; + + public static final String CHIMERA_PATH = "CHIMERA_PATH"; + + public static final String DBREFFETCH_USEPICR = "DBREFFETCH_USEPICR"; public static final String DEFAULT_COLOUR = "DEFAULT_COLOUR"; + public static final String DEFAULT_COLOUR_NUC = "DEFAULT_COLOUR_NUC"; + public static final String DEFAULT_COLOUR_PROT = "DEFAULT_COLOUR_PROT"; - public static final String DEFAULT_COLOUR_NUC = "DEFAULT_COLOUR_NUC"; + public static final String ENABLE_SPLIT_FRAME = "ENABLE_SPLIT_FRAME"; - public static final String ADD_TEMPFACT_ANN = "ADD_TEMPFACT_ANN"; + public static final String FIGURE_AUTOIDWIDTH = "FIGURE_AUTOIDWIDTH"; - public static final String ADD_SS_ANN = "ADD_SS_ANN"; + public static final String FIGURE_FIXEDIDWIDTH = "FIGURE_FIXEDIDWIDTH"; - public static final String USE_RNAVIEW = "USE_RNAVIEW"; + public static final String FOLLOW_SELECTIONS = "FOLLOW_SELECTIONS"; - public static final String STRUCT_FROM_PDB = "STRUCT_FROM_PDB"; + public static final String FONT_NAME = "FONT_NAME"; - public static final String STRUCTURE_DISPLAY = "STRUCTURE_DISPLAY"; + public static final String FONT_SIZE = "FONT_SIZE"; - public static final String CHIMERA_PATH = "CHIMERA_PATH"; + public static final String FONT_STYLE = "FONT_STYLE"; - public static final String SORT_ALIGNMENT = "SORT_ALIGNMENT"; + public static final String GAP_COLOUR = "GAP_COLOUR"; - public static final String WRAP_ALIGNMENT = "WRAP_ALIGNMENT"; + public static final String GAP_SYMBOL = "GAP_SYMBOL"; - public static final String SORT_ANNOTATIONS = "SORT_ANNOTATIONS"; + public static final String HIDDEN_COLOUR = "HIDDEN_COLOUR"; - public static final String SORT_BY_TREE = "SORT_BY_TREE"; + public static final String HIDE_INTRONS = "HIDE_INTRONS"; - public static final String SHOW_ANNOTATIONS = "SHOW_ANNOTATIONS"; + public static final String ID_ITALICS = "ID_ITALICS"; - public static final String SHOW_AUTOCALC_ABOVE = "SHOW_AUTOCALC_ABOVE"; + public static final String ID_ORG_HOSTURL = "ID_ORG_HOSTURL"; - public static final String SHOW_CONSERVATION = "SHOW_CONSERVATION"; + public static final String MAP_WITH_SIFTS = "MAP_WITH_SIFTS"; - public static final String SHOW_QUALITY = "SHOW_QUALITY"; + public static final String NOQUESTIONNAIRES = "NOQUESTIONNAIRES"; - public static final String SHOW_CONSENSUS_HISTOGRAM = "SHOW_CONSENSUS_HISTOGRAM"; + public static final String NORMALISE_CONSENSUS_LOGO = "NORMALISE_CONSENSUS_LOGO"; + + public static final String NORMALISE_LOGO = "NORMALISE_LOGO"; + + public static final String PAD_GAPS = "PAD_GAPS"; + + public static final String PDB_DOWNLOAD_FORMAT = "PDB_DOWNLOAD_FORMAT"; + + public static final String QUESTIONNAIRE = "QUESTIONNAIRE"; + + public static final String RELAXEDSEQIDMATCHING = "RELAXEDSEQIDMATCHING"; + + public static final String RIGHT_ALIGN_IDS = "RIGHT_ALIGN_IDS"; + + public static final String SCALE_PROTEIN_TO_CDNA = "SCALE_PROTEIN_TO_CDNA"; + + public static final String SHOW_ANNOTATIONS = "SHOW_ANNOTATIONS"; + + public static final String SHOW_AUTOCALC_ABOVE = "SHOW_AUTOCALC_ABOVE"; public static final String SHOW_CONSENSUS = "SHOW_CONSENSUS"; + public static final String SHOW_CONSENSUS_HISTOGRAM = "SHOW_CONSENSUS_HISTOGRAM"; + public static final String SHOW_CONSENSUS_LOGO = "SHOW_CONSENSUS_LOGO"; + public static final String SHOW_CONSERVATION = "SHOW_CONSERVATION"; + + public static final String SHOW_DBREFS_TOOLTIP = "SHOW_DBREFS_TOOLTIP"; + public static final String SHOW_GROUP_CONSENSUS = "SHOW_GROUP_CONSENSUS"; public static final String SHOW_GROUP_CONSERVATION = "SHOW_GROUP_CONSERVATION"; - public static final String NORMALISE_CONSENSUS_LOGO = "NORMALISE_CONSENSUS_LOGO"; + public static final String SHOW_JVSUFFIX = "SHOW_JVSUFFIX"; - public static final String NORMALISE_LOGO = "NORMALISE_LOGO"; + public static final String SHOW_NPFEATS_TOOLTIP = "SHOW_NPFEATS_TOOLTIP"; public static final String SHOW_OCCUPANCY = "SHOW_OCCUPANCY"; + public static final String SHOW_OV_HIDDEN_AT_START = "SHOW_OV_HIDDEN_AT_START"; + public static final String SHOW_OVERVIEW = "SHOW_OVERVIEW"; + public static final String SHOW_QUALITY = "SHOW_QUALITY"; + public static final String SHOW_UNCONSERVED = "SHOW_UNCONSERVED"; - public static final String SHOW_OV_HIDDEN_AT_START = "SHOW_OV_HIDDEN_AT_START"; + public static final String SORT_ALIGNMENT = "SORT_ALIGNMENT"; + + public static final String SORT_ANNOTATIONS = "SORT_ANNOTATIONS"; + + public static final String SORT_BY_TREE = "SORT_BY_TREE"; + + public static final String STRUCT_FROM_PDB = "STRUCT_FROM_PDB"; + + public static final String STRUCTURE_DISPLAY = "STRUCTURE_DISPLAY"; + + public static final String STRUCTURE_DIMENSIONS = "STRUCTURE_DIMENSIONS"; + + public static final String UNIPROT_DOMAIN = "UNIPROT_DOMAIN"; + + public static final String USE_FULL_SO = "USE_FULL_SO"; public static final String USE_LEGACY_GAP = "USE_LEGACY_GAP"; - public static final String GAP_COLOUR = "GAP_COLOUR"; + public static final String USE_RNAVIEW = "USE_RNAVIEW"; + + public static final String USER_DEFINED_COLOURS = "USER_DEFINED_COLOURS"; + + public static final String WRAP_ALIGNMENT = "WRAP_ALIGNMENT"; - public static final String HIDDEN_COLOUR = "HIDDEN_COLOUR"; private static final int MIN_FONT_SIZE = 1; @@ -176,6 +237,15 @@ public class Preferences extends GPreferences public static final List groupURLLinks; // not implemented + public static final String BLOSUM62_PCA_FOR_NUCLEOTIDE = "BLOSUM62_PCA_FOR_NUCLEOTIDE"; + + public static final String SHOW_IDENTITY = "SHOW_IDENTITY"; + + public static final String SHOW_FULLSCREEN = "SHOW_FULLSCREEN"; + + public static final Dimension DEFAULT_STRUCTURE_DIMENSIONS = new Dimension( + 600, 600); + static { // get links selected to be in the menu (SEQUENCE_LINKS) @@ -236,11 +306,16 @@ public class Preferences extends GPreferences wsPrefs = new WsPreferences(); wsTab.add(wsPrefs, BorderLayout.CENTER); } - int width = 500, height = 450; + int width = 700, height = 510; // BH 2019.07.12 added 60 to height and 40 to + // width (for Visual check boxes and Links + // "Double Click" header) + // BH 2019.09.24 added 20 to width + // (structure panel was too small anyway, and I added a default dimension + // for Jmol if (Platform.isAMacAndNotJS()) { width = 570; - height = 480; + height = 540; // BH 2019.07.12 added 30 } Desktop.addInternalFrame(frame, @@ -250,14 +325,14 @@ public class Preferences extends GPreferences /* * Set Visual tab defaults */ - seqLimit.setSelected(Cache.getDefault("SHOW_JVSUFFIX", true)); - rightAlign.setSelected(Cache.getDefault("RIGHT_ALIGN_IDS", false)); - fullScreen.setSelected(Cache.getDefault("SHOW_FULLSCREEN", false)); - annotations.setSelected(Cache.getDefault("SHOW_ANNOTATIONS", true)); + seqLimit.setSelected(Cache.getDefault(SHOW_JVSUFFIX, true)); + rightAlign.setSelected(Cache.getDefault(RIGHT_ALIGN_IDS, false)); + fullScreen.setSelected(Cache.getDefault(SHOW_FULLSCREEN, false)); + annotations.setSelected(Cache.getDefault(SHOW_ANNOTATIONS, true)); conservation.setSelected(Cache.getDefault(SHOW_CONSERVATION, true)); quality.setSelected(Cache.getDefault(SHOW_QUALITY, true)); - identity.setSelected(Cache.getDefault("SHOW_IDENTITY", true)); + identity.setSelected(Cache.getDefault(SHOW_IDENTITY, true)); openoverv.setSelected(Cache.getDefault(SHOW_OVERVIEW, false)); showUnconserved .setSelected(Cache.getDefault(SHOW_UNCONSERVED, false)); @@ -271,9 +346,9 @@ public class Preferences extends GPreferences showConsensLogo .setSelected(Cache.getDefault(SHOW_CONSENSUS_LOGO, false)); showNpTooltip - .setSelected(Cache.getDefault("SHOW_NPFEATS_TOOLTIP", true)); + .setSelected(Cache.getDefault(SHOW_NPFEATS_TOOLTIP, true)); showDbRefTooltip - .setSelected(Cache.getDefault("SHOW_DBREFS_TOOLTIP", true)); + .setSelected(Cache.getDefault(SHOW_DBREFS_TOOLTIP, true)); String[] fonts = java.awt.GraphicsEnvironment .getLocalGraphicsEnvironment().getAvailableFontFamilyNames(); @@ -291,23 +366,23 @@ public class Preferences extends GPreferences fontStyleCB.addItem("bold"); fontStyleCB.addItem("italic"); - fontNameCB.setSelectedItem(Cache.getDefault("FONT_NAME", "SansSerif")); - fontSizeCB.setSelectedItem(Cache.getDefault("FONT_SIZE", "10")); + fontNameCB.setSelectedItem(Cache.getDefault(FONT_NAME, "SansSerif")); + fontSizeCB.setSelectedItem(Cache.getDefault(FONT_SIZE, "10")); fontStyleCB.setSelectedItem( - Cache.getDefault("FONT_STYLE", Font.PLAIN + "")); + Cache.getDefault(FONT_STYLE, Font.PLAIN + "")); - smoothFont.setSelected(Cache.getDefault("ANTI_ALIAS", false)); + smoothFont.setSelected(Cache.getDefault(ANTI_ALIAS, false)); scaleProteinToCdna .setSelected(Cache.getDefault(SCALE_PROTEIN_TO_CDNA, false)); - idItalics.setSelected(Cache.getDefault("ID_ITALICS", true)); + idItalics.setSelected(Cache.getDefault(ID_ITALICS, true)); - wrap.setSelected(Cache.getDefault("WRAP_ALIGNMENT", false)); + wrap.setSelected(Cache.getDefault(WRAP_ALIGNMENT, false)); gapSymbolCB.addItem("-"); gapSymbolCB.addItem("."); - gapSymbolCB.setSelectedItem(Cache.getDefault("GAP_SYMBOL", "-")); + gapSymbolCB.setSelectedItem(Cache.getDefault(GAP_SYMBOL, "-")); sortby.addItem("No sort"); sortby.addItem("Id"); @@ -385,6 +460,10 @@ public class Preferences extends GPreferences addTempFactor.setEnabled(structSelected); structViewer.setSelectedItem( Cache.getDefault(STRUCTURE_DISPLAY, ViewerType.JMOL.name())); + Dimension d = Cache.getDefaultDim(STRUCTURE_DIMENSIONS, + DEFAULT_STRUCTURE_DIMENSIONS); + String s = d.width + "," + d.height; + structureDimensions.setText(s); chimeraPath.setText(Cache.getDefault(CHIMERA_PATH, "")); chimeraPath.addActionListener(new ActionListener() { @@ -395,7 +474,7 @@ public class Preferences extends GPreferences } }); - if (Cache.getDefault("MAP_WITH_SIFTS", false)) + if (Cache.getDefault(MAP_WITH_SIFTS, false)) { siftsMapping.setSelected(true); } @@ -405,7 +484,7 @@ public class Preferences extends GPreferences } SiftsSettings - .setMapWithSifts(Cache.getDefault("MAP_WITH_SIFTS", false)); + .setMapWithSifts(Cache.getDefault(MAP_WITH_SIFTS, false)); /* * Set Connections tab defaults @@ -541,7 +620,7 @@ public class Preferences extends GPreferences usagestats.setSelected(Cache.getDefault("USAGESTATS", false)); // note antisense here: default is true questionnaire - .setSelected(Cache.getProperty("NOQUESTIONNAIRES") == null); + .setSelected(Cache.getProperty(NOQUESTIONNAIRES) == null); versioncheck.setSelected(Cache.getDefault("VERSION_CHECK", true)); /* @@ -550,10 +629,10 @@ public class Preferences extends GPreferences setupOutputCombo(epsRendering, "EPS_RENDERING"); setupOutputCombo(htmlRendering, "HTML_RENDERING"); setupOutputCombo(svgRendering, "SVG_RENDERING"); - autoIdWidth.setSelected(Cache.getDefault("FIGURE_AUTOIDWIDTH", false)); + autoIdWidth.setSelected(Cache.getDefault(FIGURE_AUTOIDWIDTH, false)); userIdWidth.setEnabled(!autoIdWidth.isSelected()); userIdWidthlabel.setEnabled(!autoIdWidth.isSelected()); - Integer wi = Cache.getIntegerProperty("FIGURE_FIXEDIDWIDTH"); + Integer wi = Cache.getIntegerProperty(FIGURE_FIXEDIDWIDTH); userIdWidth.setText(wi == null ? "" : wi.toString()); // TODO: refactor to use common enum via FormatAdapter and allow extension // for new flat file formats @@ -572,8 +651,8 @@ public class Preferences extends GPreferences * Set Editing tab defaults */ autoCalculateConsCheck - .setSelected(Cache.getDefault("AUTO_CALC_CONSENSUS", true)); - padGaps.setSelected(Cache.getDefault("PAD_GAPS", false)); + .setSelected(Cache.getDefault(AUTO_CALC_CONSENSUS, true)); + padGaps.setSelected(Cache.getDefault(PAD_GAPS, false)); sortByTree.setSelected(Cache.getDefault(SORT_BY_TREE, false)); annotations_actionPerformed(null); // update the display of the annotation @@ -583,7 +662,11 @@ public class Preferences extends GPreferences /* * Set Backups tab defaults */ - loadLastSavedBackupsOptions(); + if (!Platform.isJS()) + { + loadLastSavedBackupsOptions(); + } + } /** @@ -636,36 +719,36 @@ public class Preferences extends GPreferences /* * Save Visual settings */ - Cache.setPropertyNoSave("SHOW_JVSUFFIX", + Cache.setPropertyNoSave(SHOW_JVSUFFIX, Boolean.toString(seqLimit.isSelected())); - Cache.setPropertyNoSave("RIGHT_ALIGN_IDS", + Cache.setPropertyNoSave(RIGHT_ALIGN_IDS, Boolean.toString(rightAlign.isSelected())); - Cache.setPropertyNoSave("SHOW_FULLSCREEN", + Cache.setPropertyNoSave(SHOW_FULLSCREEN, Boolean.toString(fullScreen.isSelected())); - Cache.setPropertyNoSave("SHOW_OVERVIEW", + Cache.setPropertyNoSave(SHOW_OVERVIEW, Boolean.toString(openoverv.isSelected())); - Cache.setPropertyNoSave("SHOW_ANNOTATIONS", + Cache.setPropertyNoSave(SHOW_ANNOTATIONS, Boolean.toString(annotations.isSelected())); Cache.setPropertyNoSave(SHOW_CONSERVATION, Boolean.toString(conservation.isSelected())); Cache.setPropertyNoSave(SHOW_QUALITY, Boolean.toString(quality.isSelected())); - Cache.setPropertyNoSave("SHOW_IDENTITY", + Cache.setPropertyNoSave(SHOW_IDENTITY, Boolean.toString(identity.isSelected())); - Cache.setPropertyNoSave("GAP_SYMBOL", + Cache.setPropertyNoSave(GAP_SYMBOL, gapSymbolCB.getSelectedItem().toString()); - Cache.setPropertyNoSave("FONT_NAME", + Cache.setPropertyNoSave(FONT_NAME, fontNameCB.getSelectedItem().toString()); - Cache.setPropertyNoSave("FONT_STYLE", + Cache.setPropertyNoSave(FONT_STYLE, fontStyleCB.getSelectedItem().toString()); - Cache.setPropertyNoSave("FONT_SIZE", + Cache.setPropertyNoSave(FONT_SIZE, fontSizeCB.getSelectedItem().toString()); - Cache.setPropertyNoSave("ID_ITALICS", + Cache.setPropertyNoSave(ID_ITALICS, Boolean.toString(idItalics.isSelected())); - Cache.setPropertyNoSave("SHOW_UNCONSERVED", + Cache.setPropertyNoSave(SHOW_UNCONSERVED, Boolean.toString(showUnconserved.isSelected())); Cache.setPropertyNoSave(SHOW_OCCUPANCY, Boolean.toString(showOccupancy.isSelected())); @@ -677,20 +760,19 @@ public class Preferences extends GPreferences Boolean.toString(showConsensHistogram.isSelected())); Cache.setPropertyNoSave(SHOW_CONSENSUS_LOGO, Boolean.toString(showConsensLogo.isSelected())); - Cache.setPropertyNoSave("ANTI_ALIAS", + Cache.setPropertyNoSave(ANTI_ALIAS, Boolean.toString(smoothFont.isSelected())); Cache.setPropertyNoSave(SCALE_PROTEIN_TO_CDNA, Boolean.toString(scaleProteinToCdna.isSelected())); - Cache.setPropertyNoSave("SHOW_NPFEATS_TOOLTIP", + Cache.setPropertyNoSave(SHOW_NPFEATS_TOOLTIP, Boolean.toString(showNpTooltip.isSelected())); - Cache.setPropertyNoSave("SHOW_DBREFS_TOOLTIP", + Cache.setPropertyNoSave(SHOW_DBREFS_TOOLTIP, Boolean.toString(showDbRefTooltip.isSelected())); - Cache.setPropertyNoSave("WRAP_ALIGNMENT", + Cache.setPropertyNoSave(WRAP_ALIGNMENT, Boolean.toString(wrap.isSelected())); - Cache.setPropertyNoSave("STARTUP_FILE", - startupFileTextfield.getText()); + Cache.setPropertyNoSave("STARTUP_FILE", startupFileTextfield.getText()); Cache.setPropertyNoSave("SHOW_STARTUP_FILE", Boolean.toString(startupCheckbox.isSelected())); @@ -702,8 +784,7 @@ public class Preferences extends GPreferences .forDescription(sortAnnBy.getSelectedItem().toString()); if (annSortOrder != null) { - Cache.setPropertyNoSave(SORT_ANNOTATIONS, - annSortOrder.name()); + Cache.setPropertyNoSave(SORT_ANNOTATIONS, annSortOrder.name()); } final boolean showAutocalcFirst = sortAutocalc.getSelectedIndex() == 0; @@ -745,8 +826,10 @@ public class Preferences extends GPreferences Boolean.toString(structFromPdb.isSelected())); Cache.setPropertyNoSave(STRUCTURE_DISPLAY, structViewer.getSelectedItem().toString()); + Cache.setPropertyNoSave(STRUCTURE_DIMENSIONS, + structureDimensions.getText()); // BH 2019.07.12 Cache.setOrRemove(CHIMERA_PATH, chimeraPath.getText()); - Cache.setPropertyNoSave("MAP_WITH_SIFTS", + Cache.setPropertyNoSave(MAP_WITH_SIFTS, Boolean.toString(siftsMapping.isSelected())); SiftsSettings.setMapWithSifts(siftsMapping.isSelected()); @@ -779,8 +862,7 @@ public class Preferences extends GPreferences } else { - Cache.setPropertyNoSave("SEQUENCE_LINKS", - menuLinks.toString()); + Cache.setPropertyNoSave("SEQUENCE_LINKS", menuLinks.toString()); } String nonMenuLinks = sequenceUrlLinks.writeUrlsAsString(false); @@ -790,8 +872,7 @@ public class Preferences extends GPreferences } else { - Cache.setPropertyNoSave("STORED_LINKS", - nonMenuLinks.toString()); + Cache.setPropertyNoSave("STORED_LINKS", nonMenuLinks.toString()); } Cache.setPropertyNoSave("DEFAULT_URL", @@ -824,13 +905,13 @@ public class Preferences extends GPreferences } if (!questionnaire.isSelected()) { - Cache.setProperty("NOQUESTIONNAIRES", "true"); + Cache.setProperty(NOQUESTIONNAIRES, "true"); } else { // special - made easy to edit a property file to disable questionnaires // by just adding the given line - Cache.removeProperty("NOQUESTIONNAIRES"); + Cache.removeProperty(NOQUESTIONNAIRES); } /* @@ -854,46 +935,44 @@ public class Preferences extends GPreferences Boolean.toString(modellerOutput.isSelected())); Cache.setPropertyNoSave("EXPORT_EMBBED_BIOJSON", Boolean.toString(embbedBioJSON.isSelected())); - Cache.setPropertyNoSave("FIGURE_AUTOIDWIDTH", + Cache.setPropertyNoSave(FIGURE_AUTOIDWIDTH, Boolean.toString(autoIdWidth.isSelected())); userIdWidth_actionPerformed(); - Cache.setPropertyNoSave("FIGURE_FIXEDIDWIDTH", - userIdWidth.getText()); + Cache.setPropertyNoSave("FIGURE_FIXEDIDWIDTH", userIdWidth.getText()); /* * Save Editing settings */ - Cache.setPropertyNoSave("AUTO_CALC_CONSENSUS", + Cache.setPropertyNoSave(AUTO_CALC_CONSENSUS, Boolean.toString(autoCalculateConsCheck.isSelected())); - Cache.setPropertyNoSave("SORT_BY_TREE", + Cache.setPropertyNoSave(SORT_BY_TREE, Boolean.toString(sortByTree.isSelected())); - Cache.setPropertyNoSave("PAD_GAPS", + Cache.setPropertyNoSave(PAD_GAPS, Boolean.toString(padGaps.isSelected())); if (!Platform.isJS()) { wsPrefs.updateAndRefreshWsMenuConfig(false); - } + /* + * Save Backups settings + */ + Cache.setPropertyNoSave(BackupFiles.CONFIRM_DELETE_OLD, + Boolean.toString(backupfilesConfirmDelete.isSelected())); + Cache.setPropertyNoSave(BackupFiles.ENABLED, + Boolean.toString(enableBackupFiles.isSelected())); + Cache.setPropertyNoSave(BackupFiles.NO_MAX, + Boolean.toString(backupfilesKeepAll.isSelected())); + Cache.setPropertyNoSave(BackupFiles.REVERSE_ORDER, + Boolean.toString(suffixReverse.isSelected())); + Cache.setPropertyNoSave(BackupFiles.SUFFIX, suffixTemplate.getText()); + Cache.setPropertyNoSave(BackupFiles.ROLL_MAX, Integer + .toString(getSpinnerInt(backupfilesRollMaxSpinner, 4))); + Cache.setPropertyNoSave(BackupFiles.SUFFIX_DIGITS, + Integer.toString(getSpinnerInt(suffixDigitsSpinner, 3))); + Cache.setPropertyNoSave(BackupFiles.NS + "_PRESET", Integer + .toString(getComboIntStringKey(backupfilesPresetsCombo))); - /* - * Save Backups settings - */ - Cache.setPropertyNoSave(BackupFiles.CONFIRM_DELETE_OLD, - Boolean.toString(backupfilesConfirmDelete.isSelected())); - Cache.setPropertyNoSave(BackupFiles.ENABLED, - Boolean.toString(enableBackupFiles.isSelected())); - Cache.setPropertyNoSave(BackupFiles.NO_MAX, - Boolean.toString(backupfilesKeepAll.isSelected())); - Cache.setPropertyNoSave(BackupFiles.REVERSE_ORDER, - Boolean.toString(suffixReverse.isSelected())); - Cache.setPropertyNoSave(BackupFiles.SUFFIX, - suffixTemplate.getText()); - Cache.setPropertyNoSave(BackupFiles.ROLL_MAX, - Integer.toString(getSpinnerInt(backupfilesRollMaxSpinner, 4))); - Cache.setPropertyNoSave(BackupFiles.SUFFIX_DIGITS, - Integer.toString(getSpinnerInt(suffixDigitsSpinner, 3))); - Cache.setPropertyNoSave(BackupFiles.NS + "_PRESET", - Integer.toString(getComboIntStringKey(backupfilesPresetsCombo))); + } Cache.saveProperties(); Desktop.getInstance().doConfigureStructurePrefs(); @@ -935,9 +1014,9 @@ public class Preferences extends GPreferences Cache.setPropertyNoSave(SHOW_CONSERVATION, "true"); Cache.setPropertyNoSave(SHOW_QUALITY, "false"); Cache.setPropertyNoSave(SHOW_CONSENSUS, "true"); - Cache.setPropertyNoSave("SHOW_UNCONSERVED", "false"); - Cache.setPropertyNoSave("SHOW_GROUP_CONSERVATION", "false"); - Cache.setPropertyNoSave("SHOW_GROUP_CONCENSUS", "false"); + Cache.setPropertyNoSave(SHOW_UNCONSERVED, "false"); + Cache.setPropertyNoSave(SHOW_GROUP_CONSERVATION, "false"); + Cache.setPropertyNoSave(SHOW_GROUP_CONSENSUS, "false"); // TODO -- just a start here }