*/
package jalview.jbgui;
+import jalview.bin.Cache;
import jalview.fts.core.FTSDataColumnPreferences;
import jalview.fts.core.FTSDataColumnPreferences.PreferenceSource;
import jalview.fts.service.pdb.PDBFTSRestClient;
import jalview.gui.JalviewBooleanRadioButtons;
import jalview.gui.JvSwingUtils;
import jalview.gui.StructureViewer.ViewerType;
-import jalview.io.BackupFilenameFilter;
+import jalview.io.BackupFilenameParts;
import jalview.io.BackupFiles;
import jalview.util.MessageManager;
import javax.swing.JComboBox;
import javax.swing.JFileChooser;
import javax.swing.JLabel;
+import javax.swing.JList;
import javax.swing.JPanel;
import javax.swing.JRadioButton;
import javax.swing.JScrollPane;
protected JPanel presetsPanel = new JPanel();
+ protected JButton revertButton = new JButton();
+
protected JComboBox<IntKeyStringValueEntry> backupfilesPresetsCombo = new JComboBox<>();
protected JPanel suffixPanel = new JPanel();
}
/**
+ * Load the saved Backups options EXCEPT "Enabled" and "Scheme"
+ */
+
+ protected void loadLastSavedBackupsOptions()
+ {
+ enableBackupFiles
+ .setSelected(Cache.getDefault(BackupFiles.ENABLED, true));
+ setComboIntStringKey(backupfilesPresetsCombo,
+ Cache.getDefault(BackupFiles.NS + "_PRESET", 1));
+ suffixTemplate.setText(Cache.getDefault(BackupFiles.SUFFIX,
+ ".bak" + BackupFiles.NUM_PLACEHOLDER));
+ suffixDigitsSpinner
+ .setValue(Cache.getDefault(BackupFiles.SUFFIX_DIGITS, 3));
+ suffixReverse.setSelected(
+ Cache.getDefault(BackupFiles.REVERSE_ORDER, false));
+ backupfilesKeepAll
+ .setSelected(Cache.getDefault(BackupFiles.NO_MAX, false));
+ backupfilesRollMaxSpinner
+ .setValue(Cache.getDefault(BackupFiles.ROLL_MAX, 3));
+ backupfilesConfirmDelete.setSelected(
+ Cache.getDefault(BackupFiles.CONFIRM_DELETE_OLD, true));
+
+ backupsOptionsSetEnabled();
+ updateBackupFilesExampleLabel();
+ }
+
+ /**
* Initialises the Backups tabbed panel.
*
* @return
backupsTab.setLayout(new GridBagLayout());
GridBagConstraints gbc = new GridBagConstraints();
- gbc.weightx = 1.0;
+ gbc.weightx = 0.0;
gbc.weighty = 0.0;
- gbc.anchor = GridBagConstraints.NORTHWEST;
+ gbc.anchor = GridBagConstraints.FIRST_LINE_START;
gbc.fill = GridBagConstraints.NONE;
initBackupsTabPresetsPanel();
initBackupsTabKeepFilesPanel();
initBackupsTabFilenameExamplesPanel();
- gbc.weightx = 0.5;
enableBackupFiles.setFont(LABEL_FONT_BOLD);
enableBackupFiles
.setText(MessageManager.getString("label.enable_backupfiles"));
{
boolean selected = enableBackupFiles.isSelected();
// enable other options only when the first is checked
- backupsOptionsSetEnabled(selected);
+ backupsOptionsSetEnabled();
}
});
- // enable checkbox 1 row
+
+ // enable checkbox 1 col
gbc.gridwidth = 1;
+ gbc.gridheight = 1;
gbc.gridx = 0;
- gbc.gridy = 0;
+ gbc.gridy = 0; // row 0
backupsTab.add(enableBackupFiles, gbc);
+ // summary of scheme box (over two rows)
gbc.gridx = 1;
- gbc.weightx = 1.0;
+ gbc.weightx = 0.0;
gbc.gridheight = 2;
- // gbc.anchor = GridBagConstraints.NORTHEAST;
- // gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.anchor = GridBagConstraints.FIRST_LINE_END;
+ gbc.fill = GridBagConstraints.BOTH;
backupsTab.add(exampleFilesPanel, gbc);
+ gbc.gridheight = 1;
+ gbc.anchor = GridBagConstraints.FIRST_LINE_START;
+ gbc.fill = GridBagConstraints.NONE;
+ // fill empty space on right
+ gbc.gridx++;
+ gbc.weightx = 1.0;
+ backupsTab.add(new JPanel(), gbc);
+
+ // schemes box
+ gbc.weightx = 0.0;
gbc.gridx = 0;
- gbc.gridy = 1;
+ gbc.gridy++; // row 1
backupsTab.add(presetsPanel, gbc);
- gbc.anchor = GridBagConstraints.NORTHWEST;
- gbc.fill = GridBagConstraints.NONE;
+ // gbc.anchor = GridBagConstraints.NORTHWEST;
+ // now using whole row
gbc.gridwidth = 2;
gbc.gridheight = 1;
- // whole suffix panel next row
+ // keep files box
gbc.gridx = 0;
- gbc.gridy = 2;
- backupsTab.add(suffixPanel, gbc);
-
- // keep files panel
- gbc.gridy = 3;
+ gbc.gridy++; // row 2
backupsTab.add(keepfilesPanel, gbc);
- /*
- // whole examples panel next row
- gbc.gridy = 3;
- backupsTab.add(exampleFilesPanel, gbc);
-
+ // filename strategy box
+ gbc.gridy++; // row 3
+ backupsTab.add(suffixPanel, gbc);
+
// fill empty space
- gbc.gridy = 4;
+ gbc.gridy++; // row 4
gbc.weighty = 1.0;
backupsTab.add(new JPanel(), gbc);
- */
- backupsOptionsSetEnabled(enableBackupFiles.isSelected());
+ backupsOptionsSetEnabled();
return backupsTab;
}
+ private final int BACKUPFILESSCHEMECUSTOMISE = 0;
private final IntKeyStringValueEntry[] backupfilesPresetEntries = {
new IntKeyStringValueEntry(1,
MessageManager.getString("label.default")),
new IntKeyStringValueEntry(2,
MessageManager.getString("label.single_file")),
new IntKeyStringValueEntry(3,
- MessageManager.getString("label.keep_everything")),
+ MessageManager.getString("label.keep_all_versions")),
new IntKeyStringValueEntry(4,
MessageManager.getString("label.rolled_backups")),
// ...
+ // new IntKeyStringValueEntry(255,
+ // MessageManager.getString("label.previously_saved_scheme")),
// IMPORTANT, keep "Custom" entry with key 0 (even though it appears last)
- new IntKeyStringValueEntry(0,
- MessageManager.getString("label.custom")) };
+ new IntKeyStringValueEntry(BACKUPFILESSCHEMECUSTOMISE,
+ MessageManager.getString("label.customise")) };
private final Map<Integer, BackupFilesPresetEntry> backupfilesPresetEntriesValues = new HashMap<Integer, BackupFilesPresetEntry>()
{
{
- put(1, new BackupFilesPresetEntry(".v" + BackupFiles.NUM_PLACEHOLDER,
- 3, false, false, 4, false));
+ put(1, new BackupFilesPresetEntry(
+ ".bak" + BackupFiles.NUM_PLACEHOLDER, 3, false, false, 3,
+ false));
put(2, new BackupFilesPresetEntry("~", 1, false, false, 1, false));
put(3, new BackupFilesPresetEntry(".v" + BackupFiles.NUM_PLACEHOLDER,
3, false, true, 10, true));
private JPanel initBackupsTabPresetsPanel()
{
- presetsPanel.setBorder(
- new TitledBorder(MessageManager.getString("label.presets")));
+
+ String title = MessageManager.getString("label.schemes");
+ // TitledBorder tb = new TitledBorder(new EmptyBorder(0, 0, 0, 0), title);
+ // TitledBorder tb = new TitledBorder(title);
+ // tb.setTitleFont(LABEL_FONT);
+ // presetsPanel.setBorder(tb);
+
+ presetsPanel.setLayout(new GridBagLayout());
+
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.weightx = 0.0;
+ gbc.weighty = 0.0;
+ gbc.anchor = GridBagConstraints.BASELINE_LEADING;
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.gridwidth = 1;
+ gbc.gridheight = 1;
+
+ // "Scheme: "
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ presetsPanel.add(new JLabel(title + ":"), gbc);
for (int i = 0; i < backupfilesPresetEntries.length; i++)
{
backupfilesPresetsCombo.addItem(backupfilesPresetEntries[i]);
}
+ // put "Previously saved scheme" item in italics (it's not really
+ // selectable, as such -- it deselects itself when selected) and
+ // "Customise" in bold
+ backupfilesPresetsCombo
+ .setRenderer(new BackupFilesPresetsComboBoxRenderer());
backupfilesPresetsCombo.addActionListener(new ActionListener()
{
@Override
}
});
- presetsPanel.add(backupfilesPresetsCombo);
+ // dropdown list of preset schemes
+ gbc.gridx = 1;
+ presetsPanel.add(backupfilesPresetsCombo, gbc);
+
+ revertButton.setText(MessageManager.getString("label.cancel_changes"));
+ revertButton.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ loadLastSavedBackupsOptions();
+ }
+
+ });
+ revertButton.setFont(LABEL_FONT);
+
+ // "Cancel changes" button (aligned with combo box above)
+ gbc.gridx = 1;
+ gbc.gridy++;
+ presetsPanel.add(revertButton, gbc);
+
return presetsPanel;
}
+ private JPanel initBackupsTabFilenameExamplesPanel()
+ {
+ String title = MessageManager
+ .getString("label.summary_of_backups_scheme");
+ TitledBorder tb = new TitledBorder(title);
+ exampleFilesPanel.setBorder(tb);
+ exampleFilesPanel.setLayout(new GridBagLayout());
+
+
+ backupfilesExampleLabel.setEditable(false);
+ backupfilesExampleLabel
+ .setBackground(exampleFilesPanel.getBackground());
+
+ updateBackupFilesExampleLabel();
+
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.anchor = GridBagConstraints.FIRST_LINE_START;
+
+ exampleFilesPanel.add(backupfilesExampleLabel, gbc);
+ return exampleFilesPanel;
+ }
+
private void backupsTabUpdatePresets()
{
IntKeyStringValueEntry entry = (IntKeyStringValueEntry) backupfilesPresetsCombo
.getSelectedItem();
int key = entry.getKey();
String value = entry.getValue();
- boolean custom = key == 0;
- if (custom)
- {
- // backupsSetCustomOptions();
- }
- else
+ // BACKUPFILESSCHEMECUSTOMISE (==0) reserved for "Custom"
+ if (key != BACKUPFILESSCHEMECUSTOMISE)
{
if (backupfilesPresetEntriesValues.containsKey(key))
{
}
else
{
- System.out.println("Preset '" + value + "' not implemented yet");
+ System.out.println("Preset '" + value + "' not implemented");
}
}
+ backupfilesCustomOptionsSetEnabled();
updateBackupFilesExampleLabel();
- backupsCustomOptionsSetEnabled(custom);
}
protected int getComboIntStringKey(JComboBox c)
private JPanel initBackupsTabSuffixPanel()
{
suffixPanel.setBorder(new TitledBorder(
- MessageManager.getString("label.suffix_format")));
+ MessageManager.getString("label.backup_filename_strategy")));
suffixPanel.setLayout(new GridBagLayout());
suffixTemplateLabel
- .setText(MessageManager.getString("label.suffix_template"));
+ .setText(MessageManager.getString("label.append_to_filename"));
suffixTemplateLabel.setHorizontalAlignment(SwingConstants.LEFT);
suffixTemplateLabel.setFont(LABEL_FONT);
final String tooltip = JvSwingUtils.wrapTooltip(true,
- MessageManager.getString("label.suffix_template_tooltip"));
+ MessageManager.getString("label.append_to_filename_tooltip"));
suffixTemplate.setToolTipText(tooltip);
suffixTemplate.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
{
updateBackupFilesExampleLabel();
+ backupfilesCustomOptionsSetEnabled();
}
});
public void keyReleased(KeyEvent e)
{
updateBackupFilesExampleLabel();
+ backupfilesCustomOptionsSetEnabled();
}
@Override
{
}
- // disable use of ':'
+ // disable use of ':' or '/' or '\'
@Override
public void keyTyped(KeyEvent e)
{
char c = e.getKeyChar();
- if (c == ':')
+ if (c == ':' || c == '/' || c == '\\')
{
- // don't process ':'
+ // don't process ':' or '/' or '\'
e.consume();
}
}
return suffixPanel;
}
- private void backupfilesKeepAllEnabled(boolean enabled)
- {
- backupfilesKeepAll.setEnabled(enabled);
- keepRollMaxOptionsEnabled();
- }
-
private JPanel initBackupsTabKeepFilesPanel()
{
keepfilesPanel.setBorder(
JPanel jp = new JPanel();
jp.setLayout(new FlowLayout());
oldBackupFilesLabel
- .setText(MessageManager.getString("label.old_backup_files"));
+ .setText(MessageManager
+ .getString("label.autodelete_old_backup_files"));
oldBackupFilesLabel.setFont(LABEL_FONT);
oldBackupFilesLabel.setHorizontalAlignment(SwingConstants.LEFT);
jp.add(oldBackupFilesLabel);
return keepfilesPanel;
}
- private JPanel initBackupsTabFilenameExamplesPanel()
- {
- String title = MessageManager.getString("label.example_filenames");
- TitledBorder tb = new TitledBorder(title);
- // tb.setTitleFont(LABEL_FONT);
- exampleFilesPanel.setBorder(tb);
- exampleFilesPanel.setLayout(new GridBagLayout());
-
- // inordinately difficult to get this titledborder the right size for the
- // title
-
- backupfilesExampleLabel.setEditable(false);
- backupfilesExampleLabel.setPreferredSize(new Dimension(280, 85));
- backupfilesExampleLabel.setAlignmentX(LEFT_ALIGNMENT);
- backupfilesExampleLabel.setAlignmentY(TOP_ALIGNMENT);
-
- backupfilesExampleLabel.setFont(LABEL_FONT_ITALIC);
- backupfilesExampleLabel
- .setBackground(exampleFilesPanel.getBackground());
-
- updateBackupFilesExampleLabel();
- exampleFilesPanel.setMinimumSize(new Dimension(280, 85));
-
- GridBagConstraints gbc = new GridBagConstraints();
- gbc.anchor = GridBagConstraints.EAST;
-
- gbc.gridy = 0;
- exampleFilesPanel.add(backupfilesExampleLabel, gbc);
- return exampleFilesPanel;
- }
-
protected void updateBackupFilesExampleLabel()
{
int exampleindex = 12;
- String base = MessageManager.getString("label.filename");
- if (base == null || base.length() > 0)
+ String base = MessageManager.getString("label.filename") + ".fa";
+ if (base == null || base.length() == 0)
{
- base = "filename.fa";
+ base = "file_name.fa";
}
+ boolean reverse = suffixReverse.isSelected();
+ boolean keepAll = backupfilesKeepAll.isSelected();
+ int rollMax = 4;
String suffix = suffixTemplate.getText();
int digits = 3;
- try
- {
- suffixDigitsSpinner.commitEdit();
- digits = (Integer) suffixDigitsSpinner.getValue();
- digits = digits < 1 ? 1 : digits;
- } catch (Exception e)
+
+ backupfilesExampleLabel.setFont(LABEL_FONT_ITALIC);
+ if (suffix == null || suffix.length() == 0)
{
- System.out.println(
- "Failed casting (Integer) suffixTemplateSpinner.getValue()");
+ backupfilesExampleLabel
+ .setText(MessageManager.getString("label.no_backup_files"));
+ backupfilesExampleLabel.setFont(LABEL_FONT_BOLD);
+ return;
}
- boolean reverse = suffixReverse.isSelected();
- boolean keepAll = backupfilesKeepAll.isSelected();
- int rollMax = 4;
+
try
{
backupfilesRollMaxSpinner.commitEdit();
"Failed casting (Integer) backupfilesRollMaxSpinner.getValue()");
}
+ if (suffix.indexOf(BackupFiles.NUM_PLACEHOLDER) == -1)
+ {
+ rollMax = 1;
+ }
+
+ try
+ {
+ suffixDigitsSpinner.commitEdit();
+ digits = (Integer) suffixDigitsSpinner.getValue();
+ digits = digits < 1 ? 1 : digits;
+ } catch (Exception e)
+ {
+ System.out.println(
+ "Failed casting (Integer) suffixTemplateSpinner.getValue()");
+ }
+
int lowersurround = 2;
int uppersurround = 0;
StringBuilder exampleSB = new StringBuilder();
{
exampleSB.append("\n");
}
- exampleSB.append(BackupFilenameFilter.getBackupFilename(index,
+ exampleSB.append(BackupFilenameParts.getBackupFilename(index,
base, suffix, digits));
if (min == max)
{
{
exampleSB.append("\n");
}
- exampleSB.append(BackupFilenameFilter.getBackupFilename(index,
+ exampleSB.append(BackupFilenameParts.getBackupFilename(index,
base, suffix, digits));
if (min == max)
{
return i;
}
- protected void keepRollMaxOptionsEnabled()
+ private void keepRollMaxOptionsEnabled()
{
- keepRollMaxOptionsEnabled(backupfilesKeepAll.isEnabled());
+ boolean enabled = backupfilesKeepAll.isEnabled()
+ && !backupfilesKeepAll.isSelected();
+ oldBackupFilesLabel.setEnabled(enabled);
+ backupfilesRollMaxSpinner.setEnabled(enabled);
+ backupfilesConfirmDelete.setEnabled(enabled);
}
- protected void keepRollMaxOptionsEnabled(boolean tryEnabled)
+ private void backupfilesKeepAllSetEnabled(boolean tryEnabled)
{
- boolean enabled = tryEnabled && !backupfilesKeepAll.isSelected();
+ boolean enabled = tryEnabled && enableBackupFiles.isSelected()
+ && getComboIntStringKey(backupfilesPresetsCombo) == 0
+ && suffixTemplate.getText()
+ .indexOf(BackupFiles.NUM_PLACEHOLDER) > -1;
+ keepfilesPanel.setEnabled(enabled);
+ backupfilesKeepAll.setEnabled(enabled);
oldBackupFilesLabel.setEnabled(enabled);
- backupfilesRollMaxSpinner.setEnabled(enabled);
- backupfilesConfirmDelete.setEnabled(enabled);
+ keepRollMaxOptionsEnabled();
}
- protected void backupsCustomOptionsSetEnabled(boolean enabled)
+ private void backupfilesSuffixTemplateDigitsSetEnabled()
{
- backupsOptionsSetEnabled(enabled, false);
+ boolean enabled = suffixTemplate.isEnabled() && suffixTemplate.getText()
+ .indexOf(BackupFiles.NUM_PLACEHOLDER) > -1;
+ suffixDigitsLabel.setEnabled(enabled);
+ suffixDigitsSpinner.setEnabled(enabled);
+ suffixReverse.setEnabled(enabled);
}
- protected void backupsOptionsSetEnabled(boolean enabled)
+ private void backupfilesSuffixTemplateSetEnabled(boolean tryEnabled)
{
- backupsOptionsSetEnabled(enabled, true);
+ boolean enabled = tryEnabled && enableBackupFiles.isSelected()
+ && getComboIntStringKey(backupfilesPresetsCombo) == 0;
+ suffixPanel.setEnabled(enabled);
+ suffixTemplateLabel.setEnabled(enabled);
+ suffixTemplate.setEnabled(enabled);
+ backupfilesSuffixTemplateDigitsSetEnabled();
}
- protected void backupsOptionsSetEnabled(boolean enabled, boolean all)
+ protected void backupfilesCustomOptionsSetEnabled()
{
+ int scheme = getComboIntStringKey(backupfilesPresetsCombo);
+ boolean enabled = scheme == 0 && enableBackupFiles.isSelected();
- if (all)
- {
- presetsPanel.setEnabled(enabled);
- exampleFilesPanel.setEnabled(enabled);
+ backupfilesSuffixTemplateSetEnabled(enabled);
+ backupfilesKeepAllSetEnabled(enabled);
+ }
- backupfilesPresetsCombo.setEnabled(enabled);
- backupfilesExampleLabel.setEnabled(enabled);
- }
- suffixPanel.setEnabled(enabled);
- keepfilesPanel.setEnabled(enabled);
+ private void backupfilesSummarySetEnabled()
+ {
+ boolean enabled = enableBackupFiles.isSelected();
+ backupfilesExampleLabel.setEnabled(enabled);
+ exampleFilesPanel.setEnabled(enabled);
+ }
- suffixTemplate.setEnabled(enabled);
- suffixTemplateLabel.setEnabled(enabled);
- suffixDigitsLabel.setEnabled(enabled);
- suffixDigitsSpinner.setEnabled(enabled);
- suffixReverse.setEnabled(enabled);
- oldBackupFilesLabel.setEnabled(enabled);
- backupfilesKeepAllEnabled(enabled);
+ private void backupfilesPresetsSetEnabled()
+ {
+ boolean enabled = enableBackupFiles.isSelected();
+ presetsPanel.setEnabled(enabled);
+ backupfilesPresetsCombo.setEnabled(enabled);
+ }
- if (enabled && all)
- {
- backupsTabUpdatePresets();
- }
+ protected void backupsOptionsSetEnabled()
+ {
+ backupfilesPresetsSetEnabled();
+ backupfilesSummarySetEnabled();
+ backupfilesCustomOptionsSetEnabled();
}
protected void backupsSetOptions(String suffix, int digits,
this.confirmDelete = confirmDelete;
}
}
+
+class BackupFilesPresetsComboBoxRenderer extends DefaultListCellRenderer
+{
+ @Override
+ public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+ super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+
+ try {
+ IntKeyStringValueEntry e = (IntKeyStringValueEntry) value;
+ if (e.getKey() == 255)
+ {
+ // "Previously saved scheme" item
+ this.setFont(this.getFont().deriveFont(Font.ITALIC));
+ }
+ else if (e.getKey() == 0)
+ {
+ // "Customise" item
+ this.setFont(this.getFont().deriveFont(Font.BOLD));
+ }
+ } catch (Exception e) {
+ return this;
+ }
+
+ return this;
+ }
+}
\ No newline at end of file
git://source.jalview.org / jalview.git / blobdiff