From 1bc3b02ca90252cf2bc4a1e103fe3eea7e549d7c Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Wed, 5 Dec 2018 15:01:08 -0500 Subject: [PATCH] 4440 additional small UI changes to position of case/instance results option --- .../commonfilesearch/Bundle.properties | 2 +- .../CommonAttributePanel.form | 42 ++++++++++--------- .../CommonAttributePanel.java | 34 ++++++++------- 3 files changed, 42 insertions(+), 36 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/Bundle.properties b/Core/src/org/sleuthkit/autopsy/commonfilesearch/Bundle.properties index eff2e152b9..5ae8e0e2e3 100644 --- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/Bundle.properties @@ -40,6 +40,6 @@ CommonAttributePanel.commonItemSearchDescription.text=Find items that exis CommonAttributePanel.scopeLabel.text=Scope of Search: InterCasePanel.correlationComboBoxLabel.text=Property Type to Match: CommonAttributePanel.percentageThresholdInputBox.text=20 -CommonAttributePanel.resultsDisplayLabel.text_2=Display results organize by: +CommonAttributePanel.resultsDisplayLabel.text_2=Display results organized by: CommonAttributePanel.organizeByCaseRadio.text=Case CommonAttributePanel.organizeByCountRadio.text=Number of occurrences diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributePanel.form b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributePanel.form index 601f248678..043a1ef41b 100644 --- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributePanel.form +++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributePanel.form @@ -9,10 +9,10 @@ - + - + @@ -32,7 +32,7 @@ - + @@ -40,13 +40,13 @@ - + - + - + @@ -67,8 +67,20 @@ - - + + + + + + + + + + + + + + @@ -107,13 +119,6 @@ - - - - - - - @@ -140,10 +145,9 @@ - - - - + + + diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributePanel.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributePanel.java index 89a1be1904..aa1e48448e 100644 --- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributePanel.java +++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributePanel.java @@ -630,8 +630,8 @@ final class CommonAttributePanel extends javax.swing.JDialog implements Observer organizeByCaseRadio = new javax.swing.JRadioButton(); organizeByCountRadio = new javax.swing.JRadioButton(); - setMinimumSize(new java.awt.Dimension(450, 500)); - setPreferredSize(new java.awt.Dimension(450, 500)); + setMinimumSize(new java.awt.Dimension(450, 525)); + setPreferredSize(new java.awt.Dimension(450, 525)); setResizable(false); addWindowListener(new java.awt.event.WindowAdapter() { public void windowClosed(java.awt.event.WindowEvent evt) { @@ -639,9 +639,9 @@ final class CommonAttributePanel extends javax.swing.JDialog implements Observer } }); - jPanel1.setMaximumSize(new java.awt.Dimension(450, 500)); - jPanel1.setMinimumSize(new java.awt.Dimension(450, 500)); - jPanel1.setPreferredSize(new java.awt.Dimension(450, 500)); + jPanel1.setMaximumSize(new java.awt.Dimension(450, 525)); + jPanel1.setMinimumSize(new java.awt.Dimension(450, 525)); + jPanel1.setPreferredSize(new java.awt.Dimension(450, 525)); jPanel1.setRequestFocusEnabled(false); org.openide.awt.Mnemonics.setLocalizedText(scopeLabel, org.openide.util.NbBundle.getMessage(CommonAttributePanel.class, "CommonAttributePanel.scopeLabel.text")); // NOI18N @@ -725,8 +725,16 @@ final class CommonAttributePanel extends javax.swing.JDialog implements Observer .addComponent(dataSourcesLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addContainerGap()) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup() - .addComponent(errorText) - .addGap(65, 65, 65) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel1Layout.createSequentialGroup() + .addComponent(errorText) + .addGap(65, 65, 65)) + .addGroup(jPanel1Layout.createSequentialGroup() + .addGap(20, 20, 20) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(organizeByCountRadio) + .addComponent(organizeByCaseRadio, javax.swing.GroupLayout.PREFERRED_SIZE, 65, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) .addComponent(searchButton) .addContainerGap()) .addGroup(jPanel1Layout.createSequentialGroup() @@ -753,12 +761,6 @@ final class CommonAttributePanel extends javax.swing.JDialog implements Observer .addComponent(percentageThresholdInputBox, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(percentageThresholdTextTwo, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))) - .addGroup(jPanel1Layout.createSequentialGroup() - .addGap(30, 30, 30) - .addComponent(organizeByCaseRadio, javax.swing.GroupLayout.PREFERRED_SIZE, 65, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(organizeByCountRadio) - .addGap(0, 0, Short.MAX_VALUE)) ); jPanel1Layout.setVerticalGroup( jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -783,9 +785,9 @@ final class CommonAttributePanel extends javax.swing.JDialog implements Observer .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(resultsDisplayLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 19, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(organizeByCaseRadio) - .addComponent(organizeByCountRadio)) + .addComponent(organizeByCaseRadio) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(organizeByCountRadio, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(dataSourcesLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 14, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)