From a59a60f1d3c1d4cccb2bc3c3ac9f98cad88ba206 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Tue, 9 Jun 2020 15:13:06 -0400 Subject: [PATCH] 6457-discovery ui polish --- .../discovery/Bundle.properties-MERGED | 61 +++++++++-------- .../autopsy/discovery/DiscoveryDialog.form | 20 +++--- .../autopsy/discovery/DiscoveryDialog.java | 18 ++--- .../discovery/DiscoveryTopComponent.java | 19 ++++++ .../autopsy/discovery/FileSearchData.java | 68 +++++++++++-------- .../discovery/FileSearchFiltering.java | 33 ++++----- 6 files changed, 127 insertions(+), 92 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED index 0779798a6e..50de856d7b 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED @@ -57,18 +57,24 @@ FileSearch.InterestingItemGroupKey.noSets=None FileSearch.KeywordListGroupKey.noKeywords=None FileSearch.NoGroupingGroupKey.allFiles=All Files FileSearch.ObjectDetectedGroupKey.noSets=None -FileSearchData.FileSize.LARGE_IMAGE.displayName=Large: 1-50MB -FileSearchData.FileSize.LARGE_VIDEO.displayName=Large: 1-5GB -FileSearchData.FileSize.MEDIUM_IMAGE.displayName=Medium: 100KB-1MB -FileSearchData.FileSize.MEDIUM_VIDEO.displayName=Medium: 100MB-1GB -FileSearchData.FileSize.SMALL_IMAGE.displayName=Small: 16-100KB -FileSearchData.FileSize.SMALL_VIDEO.displayName=Small: 500KB-100MB -FileSearchData.FileSize.XLARGE_IMAGE.displayName=XLarge: 50-200MB -FileSearchData.FileSize.XLARGE_VIDEO.displayName=XLarge: 5-10GB -FileSearchData.FileSize.XSMALL_IMAGE.displayName=XSmall: 0-16KB -FileSearchData.FileSize.XSMALL_VIDEO.displayName=XSmall: 0-500KB -FileSearchData.FileSize.XXLARGE_IMAGE.displayName=XXLarge: 200MB+ -FileSearchData.FileSize.XXLARGE_VIDEO.displayName=XXLarge: 10GB+ +FileSearchData.FileSize.100kbto1mb=: 100KB-1MB +FileSearchData.FileSize.100mbto1gb=: 100MB-1GB +FileSearchData.FileSize.10PlusGb=: 10GB+ +FileSearchData.FileSize.16kbto100kb=: 16-100KB +FileSearchData.FileSize.1gbto5gb=: 1-5GB +FileSearchData.FileSize.1mbto50mb=: 1-50MB +FileSearchData.FileSize.200PlusMb=: 200MB+ +FileSearchData.FileSize.500kbto100mb=: 500KB-100MB +FileSearchData.FileSize.50mbto200mb=: 50-200MB +FileSearchData.FileSize.5gbto10gb=: 5-10GB +FileSearchData.FileSize.LARGE.displayName=Large +FileSearchData.FileSize.MEDIUM.displayName=Medium +FileSearchData.FileSize.SMALL.displayName=Small +FileSearchData.FileSize.upTo16kb=: 0-16KB +FileSearchData.FileSize.upTo500kb=: 0-500KB +FileSearchData.FileSize.XLARGE.displayName=XLarge +FileSearchData.FileSize.XSMALL.displayName=XSmall +FileSearchData.FileSize.XXLARGE.displayName=XXLarge FileSearchData.FileType.Audio.displayName=Audio FileSearchData.FileType.Documents.displayName=Documents FileSearchData.FileType.Executables.displayName=Executables @@ -106,25 +112,25 @@ FileSearchFiltering.concatenateSetNamesForDisplay.comma=, # {1} - Data source ID FileSearchFiltering.DataSourceFilter.datasource={0}({1}) # {0} - filters -FileSearchFiltering.DataSourceFilter.desc=Files in data source(s): {0} +FileSearchFiltering.DataSourceFilter.desc=In data source(s): {0} FileSearchFiltering.DataSourceFilter.or=\ or # {0} - filters FileSearchFiltering.FileTypeFilter.desc=Files with type: {0} FileSearchFiltering.FileTypeFilter.or=\ or # {0} - filters -FileSearchFiltering.FrequencyFilter.desc=Files with frequency: {0} +FileSearchFiltering.FrequencyFilter.desc=With frequency: {0} FileSearchFiltering.FrequencyFilter.or=\ or # {0} - filters -FileSearchFiltering.HashSetFilter.desc=Files with hash set hits in set(s): {0} +FileSearchFiltering.HashSetFilter.desc=With hash set hits in set(s): {0} # {0} - filters -FileSearchFiltering.InterestingItemSetFilter.desc=Files with interesting item hits in set(s): {0} +FileSearchFiltering.InterestingItemSetFilter.desc=With interesting item hits in set(s): {0} # {0} - filters -FileSearchFiltering.KeywordListFilter.desc=Files with keywords in list(s): {0} -FileSearchFiltering.KnownFilter.desc=Files which are not known +FileSearchFiltering.KeywordListFilter.desc=With keywords in list(s): {0} +FileSearchFiltering.KnownFilter.desc=Which are not known # {0} - filters -FileSearchFiltering.ObjectDetectionFilter.desc=Files with objects detected in set(s): {0} +FileSearchFiltering.ObjectDetectionFilter.desc=With objects detected in set(s): {0} # {0} - filters -FileSearchFiltering.ParentFilter.desc=Files with paths matching: {0} +FileSearchFiltering.ParentFilter.desc=With paths matching: {0} FileSearchFiltering.ParentFilter.exact=(exact match) FileSearchFiltering.ParentFilter.or=\ or FileSearchFiltering.ParentFilter.substring=(substring) @@ -132,19 +138,16 @@ FileSearchFiltering.ParentSearchTerm.excludeString=\ (exclude) FileSearchFiltering.ParentSearchTerm.fullString=\ (exact) FileSearchFiltering.ParentSearchTerm.includeString=\ (include) FileSearchFiltering.ParentSearchTerm.subString=\ (substring) -FileSearchFiltering.PreviouslyNotableFilter.desc=Files that were previously marked as notable +FileSearchFiltering.PreviouslyNotableFilter.desc=That were previously marked as notable # {0} - filters -FileSearchFiltering.ScoreFilter.desc=Files with score(s) of : {0} +FileSearchFiltering.ScoreFilter.desc=With score(s) of : {0} # {0} - filters -FileSearchFiltering.SizeFilter.desc=Files with size in range(s): {0} -FileSearchFiltering.SizeFilter.or=\ or -# {0} - Minimum bytes -# {1} - Maximum bytes -FileSearchFiltering.SizeFilter.range=({0} to {1}) +FileSearchFiltering.SizeFilter.desc=With size(s): {0} +FileSearchFiltering.SizeFilter.or=, or # {0} - tag names -FileSearchFiltering.TagsFilter.desc=Files that have been tagged {0} +FileSearchFiltering.TagsFilter.desc=That have been tagged {0} FileSearchFiltering.TagsFilter.or=\ or -FileSearchFiltering.UserCreatedFilter.desc=Files that contain EXIF data +FileSearchFiltering.UserCreatedFilter.desc=That contain EXIF data FileSearchPanel.sortingPanel.border.title=Grouping FileSearchPanel.addButton.text=Add FileSearchPanel.substringRadioButton.text=Substring diff --git a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.form b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.form index d19a7dda96..19116a24fe 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.form +++ b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.form @@ -43,23 +43,25 @@ - - - - - - - - + + + + + + + + + + + - diff --git a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java index 948dbd4bee..33f69712f0 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java @@ -275,19 +275,21 @@ final class DiscoveryDialog extends javax.swing.JDialog { toolBarPanelLayout.setHorizontalGroup( toolBarPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(toolBarPanelLayout.createSequentialGroup() - .addContainerGap(196, Short.MAX_VALUE) - .addGroup(toolBarPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addGroup(javax.swing.GroupLayout.Alignment.LEADING, toolBarPanelLayout.createSequentialGroup() - .addComponent(filler1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(step1Label, javax.swing.GroupLayout.PREFERRED_SIZE, 243, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addContainerGap() + .addGroup(toolBarPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(toolBarPanelLayout.createSequentialGroup() + .addGap(10, 10, 10) .addComponent(imagesButton, javax.swing.GroupLayout.PREFERRED_SIZE, 110, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(videosButton, javax.swing.GroupLayout.PREFERRED_SIZE, 110, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(documentsButton))) - .addContainerGap(196, Short.MAX_VALUE)) + .addComponent(documentsButton) + .addContainerGap(370, Short.MAX_VALUE)) + .addGroup(toolBarPanelLayout.createSequentialGroup() + .addComponent(step1Label, javax.swing.GroupLayout.PREFERRED_SIZE, 243, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(filler1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap(391, Short.MAX_VALUE)))) ); toolBarPanelLayout.setVerticalGroup( toolBarPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) diff --git a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryTopComponent.java b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryTopComponent.java index 30341184ad..0b33929a2a 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryTopComponent.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryTopComponent.java @@ -24,6 +24,9 @@ import java.awt.Graphics; import java.util.List; import java.util.stream.Collectors; import javax.swing.JSplitPane; +import javax.swing.border.Border; +import javax.swing.plaf.basic.BasicSplitPaneDivider; +import javax.swing.plaf.basic.BasicSplitPaneUI; import org.openide.util.NbBundle; import org.openide.util.NbBundle.Messages; import org.openide.windows.Mode; @@ -67,6 +70,22 @@ public final class DiscoveryTopComponent extends TopComponent { mainSplitPane.setLeftComponent(groupListPanel); rightSplitPane.setTopComponent(resultsPanel); rightSplitPane.setBottomComponent(detailsPanel); + //set color of divider + rightSplitPane.setUI(new BasicSplitPaneUI() { + @Override + public BasicSplitPaneDivider createDefaultDivider() { + return new BasicSplitPaneDivider(this) { + private static final long serialVersionUID = 1L; + + @Override + public void paint(Graphics g) { + g.setColor(Color.YELLOW); + g.fillRect(0, 0, getSize().width, getSize().height); + super.paint(g); + } + }; + } + }); } /** diff --git a/Core/src/org/sleuthkit/autopsy/discovery/FileSearchData.java b/Core/src/org/sleuthkit/autopsy/discovery/FileSearchData.java index 7ef5e1188f..a9c54d3d98 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/FileSearchData.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/FileSearchData.java @@ -126,39 +126,46 @@ final class FileSearchData { * Enum representing the file size */ @NbBundle.Messages({ - "FileSearchData.FileSize.XXLARGE_IMAGE.displayName=XXLarge: 200MB+", - "FileSearchData.FileSize.XLARGE_IMAGE.displayName=XLarge: 50-200MB", - "FileSearchData.FileSize.LARGE_IMAGE.displayName=Large: 1-50MB", - "FileSearchData.FileSize.MEDIUM_IMAGE.displayName=Medium: 100KB-1MB", - "FileSearchData.FileSize.SMALL_IMAGE.displayName=Small: 16-100KB", - "FileSearchData.FileSize.XSMALL_IMAGE.displayName=XSmall: 0-16KB", - "FileSearchData.FileSize.XXLARGE_VIDEO.displayName=XXLarge: 10GB+", - "FileSearchData.FileSize.XLARGE_VIDEO.displayName=XLarge: 5-10GB", - "FileSearchData.FileSize.LARGE_VIDEO.displayName=Large: 1-5GB", - "FileSearchData.FileSize.MEDIUM_VIDEO.displayName=Medium: 100MB-1GB", - "FileSearchData.FileSize.SMALL_VIDEO.displayName=Small: 500KB-100MB", - "FileSearchData.FileSize.XSMALL_VIDEO.displayName=XSmall: 0-500KB",}) + "FileSearchData.FileSize.XXLARGE.displayName=XXLarge", + "FileSearchData.FileSize.XLARGE.displayName=XLarge", + "FileSearchData.FileSize.LARGE.displayName=Large", + "FileSearchData.FileSize.MEDIUM.displayName=Medium", + "FileSearchData.FileSize.SMALL.displayName=Small", + "FileSearchData.FileSize.XSMALL.displayName=XSmall", + "FileSearchData.FileSize.10PlusGb=: 10GB+", + "FileSearchData.FileSize.5gbto10gb=: 5-10GB", + "FileSearchData.FileSize.1gbto5gb=: 1-5GB", + "FileSearchData.FileSize.100mbto1gb=: 100MB-1GB", + "FileSearchData.FileSize.200PlusMb=: 200MB+", + "FileSearchData.FileSize.50mbto200mb=: 50-200MB", + "FileSearchData.FileSize.500kbto100mb=: 500KB-100MB", + "FileSearchData.FileSize.1mbto50mb=: 1-50MB", + "FileSearchData.FileSize.100kbto1mb=: 100KB-1MB", + "FileSearchData.FileSize.16kbto100kb=: 16-100KB", + "FileSearchData.FileSize.upTo500kb=: 0-500KB", + "FileSearchData.FileSize.upTo16kb=: 0-16KB",}) enum FileSize { - XXLARGE_VIDEO(0, 10000 * BYTES_PER_MB, -1, Bundle.FileSearchData_FileSize_XXLARGE_VIDEO_displayName()), - XLARGE_VIDEO(1, 5000 * BYTES_PER_MB, 10000 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_XLARGE_VIDEO_displayName()), - LARGE_VIDEO(2, 1000 * BYTES_PER_MB, 5000 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_LARGE_VIDEO_displayName()), - MEDIUM_VIDEO(3, 100 * BYTES_PER_MB, 1000 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_MEDIUM_VIDEO_displayName()), - SMALL_VIDEO(4, 500000, 100 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_SMALL_VIDEO_displayName()), - XSMALL_VIDEO(5, 0, 500000, Bundle.FileSearchData_FileSize_XSMALL_VIDEO_displayName()), - XXLARGE_IMAGE(6, 200 * BYTES_PER_MB, -1, Bundle.FileSearchData_FileSize_XXLARGE_IMAGE_displayName()), - XLARGE_IMAGE(7, 50 * BYTES_PER_MB, 200 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_XLARGE_IMAGE_displayName()), - LARGE_IMAGE(8, 1 * BYTES_PER_MB, 50 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_LARGE_IMAGE_displayName()), - MEDIUM_IMAGE(9, 100000, 1 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_MEDIUM_IMAGE_displayName()), - SMALL_IMAGE(10, 16000, 100000, Bundle.FileSearchData_FileSize_SMALL_IMAGE_displayName()), - XSMALL_IMAGE(11, 0, 16000, Bundle.FileSearchData_FileSize_XSMALL_IMAGE_displayName()); + XXLARGE_VIDEO(0, 10000 * BYTES_PER_MB, -1, Bundle.FileSearchData_FileSize_XXLARGE_displayName(), Bundle.FileSearchData_FileSize_10PlusGb()), + XLARGE_VIDEO(1, 5000 * BYTES_PER_MB, 10000 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_XLARGE_displayName(), Bundle.FileSearchData_FileSize_5gbto10gb()), + LARGE_VIDEO(2, 1000 * BYTES_PER_MB, 5000 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_LARGE_displayName(), Bundle.FileSearchData_FileSize_1gbto5gb()), + MEDIUM_VIDEO(3, 100 * BYTES_PER_MB, 1000 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_MEDIUM_displayName(), Bundle.FileSearchData_FileSize_100mbto1gb()), + SMALL_VIDEO(4, 500000, 100 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_SMALL_displayName(), Bundle.FileSearchData_FileSize_500kbto100mb()), + XSMALL_VIDEO(5, 0, 500000, Bundle.FileSearchData_FileSize_XSMALL_displayName(), Bundle.FileSearchData_FileSize_upTo500kb()), + XXLARGE_IMAGE(6, 200 * BYTES_PER_MB, -1, Bundle.FileSearchData_FileSize_XXLARGE_displayName(), Bundle.FileSearchData_FileSize_200PlusMb()), + XLARGE_IMAGE(7, 50 * BYTES_PER_MB, 200 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_XLARGE_displayName(), Bundle.FileSearchData_FileSize_50mbto200mb()), + LARGE_IMAGE(8, 1 * BYTES_PER_MB, 50 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_LARGE_displayName(), Bundle.FileSearchData_FileSize_1mbto50mb()), + MEDIUM_IMAGE(9, 100000, 1 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_MEDIUM_displayName(), Bundle.FileSearchData_FileSize_100kbto1mb()), + SMALL_IMAGE(10, 16000, 100000, Bundle.FileSearchData_FileSize_SMALL_displayName(), Bundle.FileSearchData_FileSize_16kbto100kb()), + XSMALL_IMAGE(11, 0, 16000, Bundle.FileSearchData_FileSize_XSMALL_displayName(), Bundle.FileSearchData_FileSize_upTo16kb()); private final int ranking; // Must be unique for each value private final long minBytes; // Note that the size must be strictly greater than this to match private final long maxBytes; - private final String displayName; + private final String sizeGroup; + private final String displaySize; final static long NO_MAXIMUM = -1; - FileSize(int ranking, long minB, long maxB, String displayName) { + FileSize(int ranking, long minB, long maxB, String displayName, String displaySize) { this.ranking = ranking; this.minBytes = minB; if (maxB >= 0) { @@ -166,7 +173,8 @@ final class FileSearchData { } else { this.maxBytes = NO_MAXIMUM; } - this.displayName = displayName; + this.sizeGroup = displayName; + this.displaySize = displaySize; } /** @@ -246,7 +254,11 @@ final class FileSearchData { @Override public String toString() { - return displayName; + return sizeGroup + displaySize; + } + + String getSizeGroup(){ + return sizeGroup; } /** diff --git a/Core/src/org/sleuthkit/autopsy/discovery/FileSearchFiltering.java b/Core/src/org/sleuthkit/autopsy/discovery/FileSearchFiltering.java index 326bc7c15c..bfcf309835 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/FileSearchFiltering.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/FileSearchFiltering.java @@ -207,11 +207,8 @@ class FileSearchFiltering { @NbBundle.Messages({ "# {0} - filters", - "FileSearchFiltering.SizeFilter.desc=Files with size in range(s): {0}", - "FileSearchFiltering.SizeFilter.or= or ", - "# {0} - Minimum bytes", - "# {1} - Maximum bytes", - "FileSearchFiltering.SizeFilter.range=({0} to {1})",}) + "FileSearchFiltering.SizeFilter.desc=With size(s): {0}", + "FileSearchFiltering.SizeFilter.or=, or "}) @Override String getDesc() { String desc = ""; // NON-NLS @@ -219,7 +216,7 @@ class FileSearchFiltering { if (!desc.isEmpty()) { desc += Bundle.FileSearchFiltering_SizeFilter_or(); } - desc += Bundle.FileSearchFiltering_SizeFilter_range(size.getMinBytes(), size.getMaxBytes()); + desc += size.getSizeGroup(); } desc = Bundle.FileSearchFiltering_SizeFilter_desc(desc); return desc; @@ -364,7 +361,7 @@ class FileSearchFiltering { @NbBundle.Messages({ "# {0} - filters", - "FileSearchFiltering.ParentFilter.desc=Files with paths matching: {0}", + "FileSearchFiltering.ParentFilter.desc=With paths matching: {0}", "FileSearchFiltering.ParentFilter.or= or ", "FileSearchFiltering.ParentFilter.exact=(exact match)", "FileSearchFiltering.ParentFilter.substring=(substring)",}) @@ -417,7 +414,7 @@ class FileSearchFiltering { @NbBundle.Messages({ "# {0} - filters", - "FileSearchFiltering.DataSourceFilter.desc=Files in data source(s): {0}", + "FileSearchFiltering.DataSourceFilter.desc=In data source(s): {0}", "FileSearchFiltering.DataSourceFilter.or= or ", "# {0} - Data source name", "# {1} - Data source ID", @@ -466,7 +463,7 @@ class FileSearchFiltering { @NbBundle.Messages({ "# {0} - filters", - "FileSearchFiltering.KeywordListFilter.desc=Files with keywords in list(s): {0}",}) + "FileSearchFiltering.KeywordListFilter.desc=With keywords in list(s): {0}",}) @Override String getDesc() { return Bundle.FileSearchFiltering_KeywordListFilter_desc(concatenateSetNamesForDisplay(listNames)); @@ -586,7 +583,7 @@ class FileSearchFiltering { @NbBundle.Messages({ "# {0} - filters", - "FileSearchFiltering.FrequencyFilter.desc=Files with frequency: {0}", + "FileSearchFiltering.FrequencyFilter.desc=With frequency: {0}", "FileSearchFiltering.FrequencyFilter.or= or ",}) @Override String getDesc() { @@ -632,7 +629,7 @@ class FileSearchFiltering { @NbBundle.Messages({ "# {0} - filters", - "FileSearchFiltering.HashSetFilter.desc=Files with hash set hits in set(s): {0}",}) + "FileSearchFiltering.HashSetFilter.desc=With hash set hits in set(s): {0}",}) @Override String getDesc() { return Bundle.FileSearchFiltering_HashSetFilter_desc(concatenateSetNamesForDisplay(setNames)); @@ -670,7 +667,7 @@ class FileSearchFiltering { @NbBundle.Messages({ "# {0} - filters", - "FileSearchFiltering.InterestingItemSetFilter.desc=Files with interesting item hits in set(s): {0}",}) + "FileSearchFiltering.InterestingItemSetFilter.desc=With interesting item hits in set(s): {0}",}) @Override String getDesc() { return Bundle.FileSearchFiltering_InterestingItemSetFilter_desc(concatenateSetNamesForDisplay(setNames)); @@ -708,7 +705,7 @@ class FileSearchFiltering { @NbBundle.Messages({ "# {0} - filters", - "FileSearchFiltering.ObjectDetectionFilter.desc=Files with objects detected in set(s): {0}",}) + "FileSearchFiltering.ObjectDetectionFilter.desc=With objects detected in set(s): {0}",}) @Override String getDesc() { return Bundle.FileSearchFiltering_ObjectDetectionFilter_desc(concatenateSetNamesForDisplay(typeNames)); @@ -784,7 +781,7 @@ class FileSearchFiltering { @NbBundle.Messages({ "# {0} - filters", - "FileSearchFiltering.ScoreFilter.desc=Files with score(s) of : {0}",}) + "FileSearchFiltering.ScoreFilter.desc=With score(s) of : {0}",}) @Override String getDesc() { return Bundle.FileSearchFiltering_ScoreFilter_desc( @@ -826,7 +823,7 @@ class FileSearchFiltering { @NbBundle.Messages({ "# {0} - tag names", - "FileSearchFiltering.TagsFilter.desc=Files that have been tagged {0}", + "FileSearchFiltering.TagsFilter.desc=That have been tagged {0}", "FileSearchFiltering.TagsFilter.or= or ",}) @Override String getDesc() { @@ -862,7 +859,7 @@ class FileSearchFiltering { } @NbBundle.Messages({ - "FileSearchFiltering.UserCreatedFilter.desc=Files that contain EXIF data",}) + "FileSearchFiltering.UserCreatedFilter.desc=That contain EXIF data",}) @Override String getDesc() { return Bundle.FileSearchFiltering_UserCreatedFilter_desc(); @@ -931,7 +928,7 @@ class FileSearchFiltering { } @NbBundle.Messages({ - "FileSearchFiltering.PreviouslyNotableFilter.desc=Files that were previously marked as notable",}) + "FileSearchFiltering.PreviouslyNotableFilter.desc=That were previously marked as notable",}) @Override String getDesc() { return Bundle.FileSearchFiltering_PreviouslyNotableFilter_desc(); @@ -949,7 +946,7 @@ class FileSearchFiltering { } @NbBundle.Messages({ - "FileSearchFiltering.KnownFilter.desc=Files which are not known"}) + "FileSearchFiltering.KnownFilter.desc=Which are not known"}) @Override String getDesc() { return Bundle.FileSearchFiltering_KnownFilter_desc();