@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 AUTOASSOCIATE_PDBANDSEQS = "AUTOASSOCIATE_PDBANDSEQS";
+ public static final String BLOSUM62_PCA_FOR_NUCLEOTIDE = "BLOSUM62_PCA_FOR_NUCLEOTIDE";
+
public static final String CENTRE_COLUMN_LABELS = "CENTRE_COLUMN_LABELS";
public static final String CHIMERA_PATH = "CHIMERA_PATH";
public static final String SHOW_DBREFS_TOOLTIP = "SHOW_DBREFS_TOOLTIP";
+ public static final String SHOW_FULLSCREEN = "SHOW_FULLSCREEN";
+
public static final String SHOW_GROUP_CONSENSUS = "SHOW_GROUP_CONSENSUS";
public static final String SHOW_GROUP_CONSERVATION = "SHOW_GROUP_CONSERVATION";
+ public static final String SHOW_IDENTITY = "SHOW_IDENTITY";
+
public static final String SHOW_JVSUFFIX = "SHOW_JVSUFFIX";
public static final String SHOW_NPFEATS_TOOLTIP = "SHOW_NPFEATS_TOOLTIP";
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 List<String> 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
{
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,
addSecondaryStructure.setEnabled(structSelected);
addTempFactor.setSelected(Cache.getDefault(ADD_TEMPFACT_ANN, false));
addTempFactor.setEnabled(structSelected);
+ if (!Platform.isJS())
+ {
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()
{
/*
* Set Backups tab defaults
*/
- loadLastSavedBackupsOptions();
+ if (!Platform.isJS())
+ {
+ loadLastSavedBackupsOptions();
+ }
+
}
/**
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()));
.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;
protColour.getSelectedItem().toString());
Cache.setPropertyNoSave(DEFAULT_COLOUR_NUC,
nucColour.getSelectedItem().toString());
- Cache.setColourProperty(ANNOTATIONCOLOUR_MIN,
+ Cache.setColourPropertyNoSave(ANNOTATIONCOLOUR_MIN,
minColour.getBackground());
- Cache.setColourProperty(ANNOTATIONCOLOUR_MAX,
+ Cache.setColourPropertyNoSave(ANNOTATIONCOLOUR_MAX,
maxColour.getBackground());
/*
* Save Overview settings
*/
- Cache.setColourProperty(GAP_COLOUR, gapColour.getBackground());
- Cache.setColourProperty(HIDDEN_COLOUR, hiddenColour.getBackground());
+ Cache.setColourPropertyNoSave(GAP_COLOUR, gapColour.getBackground());
+ Cache.setColourPropertyNoSave(HIDDEN_COLOUR,
+ hiddenColour.getBackground());
Cache.setPropertyNoSave(USE_LEGACY_GAP,
Boolean.toString(useLegacyGap.isSelected()));
Cache.setPropertyNoSave(SHOW_OV_HIDDEN_AT_START,
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,
Boolean.toString(siftsMapping.isSelected()));
}
else
{
- Cache.setPropertyNoSave("SEQUENCE_LINKS",
- menuLinks.toString());
+ Cache.setPropertyNoSave("SEQUENCE_LINKS", menuLinks.toString());
}
String nonMenuLinks = sequenceUrlLinks.writeUrlsAsString(false);
}
else
{
- Cache.setPropertyNoSave("STORED_LINKS",
- nonMenuLinks.toString());
+ Cache.setPropertyNoSave("STORED_LINKS", nonMenuLinks.toString());
}
Cache.setPropertyNoSave("DEFAULT_URL",
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
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();
}
/**
- * DOCUMENT ME!
+ * Opens a file browser, and if a file is chosen, sets its path as the text of
+ * the 'startup file' text field
*/
@Override
public void startupFileTextfield_mouseClicked()
FileFormatI format = chooser.getSelectedFormat();
if (format != null)
{
- Cache.setPropertyNoSave("DEFAULT_FILE_FORMAT",
- format.getName());
+ /*
+ * saving properties to file is deferred to the 'OK' action
+ */
+ Cache.setPropertyNoSave("DEFAULT_FILE_FORMAT", format.getName());
}
startupFileTextfield
.setText(chooser.getSelectedFile().getAbsolutePath());
git://source.jalview.org / jalview.git / blobdiff