From 29a11585718a92f1811b9b83bafc09d3c21bdca5 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Fri, 19 Mar 2021 12:57:06 -0400 Subject: [PATCH] 7328 adjust layout and size --- Core/src/org/sleuthkit/autopsy/discovery/ui/Bundle.properties | 2 -- .../sleuthkit/autopsy/discovery/ui/Bundle.properties-MERGED | 2 -- .../sleuthkit/autopsy/discovery/ui/DataSourceFilterPanel.form | 1 + .../sleuthkit/autopsy/discovery/ui/DataSourceFilterPanel.java | 1 - .../org/sleuthkit/autopsy/discovery/ui/DiscoveryDialog.form | 3 +++ .../org/sleuthkit/autopsy/discovery/ui/DiscoveryDialog.java | 1 + .../sleuthkit/autopsy/discovery/ui/DocumentFilterPanel.java | 2 +- .../org/sleuthkit/autopsy/discovery/ui/DomainFilterPanel.java | 2 +- .../org/sleuthkit/autopsy/discovery/ui/ImageFilterPanel.java | 4 ++-- .../org/sleuthkit/autopsy/discovery/ui/VideoFilterPanel.java | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/Bundle.properties b/Core/src/org/sleuthkit/autopsy/discovery/ui/Bundle.properties index 4091fd984b..05913b59e4 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/ui/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/Bundle.properties @@ -61,5 +61,3 @@ CookieDetailsPanel.jLabel2.text= PreviouslyNotableFilterPanel.text_1=Include only previously notable domains KnownAccountTypeFilterPanel.text_1=Include only domains with a known account type LoadingPanel.detailsLabel.AccessibleContext.accessibleName=detailsLabel -DataSourceFilterPanel.deselectAllButton.text=Deselect All -DataSourceFilterPanel.selectAllButton.text=Select All diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/discovery/ui/Bundle.properties-MERGED index 2140d16125..0d4260a791 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/ui/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/Bundle.properties-MERGED @@ -175,8 +175,6 @@ CookieDetailsPanel.jLabel2.text= PreviouslyNotableFilterPanel.text_1=Include only previously notable domains KnownAccountTypeFilterPanel.text_1=Include only domains with a known account type LoadingPanel.detailsLabel.AccessibleContext.accessibleName=detailsLabel -DataSourceFilterPanel.deselectAllButton.text=Deselect All -DataSourceFilterPanel.selectAllButton.text=Select All VideoThumbnailPanel.bytes.text=bytes VideoThumbnailPanel.deleted.text=All instances of file are deleted. VideoThumbnailPanel.gigaBytes.text=GB diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/DataSourceFilterPanel.form b/Core/src/org/sleuthkit/autopsy/discovery/ui/DataSourceFilterPanel.form index 007cc7e582..199aa32355 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/ui/DataSourceFilterPanel.form +++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/DataSourceFilterPanel.form @@ -41,6 +41,7 @@ + diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/DataSourceFilterPanel.java b/Core/src/org/sleuthkit/autopsy/discovery/ui/DataSourceFilterPanel.java index 1b5c6cecf7..cf00271d64 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/ui/DataSourceFilterPanel.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/DataSourceFilterPanel.java @@ -30,7 +30,6 @@ import org.openide.util.NbBundle; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.ThreadConfined; -import org.sleuthkit.autopsy.discovery.search.SearchData; import org.sleuthkit.autopsy.discovery.search.SearchFiltering; import org.sleuthkit.datamodel.DataSource; import org.sleuthkit.datamodel.TskCoreException; diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/DiscoveryDialog.form b/Core/src/org/sleuthkit/autopsy/discovery/ui/DiscoveryDialog.form index 522cd9b43e..aadb1004d9 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/ui/DiscoveryDialog.form +++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/DiscoveryDialog.form @@ -6,6 +6,9 @@ + + + diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/DiscoveryDialog.java b/Core/src/org/sleuthkit/autopsy/discovery/ui/DiscoveryDialog.java index e3ebba7a3d..1a0f6e1125 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/ui/DiscoveryDialog.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/DiscoveryDialog.java @@ -319,6 +319,7 @@ final class DiscoveryDialog extends javax.swing.JDialog { setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setMinimumSize(new java.awt.Dimension(600, 300)); + setPreferredSize(new java.awt.Dimension(700, 600)); imagesButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/pictures-icon.png"))); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(imagesButton, org.openide.util.NbBundle.getMessage(DiscoveryDialog.class, "DiscoveryDialog.imagesButton.text")); // NOI18N diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/DocumentFilterPanel.java b/Core/src/org/sleuthkit/autopsy/discovery/ui/DocumentFilterPanel.java index 8d553b0278..083cb58ff5 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/ui/DocumentFilterPanel.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/DocumentFilterPanel.java @@ -44,7 +44,7 @@ final class DocumentFilterPanel extends AbstractFiltersPanel { List defaultSizes = new ArrayList<>(); defaultSizes.add(SearchData.FileSize.LARGE_IMAGE); defaultSizes.add(SearchData.FileSize.XLARGE_IMAGE); - defaultSizes.add(SearchData.FileSize.XXLARGE_VIDEO); + defaultSizes.add(SearchData.FileSize.XXLARGE_IMAGE); addFilter(sizeFilterPanel, true, defaultSizes, 0); addFilter(new DataSourceFilterPanel(), false, null, 0); List defaultFrequencies = new ArrayList<>(); diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/DomainFilterPanel.java b/Core/src/org/sleuthkit/autopsy/discovery/ui/DomainFilterPanel.java index f2a5f688a9..1788f21629 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/ui/DomainFilterPanel.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/DomainFilterPanel.java @@ -42,7 +42,6 @@ public class DomainFilterPanel extends AbstractFiltersPanel { super(); initComponents(); addFilter(new DataSourceFilterPanel(), false, null, 0); - addFilter(new PreviouslyNotableFilterPanel(), false, null, 1); addFilter(new KnownAccountTypeFilterPanel(), false, null, 1); addFilter(new ArtifactTypeFilterPanel(), false, null, 1); addFilter(new DateFilterPanel(), false, null, 1); @@ -54,6 +53,7 @@ public class DomainFilterPanel extends AbstractFiltersPanel { defaultFrequencies.add(SearchData.Frequency.COMMON); } addFilter(new PastOccurrencesFilterPanel(TYPE), true, defaultFrequencies, 0); + addFilter(new PreviouslyNotableFilterPanel(), false, null, 0); addPanelsToScrollPane(domainFiltersSplitPane); setLastGroupingAttributeType(DiscoveryAttributes.GroupingAttributeType.LAST_ACTIVITY_DATE); setLastSortingMethod(ResultsSorter.SortingMethod.BY_DOMAIN_NAME); diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/ImageFilterPanel.java b/Core/src/org/sleuthkit/autopsy/discovery/ui/ImageFilterPanel.java index b009d9c3c7..82d1193eba 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/ui/ImageFilterPanel.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/ImageFilterPanel.java @@ -43,7 +43,7 @@ final class ImageFilterPanel extends AbstractFiltersPanel { List defaultSizes = new ArrayList<>(); defaultSizes.add(SearchData.FileSize.LARGE_IMAGE); defaultSizes.add(SearchData.FileSize.XLARGE_IMAGE); - defaultSizes.add(SearchData.FileSize.XXLARGE_VIDEO); + defaultSizes.add(SearchData.FileSize.XXLARGE_IMAGE); addFilter(sizeFilterPanel, true, defaultSizes, 0); addFilter(new DataSourceFilterPanel(), false, null, 0); List defaultFrequencies = new ArrayList<>(); @@ -55,7 +55,7 @@ final class ImageFilterPanel extends AbstractFiltersPanel { defaultFrequencies.add(SearchData.Frequency.COMMON); } addFilter(new PastOccurrencesFilterPanel(TYPE), true, defaultFrequencies, 0); - addFilter(new UserCreatedFilterPanel(), false, null, 1); + addFilter(new UserCreatedFilterPanel(), false, null, 0); addFilter(new HashSetFilterPanel(), false, null, 1); addFilter(new InterestingItemsFilterPanel(), false, null, 1); addFilter(new ObjectDetectedFilterPanel(), false, null, 1); diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/VideoFilterPanel.java b/Core/src/org/sleuthkit/autopsy/discovery/ui/VideoFilterPanel.java index 7021e9cafc..df726bc899 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/ui/VideoFilterPanel.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/VideoFilterPanel.java @@ -55,7 +55,7 @@ final class VideoFilterPanel extends AbstractFiltersPanel { defaultFrequencies.add(SearchData.Frequency.COMMON); } addFilter(new PastOccurrencesFilterPanel(TYPE), true, defaultFrequencies, 0); - addFilter(new UserCreatedFilterPanel(), false, null, 1); + addFilter(new UserCreatedFilterPanel(), false, null, 0); addFilter(new HashSetFilterPanel(), false, null, 1); addFilter(new InterestingItemsFilterPanel(), false, null, 1); addFilter(new ObjectDetectedFilterPanel(), false, null, 1);