6305 reset filters when case opened or closed

This commit is contained in:
William Schaefer 2020-06-04 08:14:50 -04:00
parent 241ffd7899
commit b356d93dac
3 changed files with 10 additions and 6 deletions

View File

@ -36,9 +36,9 @@ final class DiscoveryDialog extends javax.swing.JDialog {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private final static Logger logger = Logger.getLogger(DiscoveryDialog.class.getName()); private final static Logger logger = Logger.getLogger(DiscoveryDialog.class.getName());
private final ImageFilterPanel imageFilterPanel = new ImageFilterPanel(); private ImageFilterPanel imageFilterPanel = new ImageFilterPanel();
private final VideoFilterPanel videoFilterPanel = new VideoFilterPanel(); private VideoFilterPanel videoFilterPanel = new VideoFilterPanel();
private final DocumentFilterPanel documentFilterPanel = new DocumentFilterPanel(); private DocumentFilterPanel documentFilterPanel = new DocumentFilterPanel();
private static final Color SELECTED_COLOR = new Color(216, 230, 242); private static final Color SELECTED_COLOR = new Color(216, 230, 242);
private static final Color UNSELECTED_COLOR = new Color(240, 240, 240); private static final Color UNSELECTED_COLOR = new Color(240, 240, 240);
private SearchWorker searchWorker = null; private SearchWorker searchWorker = null;
@ -88,7 +88,10 @@ final class DiscoveryDialog extends javax.swing.JDialog {
/** /**
* Update the search settings to a default state. * Update the search settings to a default state.
*/ */
private void updateSearchSettings() { void updateSearchSettings() {
imageFilterPanel = new ImageFilterPanel();
videoFilterPanel = new VideoFilterPanel();
documentFilterPanel = new DocumentFilterPanel();
imagesButton.setSelected(true); imagesButton.setSelected(true);
imagesButton.setEnabled(false); imagesButton.setEnabled(false);
imagesButton.setBackground(SELECTED_COLOR); imagesButton.setBackground(SELECTED_COLOR);

View File

@ -41,7 +41,7 @@ final class ImageThumbnailPanel extends javax.swing.JPanel implements ListCellRe
/** /**
* Creates new form ImageThumbnailPanel * Creates new form ImageThumbnailPanel
*/ */
ImageThumbnailPanel() { ImageThumbnailPanel() {
initComponents(); initComponents();
} }

View File

@ -64,7 +64,7 @@ public final class OpenDiscoveryAction extends CallableSystemAction implements P
toolbarButton.addActionListener(OpenDiscoveryAction.this::actionPerformed); toolbarButton.addActionListener(OpenDiscoveryAction.this::actionPerformed);
this.setEnabled(false); this.setEnabled(false);
} }
@Override @Override
public boolean isEnabled() { public boolean isEnabled() {
return Case.isCaseOpen(); return Case.isCaseOpen();
@ -132,6 +132,7 @@ public final class OpenDiscoveryAction extends CallableSystemAction implements P
@Override @Override
public void setEnabled(boolean value) { public void setEnabled(boolean value) {
super.setEnabled(value); super.setEnabled(value);
DiscoveryDialog.getDiscoveryDialogInstance().updateSearchSettings();
toolbarButton.setEnabled(value); toolbarButton.setEnabled(value);
} }