From 2af7b14da98dc3025db51e7a92d62baf2ba67fc8 Mon Sep 17 00:00:00 2001
From: William Schaefer <wschaefer@basistech.net>
Date: Thu, 4 Jun 2020 19:45:50 -0400
Subject: [PATCH] 6305 hcange some text

---
 .../org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED | 4 ++--
 .../src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.form | 2 +-
 .../src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java | 2 +-
 .../sleuthkit/autopsy/discovery/DiscoveryTopComponent.form   | 2 ++
 .../sleuthkit/autopsy/discovery/DiscoveryTopComponent.java   | 5 ++++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED
index 9a676bb1b9..4c619694a1 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED
@@ -11,7 +11,7 @@ DiscoveryTopComponent.name=\ Discovery
 DiscoveryTopComponent.newSearch.text=New Search
 DiscoveryTopComponent.searchCancelled.text=Search has been cancelled.
 # {0} - search
-DiscoveryTopComponent.searchComplete.text=Results displayed have the following filters applied: {0}
+DiscoveryTopComponent.searchComplete.text=Results for {0}
 # {0} - searchType
 DiscoveryTopComponent.searchInProgress.text=Performing search for results of type {0}. Please wait.
 DiscoveryUiUtility.bytes.text=bytes
@@ -256,10 +256,10 @@ DiscoveryDialog.groupByLabel.text=Group By:
 DiscoveryDialog.orderByLabel.text=Order Within Groups By:
 DiscoveryDialog.orderGroupsByLabel.text=Order Groups By:
 ImageFilterPanel.imageFiltersSplitPane.toolTipText=
-DiscoveryDialog.jLabel1.text=Step 1: Choose result type
 DocumentFilterPanel.documentsFiltersSplitPane.border.title=Step 2: Filter which documents to show
 ImageFilterPanel.imageFiltersSplitPane.border.title=Step 2: Filter which images to show
 VideoFilterPanel.videoFiltersSplitPane.border.title=Step 2: Filter which videos to show
+DiscoveryDialog.step1Label.text=Step 1: Choose result type
 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/DiscoveryDialog.form b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.form
index 737ee86d50..3450ae7817 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.form
+++ b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.form
@@ -7,7 +7,7 @@
       <Dimension value="[600, 300]"/>
     </Property>
     <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-      <Dimension value="[1200, 600]"/>
+      <Dimension value="[1000, 650]"/>
     </Property>
   </Properties>
   <SyntheticProperties>
diff --git a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java
index 2dad36864f..9cd5d922d9 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java
@@ -204,7 +204,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(1200, 600));
+        setPreferredSize(new java.awt.Dimension(1000, 650));
 
         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/DiscoveryTopComponent.form b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryTopComponent.form
index 2cfc3be255..bb144b8173 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryTopComponent.form
+++ b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryTopComponent.form
@@ -136,7 +136,9 @@
                   <Color blue="f0" green="f0" red="f0" type="rgb"/>
                 </Property>
                 <Property name="columns" type="int" value="20"/>
+                <Property name="lineWrap" type="boolean" value="true"/>
                 <Property name="rows" type="int" value="2"/>
+                <Property name="wrapStyleWord" type="boolean" value="true"/>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="null"/>
                 </Property>
diff --git a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryTopComponent.java b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryTopComponent.java
index eb5af839e8..a0577b46cf 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryTopComponent.java
@@ -158,7 +158,9 @@ public final class DiscoveryTopComponent extends TopComponent {
 
         progressMessageTextArea.setBackground(new java.awt.Color(240, 240, 240));
         progressMessageTextArea.setColumns(20);
+        progressMessageTextArea.setLineWrap(true);
         progressMessageTextArea.setRows(2);
+        progressMessageTextArea.setWrapStyleWord(true);
         progressMessageTextArea.setBorder(null);
         progressMessageScrollPane.setViewportView(progressMessageTextArea);
 
@@ -254,11 +256,12 @@ public final class DiscoveryTopComponent extends TopComponent {
     @Subscribe
     @Messages({"DiscoveryTopComponent.newSearch.text=New Search",
         "# {0} - search",
-        "DiscoveryTopComponent.searchComplete.text=Results displayed have the following filters applied: {0}"})
+        "DiscoveryTopComponent.searchComplete.text=Results for {0}"})
     void handleSearchCompleteEvent(DiscoveryEventUtils.SearchCompleteEvent searchCompleteEvent) {
         newSearchButton.setText(Bundle.DiscoveryTopComponent_newSearch_text());
         progressMessageTextArea.setForeground(Color.black);
         progressMessageTextArea.setText(Bundle.DiscoveryTopComponent_searchComplete_text(searchCompleteEvent.getFilters().stream().map(FileFilter::getDesc).collect(Collectors.joining(", "))));
+        progressMessageTextArea.setCaretPosition(0);
     }
 
     /**