codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-10-01 23:09:56 +00:00
Code Issues Releases Wiki Activity

Merge branch '5673-RemoveExcessFilters' of https://github.com/wschaeferB/autopsy into 5724-EmbeddedImagesPaths

Browse Source
This commit is contained in:
William Schaefer
2019-11-14 15:23:03 -05:00
parent 914988d098 5c9313d23e
commit 772439cf62
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/src/org/sleuthkit/autopsy/filequery/Bundle.properties-MERGED
+1 -1
View File
@@ -28,7 +28,7 @@ FileSearchData.FileSize.OVER_100KB.displayName=100 KB - 1 MB
FileSearchData.FileSize.OVER_10GB.displayName=10 GB+
FileSearchData.FileSize.OVER_16KB.displayName=16 KB - 100 KB
FileSearchData.FileSize.OVER_1GB_IMAGE.displayName=1 GB+
FileSearchData.FileSize.OVER_1GB_VIDEO.displayName=\ 1 - 5 GB
FileSearchData.FileSize.OVER_1GB_VIDEO.displayName=1 - 5 GB
FileSearchData.FileSize.OVER_1MB.displayName=1 - 50 MB
FileSearchData.FileSize.OVER_200MB.displayName=200 MB - 1 GB
FileSearchData.FileSize.OVER_50MB.displayName=50 - 200 MB
Core/src/org/sleuthkit/autopsy/filequery/DiscoveryTopComponent.java
+11 -4
View File
@@ -32,6 +32,7 @@ import org.sleuthkit.autopsy.corecomponents.DataContentPanel;
import org.sleuthkit.autopsy.corecomponents.TableFilterNode;
import org.sleuthkit.autopsy.coreutils.ThreadConfined;
import org.sleuthkit.autopsy.datamodel.FileNode;
import org.sleuthkit.autopsy.filequery.FileSearchData.FileType;
import org.sleuthkit.datamodel.AbstractFile;
/**
@@ -276,8 +277,11 @@ public final class DiscoveryTopComponent extends TopComponent {
@Subscribe
void handleSearchCancelledEvent(DiscoveryEvents.SearchCancelledEvent searchCancelledEvent) {
SwingUtilities.invokeLater(() -> {
imagesButton.setEnabled(true);
videosButton.setEnabled(true);
if (fileSearchPanel.getSelectedType() == FileType.VIDEO) {
imagesButton.setEnabled(true);
} else if (fileSearchPanel.getSelectedType() == FileType.IMAGE) {
videosButton.setEnabled(true);
}
});
}
@@ -289,8 +293,11 @@ public final class DiscoveryTopComponent extends TopComponent {
@Subscribe
void handleSearchCompletedEvent(DiscoveryEvents.SearchCompleteEvent searchCompletedEvent) {
SwingUtilities.invokeLater(() -> {
imagesButton.setEnabled(true);
videosButton.setEnabled(true);
if (fileSearchPanel.getSelectedType() == FileType.VIDEO) {
imagesButton.setEnabled(true);
} else if (fileSearchPanel.getSelectedType() == FileType.IMAGE) {
videosButton.setEnabled(true);
}
});
}
Core/src/org/sleuthkit/autopsy/filequery/FileSearchData.java
+1 -1
View File
@@ -138,7 +138,7 @@ class FileSearchData {
@NbBundle.Messages({
"FileSearchData.FileSize.OVER_10GB.displayName=10 GB+",
"FileSearchData.FileSize.OVER_5GB.displayName=5 - 10 GB",
"FileSearchData.FileSize.OVER_1GB_VIDEO.displayName= 1 - 5 GB",
"FileSearchData.FileSize.OVER_1GB_VIDEO.displayName=1 - 5 GB",
"FileSearchData.FileSize.OVER_1GB_IMAGE.displayName=1 GB+",
"FileSearchData.FileSize.OVER_200MB.displayName=200 MB - 1 GB",
"FileSearchData.FileSize.OVER_50MB.displayName=50 - 200 MB",
Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.java
+4
View File
@@ -519,6 +519,10 @@ final class FileSearchPanel extends javax.swing.JPanel implements ActionListener
validateFields();
}
FileType getSelectedType(){
return fileType;
}
/**
* Reset the panel to its initial configuration.
*/