From ea0d31de3c6958b871fce14fa5ee7ba6133c8d7b Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dgrove" Date: Tue, 18 Dec 2018 18:30:28 -0500 Subject: [PATCH 1/3] Fixed label justification. --- .../hashdatabase/HashLookupSettingsPanel.form | 77 +++++++++---------- .../hashdatabase/HashLookupSettingsPanel.java | 63 ++++++++------- 2 files changed, 66 insertions(+), 74 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.form index 56de266e1c..e21f1debaa 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.form +++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.form @@ -325,51 +325,46 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java index b5554a7d84..f81c50b572 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java @@ -733,40 +733,37 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan .addGroup(informationPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(informationPanelLayout.createSequentialGroup() .addComponent(locationLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addGap(18, 18, 18) .addComponent(hashDbLocationLabel)) .addGroup(informationPanelLayout.createSequentialGroup() - .addGroup(informationPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(informationPanelLayout.createSequentialGroup() - .addComponent(nameLabel) - .addGap(18, 18, 18) - .addComponent(hashDbNameLabel)) - .addGroup(informationPanelLayout.createSequentialGroup() - .addComponent(typeLabel) - .addGap(18, 18, 18) - .addComponent(hashDbTypeLabel)) - .addGroup(informationPanelLayout.createSequentialGroup() - .addComponent(versionLabel) - .addGap(18, 18, 18) - .addComponent(hashDbVersionLabel)) - .addGroup(informationPanelLayout.createSequentialGroup() - .addComponent(orgLabel) - .addGap(18, 18, 18) - .addComponent(hashDbOrgLabel)) - .addGroup(informationPanelLayout.createSequentialGroup() - .addComponent(readOnlyLabel) - .addGap(18, 18, 18) - .addComponent(hashDbReadOnlyLabel)) - .addGroup(informationPanelLayout.createSequentialGroup() - .addComponent(indexLabel) - .addGap(18, 18, 18) - .addComponent(hashDbIndexStatusLabel)) - .addGroup(informationPanelLayout.createSequentialGroup() - .addComponent(indexPathLabelLabel) - .addGap(18, 18, 18) - .addComponent(indexPathLabel))) - .addGap(0, 0, Short.MAX_VALUE))) - .addContainerGap()) + .addComponent(nameLabel) + .addGap(18, 18, 18) + .addComponent(hashDbNameLabel)) + .addGroup(informationPanelLayout.createSequentialGroup() + .addComponent(typeLabel) + .addGap(18, 18, 18) + .addComponent(hashDbTypeLabel)) + .addGroup(informationPanelLayout.createSequentialGroup() + .addComponent(versionLabel) + .addGap(18, 18, 18) + .addComponent(hashDbVersionLabel)) + .addGroup(informationPanelLayout.createSequentialGroup() + .addComponent(orgLabel) + .addGap(18, 18, 18) + .addComponent(hashDbOrgLabel)) + .addGroup(informationPanelLayout.createSequentialGroup() + .addComponent(readOnlyLabel) + .addGap(18, 18, 18) + .addComponent(hashDbReadOnlyLabel)) + .addGroup(informationPanelLayout.createSequentialGroup() + .addComponent(indexLabel) + .addGap(18, 18, 18) + .addComponent(hashDbIndexStatusLabel)) + .addGroup(informationPanelLayout.createSequentialGroup() + .addComponent(indexPathLabelLabel) + .addGap(18, 18, 18) + .addComponent(indexPathLabel))) + .addContainerGap(322, Short.MAX_VALUE)) ); informationPanelLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {indexLabel, indexPathLabelLabel, locationLabel, nameLabel, orgLabel, readOnlyLabel, typeLabel, versionLabel}); @@ -862,7 +859,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addGroup(jPanel1Layout.createSequentialGroup() .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(informationScrollPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE) + .addComponent(informationScrollPanel) .addGroup(jPanel1Layout.createSequentialGroup() .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(sendIngestMessagesCheckBox) From e9f484d1445b7a8da77462fa9bd3d11bd6b26e7c Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dgrove" Date: Tue, 18 Dec 2018 19:40:33 -0500 Subject: [PATCH 2/3] Fixed panel sizing issue. --- .../autopsy/modules/hashdatabase/HashLookupSettingsPanel.form | 2 +- .../autopsy/modules/hashdatabase/HashLookupSettingsPanel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.form index e21f1debaa..795f8a6f93 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.form +++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.form @@ -364,7 +364,7 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java index f81c50b572..14b235c0b9 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java @@ -763,7 +763,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan .addComponent(indexPathLabelLabel) .addGap(18, 18, 18) .addComponent(indexPathLabel))) - .addContainerGap(322, Short.MAX_VALUE)) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); informationPanelLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {indexLabel, indexPathLabelLabel, locationLabel, nameLabel, orgLabel, readOnlyLabel, typeLabel, versionLabel}); From 79be6c1a06e1c5a6ba6813db887bd25f01f96fa0 Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dgrove" Date: Wed, 19 Dec 2018 11:52:24 -0500 Subject: [PATCH 3/3] Fixed main window sizing bug. --- .../hashdatabase/HashLookupSettingsPanel.form | 54 +++++++++---------- .../hashdatabase/HashLookupSettingsPanel.java | 46 ++++++++-------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.form index 795f8a6f93..0eea228e69 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.form +++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.form @@ -94,7 +94,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -171,6 +171,18 @@ + + + + + + + + + + + + @@ -206,18 +218,21 @@ - + - + - + - + + + + @@ -227,7 +242,7 @@ - + @@ -257,33 +272,18 @@ - + - - - - - - - - - - - - - + - + - - - - + @@ -293,7 +293,7 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java index 14b235c0b9..e6f399d38b 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java @@ -579,12 +579,12 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan jButton3 = new javax.swing.JButton(); jScrollPane2 = new javax.swing.JScrollPane(); jPanel1 = new javax.swing.JPanel(); + hashDatabasesLabel = new javax.swing.JLabel(); jScrollPane1 = new javax.swing.JScrollPane(); hashSetTable = new HashSetTable(); - deleteDatabaseButton = new javax.swing.JButton(); - importDatabaseButton = new javax.swing.JButton(); - hashDatabasesLabel = new javax.swing.JLabel(); createDatabaseButton = new javax.swing.JButton(); + importDatabaseButton = new javax.swing.JButton(); + deleteDatabaseButton = new javax.swing.JButton(); informationLabel = new javax.swing.JLabel(); informationScrollPanel = new javax.swing.JScrollPane(); informationPanel = new javax.swing.JPanel(); @@ -621,6 +621,9 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan jButton3.setFont(jButton3.getFont().deriveFont(jButton3.getFont().getStyle() & ~java.awt.Font.BOLD, 14)); org.openide.awt.Mnemonics.setLocalizedText(jButton3, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.jButton3.text")); // NOI18N + hashDatabasesLabel.setFont(hashDatabasesLabel.getFont().deriveFont(hashDatabasesLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11)); + org.openide.awt.Mnemonics.setLocalizedText(hashDatabasesLabel, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.hashDatabasesLabel.text")); // NOI18N + hashSetTable.setFont(hashSetTable.getFont().deriveFont(hashSetTable.getFont().getStyle() & ~java.awt.Font.BOLD, 11)); hashSetTable.setModel(new javax.swing.table.DefaultTableModel( new Object [][] { @@ -639,14 +642,15 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan }); jScrollPane1.setViewportView(hashSetTable); - deleteDatabaseButton.setFont(deleteDatabaseButton.getFont().deriveFont(deleteDatabaseButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11)); - deleteDatabaseButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/modules/hashdatabase/delete16.png"))); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(deleteDatabaseButton, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.deleteDatabaseButton.text")); // NOI18N - deleteDatabaseButton.setMaximumSize(new java.awt.Dimension(140, 25)); - deleteDatabaseButton.setMinimumSize(new java.awt.Dimension(140, 25)); - deleteDatabaseButton.addActionListener(new java.awt.event.ActionListener() { + createDatabaseButton.setFont(createDatabaseButton.getFont().deriveFont(createDatabaseButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11)); + createDatabaseButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/modules/hashdatabase/new16.png"))); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(createDatabaseButton, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.createDatabaseButton.text")); // NOI18N + createDatabaseButton.setToolTipText(org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.createDatabaseButton.toolTipText")); // NOI18N + createDatabaseButton.setMaximumSize(new java.awt.Dimension(140, 25)); + createDatabaseButton.setMinimumSize(new java.awt.Dimension(140, 25)); + createDatabaseButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { - deleteDatabaseButtonActionPerformed(evt); + createDatabaseButtonActionPerformed(evt); } }); @@ -662,18 +666,14 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan } }); - hashDatabasesLabel.setFont(hashDatabasesLabel.getFont().deriveFont(hashDatabasesLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11)); - org.openide.awt.Mnemonics.setLocalizedText(hashDatabasesLabel, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.hashDatabasesLabel.text")); // NOI18N - - createDatabaseButton.setFont(createDatabaseButton.getFont().deriveFont(createDatabaseButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11)); - createDatabaseButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/modules/hashdatabase/new16.png"))); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(createDatabaseButton, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.createDatabaseButton.text")); // NOI18N - createDatabaseButton.setToolTipText(org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.createDatabaseButton.toolTipText")); // NOI18N - createDatabaseButton.setMaximumSize(new java.awt.Dimension(140, 25)); - createDatabaseButton.setMinimumSize(new java.awt.Dimension(140, 25)); - createDatabaseButton.addActionListener(new java.awt.event.ActionListener() { + deleteDatabaseButton.setFont(deleteDatabaseButton.getFont().deriveFont(deleteDatabaseButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11)); + deleteDatabaseButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/modules/hashdatabase/delete16.png"))); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(deleteDatabaseButton, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.deleteDatabaseButton.text")); // NOI18N + deleteDatabaseButton.setMaximumSize(new java.awt.Dimension(140, 25)); + deleteDatabaseButton.setMinimumSize(new java.awt.Dimension(140, 25)); + deleteDatabaseButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { - createDatabaseButtonActionPerformed(evt); + deleteDatabaseButtonActionPerformed(evt); } }); @@ -850,7 +850,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup() - .addComponent(informationLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(informationLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE) .addGap(356, 356, 356)) .addGroup(jPanel1Layout.createSequentialGroup() .addComponent(indexButton) @@ -859,7 +859,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addGroup(jPanel1Layout.createSequentialGroup() .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(informationScrollPanel) + .addComponent(informationScrollPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 420, Short.MAX_VALUE) .addGroup(jPanel1Layout.createSequentialGroup() .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(sendIngestMessagesCheckBox)