From 06d9d25ab51995e3a69c3c2c4f10581799308cf4 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Mon, 3 Apr 2017 14:58:01 -0400 Subject: [PATCH 1/6] 2512 - ProfilePanel now shorter but still not scrolling --- .../autopsy/ingest/ProfilePanel.form | 78 +++++++++---------- .../autopsy/ingest/ProfilePanel.java | 50 ++++++------ 2 files changed, 62 insertions(+), 66 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.form b/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.form index b1df3cea4e..59aa34e062 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.form +++ b/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.form @@ -1,6 +1,11 @@
+ + + + + @@ -19,43 +24,36 @@ - - - - - - - - - - - + + + + - - + + - + - - + + - - + + - - - - - - + + + + + + @@ -82,13 +80,6 @@ - - - - - - - @@ -96,17 +87,26 @@ + + + + + + + + + + + + + + + - - - - - - - - + + diff --git a/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.java b/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.java index 7120fddf81..2ec0756aad 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.java @@ -98,12 +98,13 @@ class ProfilePanel extends IngestModuleGlobalSettingsPanel { profileDescPane = new javax.swing.JScrollPane(); profileDescArea = new javax.swing.JTextArea(); - profileDescLabel = new javax.swing.JLabel(); profileNameLabel = new javax.swing.JLabel(); + profileDescLabel = new javax.swing.JLabel(); jPanel1 = new javax.swing.JPanel(); - jScrollPane1 = new javax.swing.JScrollPane(); profileNameField = new javax.swing.JTextField(); + setMaximumSize(new java.awt.Dimension(625, 450)); + profileDescArea.setColumns(20); profileDescArea.setLineWrap(true); profileDescArea.setRows(5); @@ -112,13 +113,13 @@ class ProfilePanel extends IngestModuleGlobalSettingsPanel { profileDescArea.setName(""); // NOI18N profileDescPane.setViewportView(profileDescArea); - org.openide.awt.Mnemonics.setLocalizedText(profileDescLabel, org.openide.util.NbBundle.getMessage(ProfilePanel.class, "ProfilePanel.profileDescLabel.text")); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(profileNameLabel, org.openide.util.NbBundle.getMessage(ProfilePanel.class, "ProfilePanel.profileNameLabel.text")); // NOI18N - jPanel1.setLayout(new java.awt.BorderLayout()); + org.openide.awt.Mnemonics.setLocalizedText(profileDescLabel, org.openide.util.NbBundle.getMessage(ProfilePanel.class, "ProfilePanel.profileDescLabel.text")); // NOI18N - jScrollPane1.setViewportView(profileNameField); + jPanel1.setMinimumSize(new java.awt.Dimension(625, 450)); + jPanel1.setPreferredSize(new java.awt.Dimension(625, 450)); + jPanel1.setLayout(new java.awt.BorderLayout()); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); @@ -127,35 +128,31 @@ class ProfilePanel extends IngestModuleGlobalSettingsPanel { .addGroup(layout.createSequentialGroup() .addGap(6, 6, 6) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 0, Short.MAX_VALUE)) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(profileDescLabel) - .addComponent(profileNameLabel)) - .addContainerGap(478, Short.MAX_VALUE)))) + .addComponent(profileDescLabel) + .addComponent(profileNameLabel)) + .addContainerGap(480, Short.MAX_VALUE)) + .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addContainerGap() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jScrollPane1, javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(profileDescPane)) + .addComponent(profileDescPane, javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(profileNameField)) .addGap(6, 6, 6)) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addContainerGap() + .addGroup(layout.createSequentialGroup() + .addGap(1, 1, 1) .addComponent(profileNameLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(0, 0, 0) + .addComponent(profileNameField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addGap(4, 4, 4) - .addComponent(profileDescLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 22, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(profileDescPane) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(21, Short.MAX_VALUE)) + .addComponent(profileDescLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 15, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(0, 0, 0) + .addComponent(profileDescPane, javax.swing.GroupLayout.DEFAULT_SIZE, 67, Short.MAX_VALUE) + .addGap(0, 0, 0) + .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, 328, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(1, 1, 1)) ); }// //GEN-END:initComponents @Override @@ -169,7 +166,6 @@ class ProfilePanel extends IngestModuleGlobalSettingsPanel { } // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JPanel jPanel1; - private javax.swing.JScrollPane jScrollPane1; private javax.swing.JTextArea profileDescArea; private javax.swing.JLabel profileDescLabel; private javax.swing.JScrollPane profileDescPane; From 0174a2fa6aab4456b93f03e6ff5f79cfede4761f Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Mon, 3 Apr 2017 16:23:03 -0400 Subject: [PATCH 2/6] 2512 resizable scrollable profile creation panel --- .../autopsy/ingest/ProfilePanel.form | 183 ++++++++++-------- .../autopsy/ingest/ProfilePanel.java | 72 ++++--- .../autopsy/ingest/ProfileSettingsPanel.java | 21 +- 3 files changed, 166 insertions(+), 110 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.form b/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.form index 59aa34e062..18d2c49f40 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.form +++ b/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.form @@ -1,11 +1,6 @@
- - - - - @@ -21,92 +16,122 @@ - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - + - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.java b/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.java index 2ec0756aad..68781faf0d 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.java @@ -96,14 +96,18 @@ class ProfilePanel extends IngestModuleGlobalSettingsPanel { // //GEN-BEGIN:initComponents private void initComponents() { + jScrollPane1 = new javax.swing.JScrollPane(); + jPanel2 = new javax.swing.JPanel(); + profileNameField = new javax.swing.JTextField(); + profileDescLabel = new javax.swing.JLabel(); profileDescPane = new javax.swing.JScrollPane(); profileDescArea = new javax.swing.JTextArea(); profileNameLabel = new javax.swing.JLabel(); - profileDescLabel = new javax.swing.JLabel(); jPanel1 = new javax.swing.JPanel(); - profileNameField = new javax.swing.JTextField(); - setMaximumSize(new java.awt.Dimension(625, 450)); + jScrollPane1.setPreferredSize(new java.awt.Dimension(650, 323)); + + org.openide.awt.Mnemonics.setLocalizedText(profileDescLabel, org.openide.util.NbBundle.getMessage(ProfilePanel.class, "ProfilePanel.profileDescLabel.text")); // NOI18N profileDescArea.setColumns(20); profileDescArea.setLineWrap(true); @@ -111,48 +115,58 @@ class ProfilePanel extends IngestModuleGlobalSettingsPanel { profileDescArea.setWrapStyleWord(true); profileDescArea.setMinimumSize(new java.awt.Dimension(104, 22)); profileDescArea.setName(""); // NOI18N - profileDescPane.setViewportView(profileDescArea); + profileDescArea.setPreferredSize(new java.awt.Dimension(164, 30)); org.openide.awt.Mnemonics.setLocalizedText(profileNameLabel, org.openide.util.NbBundle.getMessage(ProfilePanel.class, "ProfilePanel.profileNameLabel.text")); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(profileDescLabel, org.openide.util.NbBundle.getMessage(ProfilePanel.class, "ProfilePanel.profileDescLabel.text")); // NOI18N - jPanel1.setMinimumSize(new java.awt.Dimension(625, 450)); jPanel1.setPreferredSize(new java.awt.Dimension(625, 450)); jPanel1.setLayout(new java.awt.BorderLayout()); - javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); - this.setLayout(layout); - layout.setHorizontalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() + javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2); + jPanel2.setLayout(jPanel2Layout); + jPanel2Layout.setHorizontalGroup( + jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel2Layout.createSequentialGroup() .addGap(6, 6, 6) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(profileDescLabel) - .addComponent(profileNameLabel)) - .addContainerGap(480, Short.MAX_VALUE)) - .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addContainerGap() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(profileDescPane, javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(profileNameField)) - .addGap(6, 6, 6)) + .addComponent(profileNameLabel))) + .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, 637, Short.MAX_VALUE) + .addGroup(jPanel2Layout.createSequentialGroup() + .addGap(6, 6, 6) + .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(profileNameField) + .addComponent(profileDescPane)) + .addGap(5, 5, 5)) ); - layout.setVerticalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addGap(1, 1, 1) + jPanel2Layout.setVerticalGroup( + jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel2Layout.createSequentialGroup() + .addGap(0, 0, 0) .addComponent(profileNameLabel) .addGap(0, 0, 0) .addComponent(profileNameField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addGap(4, 4, 4) .addComponent(profileDescLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 15, javax.swing.GroupLayout.PREFERRED_SIZE) .addGap(0, 0, 0) - .addComponent(profileDescPane, javax.swing.GroupLayout.DEFAULT_SIZE, 67, Short.MAX_VALUE) + .addComponent(profileDescPane, javax.swing.GroupLayout.DEFAULT_SIZE, 56, Short.MAX_VALUE) .addGap(0, 0, 0) - .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, 328, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(1, 1, 1)) + .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, 480, Short.MAX_VALUE) + .addGap(0, 0, 0)) + ); + + jScrollPane1.setViewportView(jPanel2); + + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); + this.setLayout(layout); + layout.setHorizontalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 639, Short.MAX_VALUE) + ); + layout.setVerticalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 591, Short.MAX_VALUE) ); }// //GEN-END:initComponents @Override @@ -166,6 +180,8 @@ class ProfilePanel extends IngestModuleGlobalSettingsPanel { } // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JPanel jPanel1; + private javax.swing.JPanel jPanel2; + private javax.swing.JScrollPane jScrollPane1; private javax.swing.JTextArea profileDescArea; private javax.swing.JLabel profileDescLabel; private javax.swing.JScrollPane profileDescPane; diff --git a/Core/src/org/sleuthkit/autopsy/ingest/ProfileSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/ProfileSettingsPanel.java index d3e4cadb84..adb6c06987 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/ProfileSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/ProfileSettingsPanel.java @@ -19,14 +19,19 @@ package org.sleuthkit.autopsy.ingest; import java.awt.Cursor; +import java.awt.event.ActionEvent; +import java.util.ArrayList; import java.util.Map; import java.util.TreeMap; +import java.util.logging.Level; +import javax.swing.DefaultComboBoxModel; import javax.swing.DefaultListModel; import javax.swing.JOptionPane; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import org.netbeans.spi.options.OptionsPanelController; import org.openide.util.NbBundle; +import org.sleuthkit.autopsy.corecomponents.AdvancedConfigurationDialog; import org.sleuthkit.autopsy.corecomponents.OptionsPanel; import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil; import org.sleuthkit.autopsy.ingest.IngestProfiles.IngestProfile; @@ -54,7 +59,7 @@ class ProfileSettingsPanel extends IngestModuleGlobalSettingsPanel implements Op private Map profiles; private ProfilePanel panel; private boolean canBeEnabled; //if something can be enabled ingest is not running - + private int option = JOptionPane.CANCEL_OPTION; /** * Creates new form ProfileOptionsPanel */ @@ -368,6 +373,7 @@ class ProfileSettingsPanel extends IngestModuleGlobalSettingsPanel implements Op */ private void doProfileDialog(IngestProfile selectedProfile) { // Create a files set defintion panel. + final AdvancedConfigurationDialog dialog = new AdvancedConfigurationDialog(true); this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); //start wait cursor for ingest job settings construction if (selectedProfile != null) { @@ -377,12 +383,21 @@ class ProfileSettingsPanel extends IngestModuleGlobalSettingsPanel implements Op // Creating a new set definition. panel = new ProfilePanel(); } + dialog.addApplyButtonListener( + (ActionEvent e) -> { + panel.store(); + option = JOptionPane.OK_OPTION; + dialog.close(); + } + ); + + //end wait Cursor for ingest job settings construction setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); // Do a dialog box with the profilePanel till the user enters a name or chooses cancel - int option = JOptionPane.OK_OPTION; do { - option = JOptionPane.showConfirmDialog(null, panel, Bundle.ProfileSettingsPanel_title(), JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE); + option = JOptionPane.CANCEL_OPTION; + dialog.display(panel); } while (option == JOptionPane.OK_OPTION && !panel.isValidDefinition()); if (option == JOptionPane.OK_OPTION) { From 1442237d2fa135cdca7c8608e40257da35e3bd8b Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Mon, 3 Apr 2017 16:37:43 -0400 Subject: [PATCH 3/6] 2512 Fixed accidently disabled description text area --- .../sleuthkit/autopsy/ingest/ProfilePanel.form | 17 ++++++++--------- .../sleuthkit/autopsy/ingest/ProfilePanel.java | 16 ++++++++-------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.form b/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.form index 18d2c49f40..889f4fb170 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.form +++ b/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.form @@ -40,22 +40,21 @@ + + + + + + + + - - - - - - - - - diff --git a/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.java b/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.java index 68781faf0d..04c397a86b 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.java @@ -116,6 +116,7 @@ class ProfilePanel extends IngestModuleGlobalSettingsPanel { profileDescArea.setMinimumSize(new java.awt.Dimension(104, 22)); profileDescArea.setName(""); // NOI18N profileDescArea.setPreferredSize(new java.awt.Dimension(164, 30)); + profileDescPane.setViewportView(profileDescArea); org.openide.awt.Mnemonics.setLocalizedText(profileNameLabel, org.openide.util.NbBundle.getMessage(ProfilePanel.class, "ProfilePanel.profileNameLabel.text")); // NOI18N @@ -127,18 +128,17 @@ class ProfilePanel extends IngestModuleGlobalSettingsPanel { jPanel2.setLayout(jPanel2Layout); jPanel2Layout.setHorizontalGroup( jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel2Layout.createSequentialGroup() - .addGap(6, 6, 6) - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(profileDescLabel) - .addComponent(profileNameLabel))) .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, 637, Short.MAX_VALUE) .addGroup(jPanel2Layout.createSequentialGroup() .addGap(6, 6, 6) .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(profileNameField) - .addComponent(profileDescPane)) - .addGap(5, 5, 5)) + .addComponent(profileDescLabel) + .addComponent(profileNameLabel) + .addGroup(jPanel2Layout.createSequentialGroup() + .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(profileNameField) + .addComponent(profileDescPane)) + .addGap(5, 5, 5)))) ); jPanel2Layout.setVerticalGroup( jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) From 2d9ef57211d49a2b873d6ef7c9cd659edeecdacb Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Mon, 3 Apr 2017 16:41:35 -0400 Subject: [PATCH 4/6] 2512 removed unused imports from ProfileSettingsPanel --- .../src/org/sleuthkit/autopsy/ingest/ProfileSettingsPanel.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/ingest/ProfileSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/ProfileSettingsPanel.java index adb6c06987..249f77cbfd 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/ProfileSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/ProfileSettingsPanel.java @@ -20,11 +20,8 @@ package org.sleuthkit.autopsy.ingest; import java.awt.Cursor; import java.awt.event.ActionEvent; -import java.util.ArrayList; import java.util.Map; import java.util.TreeMap; -import java.util.logging.Level; -import javax.swing.DefaultComboBoxModel; import javax.swing.DefaultListModel; import javax.swing.JOptionPane; import javax.swing.event.ListSelectionEvent; From b45e337073fd529acbe92a3900cfb40d6c9441cf Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Tue, 11 Apr 2017 11:21:55 -0400 Subject: [PATCH 5/6] 2512 further reduced height of ProfilePanel to 545 pixels --- .../autopsy/ingest/ProfilePanel.form | 26 +++++++++---------- .../autopsy/ingest/ProfilePanel.java | 17 ++++++------ 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.form b/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.form index 889f4fb170..5fb2f19a91 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.form +++ b/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.form @@ -16,12 +16,12 @@ - + - + @@ -40,7 +40,6 @@ - @@ -49,12 +48,16 @@ - + + + + + @@ -66,11 +69,11 @@ - - - - - + + + + + @@ -96,15 +99,12 @@ - + - - - diff --git a/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.java b/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.java index 04c397a86b..90df1a8f82 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.java @@ -111,11 +111,10 @@ class ProfilePanel extends IngestModuleGlobalSettingsPanel { profileDescArea.setColumns(20); profileDescArea.setLineWrap(true); - profileDescArea.setRows(5); + profileDescArea.setRows(8); profileDescArea.setWrapStyleWord(true); profileDescArea.setMinimumSize(new java.awt.Dimension(104, 22)); profileDescArea.setName(""); // NOI18N - profileDescArea.setPreferredSize(new java.awt.Dimension(164, 30)); profileDescPane.setViewportView(profileDescArea); org.openide.awt.Mnemonics.setLocalizedText(profileNameLabel, org.openide.util.NbBundle.getMessage(ProfilePanel.class, "ProfilePanel.profileNameLabel.text")); // NOI18N @@ -128,7 +127,6 @@ class ProfilePanel extends IngestModuleGlobalSettingsPanel { jPanel2.setLayout(jPanel2Layout); jPanel2Layout.setHorizontalGroup( jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, 637, Short.MAX_VALUE) .addGroup(jPanel2Layout.createSequentialGroup() .addGap(6, 6, 6) .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -137,8 +135,11 @@ class ProfilePanel extends IngestModuleGlobalSettingsPanel { .addGroup(jPanel2Layout.createSequentialGroup() .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(profileNameField) - .addComponent(profileDescPane)) + .addComponent(profileDescPane, javax.swing.GroupLayout.DEFAULT_SIZE, 632, Short.MAX_VALUE)) .addGap(5, 5, 5)))) + .addGroup(jPanel2Layout.createSequentialGroup() + .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addGap(0, 0, 0)) ); jPanel2Layout.setVerticalGroup( jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -150,9 +151,9 @@ class ProfilePanel extends IngestModuleGlobalSettingsPanel { .addGap(4, 4, 4) .addComponent(profileDescLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 15, javax.swing.GroupLayout.PREFERRED_SIZE) .addGap(0, 0, 0) - .addComponent(profileDescPane, javax.swing.GroupLayout.DEFAULT_SIZE, 56, Short.MAX_VALUE) + .addComponent(profileDescPane, javax.swing.GroupLayout.PREFERRED_SIZE, 39, javax.swing.GroupLayout.PREFERRED_SIZE) .addGap(0, 0, 0) - .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, 480, Short.MAX_VALUE) + .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addGap(0, 0, 0)) ); @@ -162,11 +163,11 @@ class ProfilePanel extends IngestModuleGlobalSettingsPanel { this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 639, Short.MAX_VALUE) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 645, Short.MAX_VALUE) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 591, Short.MAX_VALUE) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 545, Short.MAX_VALUE) ); }// //GEN-END:initComponents @Override From c69d011a74ae31ff7487fddc9da866d2ace2f48d Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Tue, 11 Apr 2017 13:37:08 -0400 Subject: [PATCH 6/6] 2512 side by side label and field for ProfilePanel --- .../autopsy/ingest/ProfilePanel.form | 55 +++++++++---------- .../autopsy/ingest/ProfilePanel.java | 47 ++++++++-------- 2 files changed, 48 insertions(+), 54 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.form b/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.form index 5fb2f19a91..fc32cf5528 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.form +++ b/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.form @@ -16,12 +16,12 @@ - + - + @@ -41,39 +41,36 @@ - - - - - - - - - - - + + + + + + + + + + - - - - + - - - - - - - - - - - + + + + + + + + + + + + @@ -102,7 +99,7 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.java b/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.java index 90df1a8f82..3110947488 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/ProfilePanel.java @@ -33,7 +33,7 @@ import org.sleuthkit.autopsy.ingest.IngestProfiles.IngestProfile; */ class ProfilePanel extends IngestModuleGlobalSettingsPanel { - @NbBundle.Messages({"ProfilePanel.profileDescLabel.text=Profile Description:", + @NbBundle.Messages({"ProfilePanel.profileDescLabel.text=Description:", "ProfilePanel.profileNameLabel.text=Profile Name:", "ProfilePanel.newProfileText=NewEmptyProfile", "ProfilePanel.messages.profilesMustBeNamed=Ingest profile must be named.", @@ -113,7 +113,7 @@ class ProfilePanel extends IngestModuleGlobalSettingsPanel { profileDescArea.setLineWrap(true); profileDescArea.setRows(8); profileDescArea.setWrapStyleWord(true); - profileDescArea.setMinimumSize(new java.awt.Dimension(104, 22)); + profileDescArea.setMinimumSize(new java.awt.Dimension(164, 44)); profileDescArea.setName(""); // NOI18N profileDescPane.setViewportView(profileDescArea); @@ -129,32 +129,29 @@ class ProfilePanel extends IngestModuleGlobalSettingsPanel { jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel2Layout.createSequentialGroup() .addGap(6, 6, 6) + .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(profileDescLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 66, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(profileNameLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 66, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(profileDescLabel) - .addComponent(profileNameLabel) - .addGroup(jPanel2Layout.createSequentialGroup() - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(profileNameField) - .addComponent(profileDescPane, javax.swing.GroupLayout.DEFAULT_SIZE, 632, Short.MAX_VALUE)) - .addGap(5, 5, 5)))) - .addGroup(jPanel2Layout.createSequentialGroup() - .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addGap(0, 0, 0)) + .addComponent(profileDescPane) + .addComponent(profileNameField)) + .addGap(5, 5, 5)) + .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) ); jPanel2Layout.setVerticalGroup( jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel2Layout.createSequentialGroup() - .addGap(0, 0, 0) - .addComponent(profileNameLabel) - .addGap(0, 0, 0) - .addComponent(profileNameField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(4, 4, 4) - .addComponent(profileDescLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 15, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 0, 0) - .addComponent(profileDescPane, javax.swing.GroupLayout.PREFERRED_SIZE, 39, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 0, 0) - .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 0, 0)) + .addGap(8, 8, 8) + .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(profileNameField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(profileNameLabel)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(profileDescLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 15, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(profileDescPane, javax.swing.GroupLayout.PREFERRED_SIZE, 39, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addGap(2, 2, 2)) ); jScrollPane1.setViewportView(jPanel2); @@ -163,11 +160,11 @@ class ProfilePanel extends IngestModuleGlobalSettingsPanel { this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 645, Short.MAX_VALUE) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 627, Short.MAX_VALUE) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 545, Short.MAX_VALUE) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 527, Short.MAX_VALUE) ); }// //GEN-END:initComponents @Override