diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java index 78380082b7..84d759dd94 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java @@ -36,7 +36,7 @@ import org.openide.util.Lookup; * {@link AddImageWizardIngestConfigPanel} (which is a bit weird if you ask m * -jm) */ -class AddImageWizardAddingProgressPanel implements WizardDescriptor.Panel { +class AddImageWizardAddingProgressPanel implements WizardDescriptor.FinishablePanel { /** * flag to indicate that the image adding process is finished and this panel @@ -175,7 +175,7 @@ class AddImageWizardAddingProgressPanel implements WizardDescriptor.Panel
+ + + + + + + + + + + + + + + + + @@ -17,29 +34,35 @@ - + - - + + + - + - - + + + + - + + + + @@ -47,11 +70,7 @@ - - - - - + @@ -62,8 +81,6 @@ - - @@ -79,16 +96,9 @@ - - - - - - - - - - + + + @@ -96,76 +106,67 @@ + + + - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - + - + - + - - - - - - - - + + - + - - - - - - + @@ -177,38 +178,10 @@ + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -233,6 +206,29 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressVisual.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressVisual.java index 62e74693a5..90f7daaa61 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressVisual.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressVisual.java @@ -22,6 +22,7 @@ import java.awt.Color; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import javax.swing.JProgressBar; +import org.openide.WizardDescriptor; /** * visual component to display progress bar and status updates while adding an @@ -29,6 +30,8 @@ import javax.swing.JProgressBar; */ public class AddImageWizardAddingProgressVisual extends javax.swing.JPanel { + private static final String ADDING_DATA_SOURCE_COMPLETE = "Adding Data Source - Complete"; + /** * Returns the name of the this panel. This name will be shown on the left * panel of the "Add Image" wizard panel. @@ -43,8 +46,9 @@ public class AddImageWizardAddingProgressVisual extends javax.swing.JPanel { /** * hide the progress components and show the "done" components */ - void setStateFinished() { - loadingPanel.setVisible(false); + protected void setStateFinished() { + inProgressPanel.setVisible(false); + titleLabel.setText(ADDING_DATA_SOURCE_COMPLETE); donePanel.setVisible(true); //force repaint just in case validate(); @@ -57,6 +61,7 @@ public class AddImageWizardAddingProgressVisual extends javax.swing.JPanel { public AddImageWizardAddingProgressVisual() { initComponents(); customizeComponents(); + } private void customizeComponents() { @@ -68,16 +73,15 @@ public class AddImageWizardAddingProgressVisual extends javax.swing.JPanel { } - /** - * reset some of the visual components. - * - * is this ever invoked? - */ - void resetInfoPanel() { - viewLogButton.setVisible(false); - progressLabel.setText(""); - } - +// /** +// * reset some of the visual components. +// * +// * is this ever invoked? +// */ +// void resetInfoPanel() { +// viewLogButton.setVisible(false); +// progressLabel.setText(""); +// } public JProgressBar getProgressBar() { return this.progressBar; } @@ -112,7 +116,7 @@ public class AddImageWizardAddingProgressVisual extends javax.swing.JPanel { * @param errors a string containing a description of the error(s) * @param critical true to indicate the error(s) are critical */ - void showErrors(final String errors, boolean critical) { + public void showErrors(final String errors, boolean critical) { progressBar.setValue(100); //always invoked when process completed if (critical) { statusLabel.setText("*Failed to add image (critical errors encountered). Click below to view the log."); @@ -128,6 +132,7 @@ public class AddImageWizardAddingProgressVisual extends javax.swing.JPanel { //show error dialog AddImageErrorsDialog dialog = new AddImageErrorsDialog(null, true); dialog.setErrors(errors); + dialog.setLocationRelativeTo(null); dialog.setVisible(true); } }); @@ -143,24 +148,31 @@ public class AddImageWizardAddingProgressVisual extends javax.swing.JPanel { // //GEN-BEGIN:initComponents private void initComponents() { + loadingPanel = new javax.swing.JPanel(); donePanel = new javax.swing.JPanel(); statusLabel = new javax.swing.JLabel(); - crDbLabel = new javax.swing.JLabel(); viewLogButton = new javax.swing.JButton(); - loadingPanel = new javax.swing.JPanel(); - addingDataSourceLabel = new javax.swing.JLabel(); - progressLabel = new javax.swing.JLabel(); - jLabel1 = new javax.swing.JLabel(); - jLabel5 = new javax.swing.JLabel(); + titleLabel = new javax.swing.JLabel(); + inProgressPanel = new javax.swing.JPanel(); progressBar = new javax.swing.JProgressBar(); - infoPanel = new javax.swing.JPanel(); + progressLabel = new javax.swing.JLabel(); TextArea_CurrentDirectory = new javax.swing.JTextArea(); + subTitle2Label = new javax.swing.JLabel(); + subTitle1Label = new javax.swing.JLabel(); + + javax.swing.GroupLayout loadingPanelLayout = new javax.swing.GroupLayout(loadingPanel); + loadingPanel.setLayout(loadingPanelLayout); + loadingPanelLayout.setHorizontalGroup( + loadingPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 540, Short.MAX_VALUE) + ); + loadingPanelLayout.setVerticalGroup( + loadingPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 247, Short.MAX_VALUE) + ); org.openide.awt.Mnemonics.setLocalizedText(statusLabel, org.openide.util.NbBundle.getMessage(AddImageWizardAddingProgressVisual.class, "AddImageWizardAddingProgressVisual.statusLabel.text")); // NOI18N - crDbLabel.setFont(new java.awt.Font("Tahoma", 1, 14)); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(crDbLabel, org.openide.util.NbBundle.getMessage(AddImageWizardAddingProgressVisual.class, "AddImageWizardAddingProgressVisual.crDbLabel.text")); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(viewLogButton, org.openide.util.NbBundle.getMessage(AddImageWizardAddingProgressVisual.class, "AddImageWizardAddingProgressVisual.viewLogButton.text")); // NOI18N javax.swing.GroupLayout donePanelLayout = new javax.swing.GroupLayout(donePanel); @@ -170,10 +182,7 @@ public class AddImageWizardAddingProgressVisual extends javax.swing.JPanel { .addGroup(donePanelLayout.createSequentialGroup() .addContainerGap() .addGroup(donePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(donePanelLayout.createSequentialGroup() - .addGap(0, 0, 0) - .addComponent(viewLogButton)) - .addComponent(crDbLabel) + .addComponent(viewLogButton) .addComponent(statusLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 463, javax.swing.GroupLayout.PREFERRED_SIZE)) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); @@ -181,35 +190,20 @@ public class AddImageWizardAddingProgressVisual extends javax.swing.JPanel { donePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(donePanelLayout.createSequentialGroup() .addContainerGap() - .addComponent(crDbLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(statusLabel) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(viewLogButton) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); - addingDataSourceLabel.setFont(new java.awt.Font("Tahoma", 1, 14)); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(addingDataSourceLabel, org.openide.util.NbBundle.getMessage(AddImageWizardAddingProgressVisual.class, "AddImageWizardAddingProgressVisual.addingDataSourceLabel.text")); // NOI18N + titleLabel.setFont(new java.awt.Font("Tahoma", 1, 14)); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(titleLabel, org.openide.util.NbBundle.getMessage(AddImageWizardAddingProgressVisual.class, "AddImageWizardAddingProgressVisual.titleLabel.text")); // NOI18N + + progressBar.setIndeterminate(true); org.openide.awt.Mnemonics.setLocalizedText(progressLabel, org.openide.util.NbBundle.getMessage(AddImageWizardAddingProgressVisual.class, "AddImageWizardAddingProgressVisual.progressLabel.text")); // NOI18N progressLabel.setPreferredSize(null); - org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(AddImageWizardAddingProgressVisual.class, "AddImageWizardAddingProgressVisual.jLabel1.text")); // NOI18N - - org.openide.awt.Mnemonics.setLocalizedText(jLabel5, org.openide.util.NbBundle.getMessage(AddImageWizardAddingProgressVisual.class, "AddImageWizardAddingProgressVisual.jLabel5.text")); // NOI18N - - javax.swing.GroupLayout infoPanelLayout = new javax.swing.GroupLayout(infoPanel); - infoPanel.setLayout(infoPanelLayout); - infoPanelLayout.setHorizontalGroup( - infoPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 73, Short.MAX_VALUE) - ); - infoPanelLayout.setVerticalGroup( - infoPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 25, Short.MAX_VALUE) - ); - TextArea_CurrentDirectory.setEditable(false); TextArea_CurrentDirectory.setBackground(new java.awt.Color(240, 240, 240)); TextArea_CurrentDirectory.setLineWrap(true); @@ -219,48 +213,36 @@ public class AddImageWizardAddingProgressVisual extends javax.swing.JPanel { TextArea_CurrentDirectory.setCursor(new java.awt.Cursor(java.awt.Cursor.TEXT_CURSOR)); TextArea_CurrentDirectory.setFocusable(false); - javax.swing.GroupLayout loadingPanelLayout = new javax.swing.GroupLayout(loadingPanel); - loadingPanel.setLayout(loadingPanelLayout); - loadingPanelLayout.setHorizontalGroup( - loadingPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(loadingPanelLayout.createSequentialGroup() + org.openide.awt.Mnemonics.setLocalizedText(subTitle2Label, org.openide.util.NbBundle.getMessage(AddImageWizardAddingProgressVisual.class, "AddImageWizardAddingProgressVisual.subTitle2Label.text")); // NOI18N + + org.openide.awt.Mnemonics.setLocalizedText(subTitle1Label, org.openide.util.NbBundle.getMessage(AddImageWizardAddingProgressVisual.class, "AddImageWizardAddingProgressVisual.subTitle1Label.text")); // NOI18N + + javax.swing.GroupLayout inProgressPanelLayout = new javax.swing.GroupLayout(inProgressPanel); + inProgressPanel.setLayout(inProgressPanelLayout); + inProgressPanelLayout.setHorizontalGroup( + inProgressPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(inProgressPanelLayout.createSequentialGroup() .addContainerGap() - .addGroup(loadingPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, loadingPanelLayout.createSequentialGroup() - .addGap(0, 0, Short.MAX_VALUE) - .addGroup(loadingPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(addingDataSourceLabel) - .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, 552, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel5) - .addComponent(progressBar, javax.swing.GroupLayout.PREFERRED_SIZE, 489, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addGroup(loadingPanelLayout.createSequentialGroup() - .addGroup(loadingPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(loadingPanelLayout.createSequentialGroup() - .addComponent(progressLabel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(infoPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addComponent(TextArea_CurrentDirectory, javax.swing.GroupLayout.PREFERRED_SIZE, 487, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGap(0, 0, Short.MAX_VALUE)))) + .addGroup(inProgressPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(subTitle2Label) + .addComponent(progressLabel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(subTitle1Label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(TextArea_CurrentDirectory) + .addComponent(progressBar, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addGap(0, 8, Short.MAX_VALUE)) ); - loadingPanelLayout.setVerticalGroup( - loadingPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(loadingPanelLayout.createSequentialGroup() - .addContainerGap() - .addComponent(addingDataSourceLabel) + inProgressPanelLayout.setVerticalGroup( + inProgressPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(inProgressPanelLayout.createSequentialGroup() + .addComponent(subTitle1Label) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(jLabel1) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, 14, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(subTitle2Label, javax.swing.GroupLayout.PREFERRED_SIZE, 14, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(progressBar, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(progressBar, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(TextArea_CurrentDirectory, javax.swing.GroupLayout.PREFERRED_SIZE, 91, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(loadingPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(loadingPanelLayout.createSequentialGroup() - .addComponent(infoPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 0, Short.MAX_VALUE)) - .addComponent(progressLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(progressLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE) .addContainerGap()) ); @@ -269,34 +251,36 @@ public class AddImageWizardAddingProgressVisual extends javax.swing.JPanel { layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() - .addGap(0, 0, 0) + .addContainerGap() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(loadingPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(titleLabel) + .addComponent(inProgressPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(donePanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGap(0, 0, Short.MAX_VALUE)) + .addGap(0, 69, Short.MAX_VALUE)) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() - .addGap(0, 0, 0) - .addComponent(loadingPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap() + .addComponent(titleLabel) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(inProgressPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(donePanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap()) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); }// //GEN-END:initComponents // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JTextArea TextArea_CurrentDirectory; - private javax.swing.JLabel addingDataSourceLabel; - private javax.swing.JLabel crDbLabel; - private javax.swing.JPanel donePanel; - private javax.swing.JPanel infoPanel; - private javax.swing.JLabel jLabel1; - private javax.swing.JLabel jLabel5; + protected javax.swing.JTextArea TextArea_CurrentDirectory; + protected javax.swing.JPanel donePanel; + protected javax.swing.JPanel inProgressPanel; private javax.swing.JPanel loadingPanel; private javax.swing.JProgressBar progressBar; - private javax.swing.JLabel progressLabel; - private javax.swing.JLabel statusLabel; - private javax.swing.JButton viewLogButton; + protected javax.swing.JLabel progressLabel; + protected javax.swing.JLabel statusLabel; + protected javax.swing.JLabel subTitle1Label; + protected javax.swing.JLabel subTitle2Label; + protected javax.swing.JLabel titleLabel; + protected javax.swing.JButton viewLogButton; // End of variables declaration//GEN-END:variables } diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties index 0fa81ada14..ffb3261dd5 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties @@ -134,10 +134,6 @@ LocalFilesPanel.selectButton.actionCommand=Add AddImageWizardIngestConfigVisual.subtitleLabel.text=Configure the ingest modules you would like to run on this data source. AddImageWizardIngestConfigVisual.titleLabel.text=Configure Ingest Modules AddImageWizardAddingProgressVisual.statusLabel.text=File system has been added to the local database. Files are being analyzed. -AddImageWizardAddingProgressVisual.crDbLabel.text=Adding Data Source - Complete -AddImageWizardAddingProgressVisual.addingDataSourceLabel.text=Adding Data Source -AddImageWizardAddingProgressVisual.jLabel1.text=File system information is being added to a local database. File analysis will start when this finishes. -AddImageWizardAddingProgressVisual.jLabel5.text=Processing Data Source and Adding to Database AddImageWizardChooseDataSourceVisual.noFatOrphansCheckbox.toolTipText= AddImageWizardChooseDataSourceVisual.noFatOrphansCheckbox.text=Ignore orphan files in FAT file systems AddImageWizardChooseDataSourceVisual.descLabel.text=(faster results, although some data will not be searched) @@ -149,3 +145,6 @@ AddImageWizardChooseDataSourceVisual.imgInfoLabel.text=Enter Data Source Informa AddImageWizardAddingProgressVisual.progressLabel.text= AddImageWizardAddingProgressVisual.TextArea_CurrentDirectory.border.title=Currently Adding: AddImageWizardAddingProgressVisual.viewLogButton.text=View Log +AddImageWizardAddingProgressVisual.titleLabel.text=Adding Data Source +AddImageWizardAddingProgressVisual.subTitle1Label.text=File system information is being added to a local database. File analysis will start when this finishes. +AddImageWizardAddingProgressVisual.subTitle2Label.text=Processing Data Source and Adding to Database