4275 add listener for ingest events to 2nd and 3rd kws options tab

This commit is contained in:
William Schaefer 2018-10-03 17:31:52 -04:00
parent de0fe30962
commit c95f634a30
2 changed files with 35 additions and 5 deletions

View File

@ -18,9 +18,12 @@
*/
package org.sleuthkit.autopsy.keywordsearch;
import java.awt.EventQueue;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@ -42,7 +45,7 @@ class KeywordSearchGlobalLanguageSettingsPanel extends javax.swing.JPanel implem
private final Map<String, StringExtract.StringExtractUnicodeTable.SCRIPT> scripts = new HashMap<>();
private ActionListener updateLanguagesAction;
private List<SCRIPT> toUpdate;
KeywordSearchGlobalLanguageSettingsPanel() {
initComponents();
customizeComponents();
@ -63,13 +66,26 @@ class KeywordSearchGlobalLanguageSettingsPanel extends javax.swing.JPanel implem
}
}
};
if (!PlatformUtil.isWindowsOS()) {
enableOcrCheckbox.setVisible(false);
}
initScriptsCheckBoxes();
reloadScriptsCheckBoxes();
//allow panel to toggle its enabled status while it is open based on ingest events
IngestManager.getInstance().addIngestJobEventListener(new PropertyChangeListener() {
@Override
public void propertyChange(PropertyChangeEvent evt) {
Object source = evt.getSource();
if (source instanceof String && ((String) source).equals("LOCAL")) { //NON-NLS
EventQueue.invokeLater(() -> {
activateWidgets();
});
}
}
});
}
private void activateScriptsCheckboxes(boolean activate) {
@ -118,8 +134,8 @@ class KeywordSearchGlobalLanguageSettingsPanel extends javax.swing.JPanel implem
enableUTF8Checkbox.setSelected(utf8);
boolean ocr = KeywordSearchSettings.getOcrOption();
enableOcrCheckbox.setSelected(ocr);
enableOcrCheckbox.setSelected(ocr);
final List<SCRIPT> serviceScripts = KeywordSearchSettings.getStringExtractScripts();
final int components = checkPanel.getComponentCount();

View File

@ -18,6 +18,7 @@
*/
package org.sleuthkit.autopsy.keywordsearch;
import java.awt.EventQueue;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.logging.Level;
@ -48,7 +49,7 @@ class KeywordSearchGlobalSearchSettingsPanel extends javax.swing.JPanel implemen
showSnippetsCB.setSelected(KeywordSearchSettings.getShowSnippets());
boolean ingestRunning = IngestManager.getInstance().isIngestRunning();
ingestWarningLabel.setVisible(ingestRunning);
skipNSRLCheckBox.setEnabled(!ingestRunning);
skipNSRLCheckBox.setEnabled(!ingestRunning);
setTimeSettingEnabled(!ingestRunning);
final UpdateFrequency curFreq = KeywordSearchSettings.getUpdateFrequency();
@ -385,5 +386,18 @@ class KeywordSearchGlobalSearchSettingsPanel extends javax.swing.JPanel implemen
}
}
});
//allow panel to toggle its enabled status while it is open based on ingest events
IngestManager.getInstance().addIngestJobEventListener(new PropertyChangeListener() {
@Override
public void propertyChange(PropertyChangeEvent evt) {
Object source = evt.getSource();
if (source instanceof String && ((String) source).equals("LOCAL")) { //NON-NLS
EventQueue.invokeLater(() -> {
activateWidgets();
});
}
}
});
}
}