From b0c244909c5241d94c41699f970233ee1eaf3276 Mon Sep 17 00:00:00 2001 From: Eugene Livis Date: Mon, 23 Sep 2019 12:52:22 -0400 Subject: [PATCH] Command Line opions panel UI updates --- .../commandlineingest/Bundle.properties | 9 ++++--- .../Bundle.properties-MERGED | 9 ++++--- .../CommandLineIngestSettingsPanel.form | 24 ++++++------------- .../CommandLineIngestSettingsPanel.java | 23 +++++++----------- 4 files changed, 23 insertions(+), 42 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties b/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties index 9200d5dd2f..9c4f680119 100755 --- a/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties @@ -2,12 +2,11 @@ OpenIDE-Module-Name=CommandLineAutopsy OptionsCategory_Keywords_Command_Line_Ingest_Settings=Command Line Ingest Settings OptionsCategory_Keywords_General=Options OptionsCategory_Name_Command_Line_Ingest=Command Line Ingest -CommandLineIngestSettingsPanel.bnEditIngestSettings.toolTipText=Ingest job settings for the command line processing mode context. -CommandLineIngestSettingsPanel.bnEditIngestSettings.text=Ingest Module Settings CommandLinePanel.jLabel1.text=Ingest is running from command line CommandLineStartupWindow.title.text=Running in Command Line Mode +CommandLineIngestSettingsPanel.bnEditIngestSettings.text=Configure Ingest CommandLineIngestSettingsPanel.bnEditReportSettings.actionCommand=Report Module Settings CommandLineIngestSettingsPanel.bnEditReportSettings.toolTipText=Report generation settings for the command line processing mode context. -CommandLineIngestSettingsPanel.bnEditReportSettings.text=Report Module Settings -CommandLineIngestSettingsPanel.jLabelReportConfig.text=Configure Report Generation for Command Line Ingest: -CommandLineIngestSettingsPanel.jLabelBaselineConfig.text=Configure Baseline Configuration for Command Line Ingest: +CommandLineIngestSettingsPanel.bnEditReportSettings.text=Configure Reporting +CommandLineIngestSettingsPanel.jLabelDescription.text=You can create cases, add data sources, run ingest modules, and generate reports from the command line.
This options panel allows you to configure the settings to use when running ingest modules and generating reports.
See the user documentation for details. +CommandLineIngestSettingsPanel.bnEditIngestSettings.toolTipText=Ingest job settings for the command line processing mode context. diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties-MERGED index 9200d5dd2f..9c4f680119 100755 --- a/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/Bundle.properties-MERGED @@ -2,12 +2,11 @@ OpenIDE-Module-Name=CommandLineAutopsy OptionsCategory_Keywords_Command_Line_Ingest_Settings=Command Line Ingest Settings OptionsCategory_Keywords_General=Options OptionsCategory_Name_Command_Line_Ingest=Command Line Ingest -CommandLineIngestSettingsPanel.bnEditIngestSettings.toolTipText=Ingest job settings for the command line processing mode context. -CommandLineIngestSettingsPanel.bnEditIngestSettings.text=Ingest Module Settings CommandLinePanel.jLabel1.text=Ingest is running from command line CommandLineStartupWindow.title.text=Running in Command Line Mode +CommandLineIngestSettingsPanel.bnEditIngestSettings.text=Configure Ingest CommandLineIngestSettingsPanel.bnEditReportSettings.actionCommand=Report Module Settings CommandLineIngestSettingsPanel.bnEditReportSettings.toolTipText=Report generation settings for the command line processing mode context. -CommandLineIngestSettingsPanel.bnEditReportSettings.text=Report Module Settings -CommandLineIngestSettingsPanel.jLabelReportConfig.text=Configure Report Generation for Command Line Ingest: -CommandLineIngestSettingsPanel.jLabelBaselineConfig.text=Configure Baseline Configuration for Command Line Ingest: +CommandLineIngestSettingsPanel.bnEditReportSettings.text=Configure Reporting +CommandLineIngestSettingsPanel.jLabelDescription.text=You can create cases, add data sources, run ingest modules, and generate reports from the command line.
This options panel allows you to configure the settings to use when running ingest modules and generating reports.
See the user documentation for details. +CommandLineIngestSettingsPanel.bnEditIngestSettings.toolTipText=Ingest job settings for the command line processing mode context. diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.form index ea8344c216..c20e802081 100755 --- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.form +++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.form @@ -60,11 +60,10 @@ - - + - + @@ -72,14 +71,12 @@ - + - - - + - + @@ -101,17 +98,10 @@ - + - - - - - - - - + diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java index 9d29070018..63bad0bd23 100755 --- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java @@ -99,8 +99,7 @@ public class CommandLineIngestSettingsPanel extends javax.swing.JPanel { nodeScrollPane = new javax.swing.JScrollPane(); nodePanel = new javax.swing.JPanel(); bnEditIngestSettings = new javax.swing.JButton(); - jLabelBaselineConfig = new javax.swing.JLabel(); - jLabelReportConfig = new javax.swing.JLabel(); + jLabelDescription = new javax.swing.JLabel(); bnEditReportSettings = new javax.swing.JButton(); setPreferredSize(new java.awt.Dimension(810, 422)); @@ -120,9 +119,7 @@ public class CommandLineIngestSettingsPanel extends javax.swing.JPanel { } }); - org.openide.awt.Mnemonics.setLocalizedText(jLabelBaselineConfig, org.openide.util.NbBundle.getMessage(CommandLineIngestSettingsPanel.class, "CommandLineIngestSettingsPanel.jLabelBaselineConfig.text")); // NOI18N - - org.openide.awt.Mnemonics.setLocalizedText(jLabelReportConfig, org.openide.util.NbBundle.getMessage(CommandLineIngestSettingsPanel.class, "CommandLineIngestSettingsPanel.jLabelReportConfig.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(jLabelDescription, org.openide.util.NbBundle.getMessage(CommandLineIngestSettingsPanel.class, "CommandLineIngestSettingsPanel.jLabelDescription.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(bnEditReportSettings, org.openide.util.NbBundle.getMessage(CommandLineIngestSettingsPanel.class, "CommandLineIngestSettingsPanel.bnEditReportSettings.text")); // NOI18N bnEditReportSettings.setToolTipText(org.openide.util.NbBundle.getMessage(CommandLineIngestSettingsPanel.class, "CommandLineIngestSettingsPanel.bnEditReportSettings.toolTipText")); // NOI18N @@ -141,23 +138,20 @@ public class CommandLineIngestSettingsPanel extends javax.swing.JPanel { .addContainerGap() .addGroup(nodePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(bnEditIngestSettings, javax.swing.GroupLayout.PREFERRED_SIZE, 155, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabelBaselineConfig) - .addComponent(jLabelReportConfig) + .addComponent(jLabelDescription, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(bnEditReportSettings, javax.swing.GroupLayout.PREFERRED_SIZE, 155, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addContainerGap(362, Short.MAX_VALUE)) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); nodePanelLayout.setVerticalGroup( nodePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(nodePanelLayout.createSequentialGroup() .addGap(27, 27, 27) - .addComponent(jLabelBaselineConfig) + .addComponent(jLabelDescription, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(bnEditIngestSettings) - .addGap(18, 18, 18) - .addComponent(jLabelReportConfig) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(bnEditReportSettings) - .addContainerGap(376, Short.MAX_VALUE)) + .addContainerGap(381, Short.MAX_VALUE)) ); nodeScrollPane.setViewportView(nodePanel); @@ -187,8 +181,7 @@ public class CommandLineIngestSettingsPanel extends javax.swing.JPanel { // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton bnEditIngestSettings; private javax.swing.JButton bnEditReportSettings; - private javax.swing.JLabel jLabelBaselineConfig; - private javax.swing.JLabel jLabelReportConfig; + private javax.swing.JLabel jLabelDescription; private javax.swing.JPanel nodePanel; private javax.swing.JScrollPane nodeScrollPane; // End of variables declaration//GEN-END:variables