X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPreferences.java;h=04b83a398f9a5762c5283eaa00b3ffee6f099254;hb=006890b02106eb31841e6e84d75f1027434823e0;hp=35641f81d7f1815baf67fe5666201591a339654a;hpb=26b115b0a77d521da92a06572d9b7819c2d0d49a;p=jalview.git diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java index 35641f8..04b83a3 100755 --- a/src/jalview/gui/Preferences.java +++ b/src/jalview/gui/Preferences.java @@ -24,6 +24,8 @@ import jalview.analysis.AnnotationSorter.SequenceAnnotationOrder; import jalview.bin.Cache; import jalview.gui.Help.HelpId; import jalview.gui.StructureViewer.ViewerType; +import jalview.io.BackupFiles; +import jalview.io.BackupFilesPresetEntry; import jalview.io.FileFormatI; import jalview.io.JalviewFileChooser; import jalview.io.JalviewFileView; @@ -189,6 +191,11 @@ public class Preferences extends GPreferences frame = new JInternalFrame(); frame.setContentPane(this); if (!Platform.isJS()) + /** + * Java only + * + * @j2sIgnore + */ { wsPrefs = new WsPreferences(); wsTab.add(wsPrefs, BorderLayout.CENTER); @@ -253,7 +260,7 @@ public class Preferences extends GPreferences fontStyleCB.setSelectedItem( Cache.getDefault("FONT_STYLE", Font.PLAIN + "")); - smoothFont.setSelected(Cache.getDefault("ANTI_ALIAS", false)); + smoothFont.setSelected(Cache.getDefault("ANTI_ALIAS", true)); scaleProteinToCdna .setSelected(Cache.getDefault(SCALE_PROTEIN_TO_CDNA, false)); @@ -327,7 +334,7 @@ public class Preferences extends GPreferences gapLabel.setEnabled(!useLegacyGap.isSelected()); gapColour.setEnabled(!useLegacyGap.isSelected()); showHiddenAtStart - .setSelected(Cache.getDefault(SHOW_OV_HIDDEN_AT_START, true)); + .setSelected(Cache.getDefault(SHOW_OV_HIDDEN_AT_START, false)); /* * Set Structure tab defaults. @@ -535,6 +542,12 @@ public class Preferences extends GPreferences annotations_actionPerformed(null); // update the display of the annotation // settings + + + /* + * Set Backups tab defaults + */ + loadLastSavedBackupsOptions(); } /** @@ -823,6 +836,30 @@ public class Preferences extends GPreferences { wsPrefs.updateAndRefreshWsMenuConfig(false); } + + /* + * Save Backups settings + */ + Cache.applicationProperties.setProperty(BackupFiles.ENABLED, + Boolean.toString(enableBackupFiles.isSelected())); + int preset = getComboIntStringKey(backupfilesPresetsCombo); + Cache.applicationProperties.setProperty(BackupFiles.NS + "_PRESET", Integer.toString(preset)); + + if (preset == BackupFilesPresetEntry.BACKUPFILESSCHEMECUSTOM) + { + BackupFilesPresetEntry customBFPE = getBackupfilesCurrentEntry(); + BackupFilesPresetEntry.backupfilesPresetEntriesValues.put( + BackupFilesPresetEntry.BACKUPFILESSCHEMECUSTOM, customBFPE); + Cache.applicationProperties + .setProperty(BackupFilesPresetEntry.CUSTOMCONFIG, + customBFPE.toString()); + } + + BackupFilesPresetEntry savedBFPE = BackupFilesPresetEntry.backupfilesPresetEntriesValues + .get(preset); + Cache.applicationProperties.setProperty( + BackupFilesPresetEntry.SAVEDCONFIG, savedBFPE.toString()); + Cache.saveProperties(); Desktop.instance.doConfigureStructurePrefs(); try @@ -1040,8 +1077,11 @@ public class Preferences extends GPreferences public void defaultBrowser_mouseClicked(MouseEvent e) { // TODO: JAL-3048 not needed for j2s - /* - * @j2sNative + if (!Platform.isJS()) // BH 2019 + /** + * Java only + * + * @j2sIgnore */ { JFileChooser chooser = new JFileChooser("."); @@ -1134,7 +1174,7 @@ public class Preferences extends GPreferences { useLegacyGap.setSelected(false); useLegacyGaps_actionPerformed(null); - showHiddenAtStart.setSelected(true); + showHiddenAtStart.setSelected(false); hiddenColour.setBackground( jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_HIDDEN); }