From 3ffa5607b4e0a1e5a88b0cf7e1e6e682d061780c Mon Sep 17 00:00:00 2001 From: adam-m Date: Mon, 13 Aug 2012 10:26:00 -0400 Subject: [PATCH] Adjust wizard titles --- .../autopsy/casemodule/AddImageVisualPanel3.form | 2 +- .../autopsy/casemodule/AddImageVisualPanel3.java | 12 ++++++------ .../autopsy/casemodule/AddImageVisualPanel4.form | 14 ++++++++++++-- .../autopsy/casemodule/AddImageVisualPanel4.java | 15 +++++++++++---- .../autopsy/casemodule/Bundle.properties | 7 ++++--- 5 files changed, 34 insertions(+), 16 deletions(-) diff --git a/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel3.form b/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel3.form index 5a1e6247e7..d220b5201d 100644 --- a/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel3.form +++ b/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel3.form @@ -1,4 +1,4 @@ - +
diff --git a/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel3.java b/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel3.java index 6df994590f..4c37230dbf 100644 --- a/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel3.java +++ b/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel3.java @@ -51,7 +51,7 @@ public class AddImageVisualPanel3 extends javax.swing.JPanel { */ @Override public String getName() { - return "Ingest Image"; + return "Configure Ingest Modules"; } /** This method is called from within the constructor to @@ -80,11 +80,11 @@ public class AddImageVisualPanel3 extends javax.swing.JPanel { configPanel.setLayout(configPanelLayout); configPanelLayout.setHorizontalGroup( configPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 596, Short.MAX_VALUE) + .addGap(0, 569, Short.MAX_VALUE) ); configPanelLayout.setVerticalGroup( configPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 266, Short.MAX_VALUE) + .addGap(0, 246, Short.MAX_VALUE) ); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); @@ -97,8 +97,8 @@ public class AddImageVisualPanel3 extends javax.swing.JPanel { .addGroup(layout.createSequentialGroup() .addContainerGap() .addComponent(subtitleLabel))) - .addContainerGap(159, Short.MAX_VALUE)) - .addComponent(configPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 596, Short.MAX_VALUE) + .addContainerGap(132, Short.MAX_VALUE)) + .addComponent(configPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -107,7 +107,7 @@ public class AddImageVisualPanel3 extends javax.swing.JPanel { .addGap(5, 5, 5) .addComponent(subtitleLabel) .addGap(18, 18, 18) - .addComponent(configPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 266, Short.MAX_VALUE)) + .addComponent(configPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 246, Short.MAX_VALUE)) ); }// //GEN-END:initComponents // Variables declaration - do not modify//GEN-BEGIN:variables diff --git a/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel4.form b/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel4.form index 0ba0529493..5237f9e961 100644 --- a/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel4.form +++ b/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel4.form @@ -1,4 +1,4 @@ - + @@ -22,6 +22,7 @@ + @@ -34,9 +35,11 @@ + + - + @@ -69,5 +72,12 @@ + + + + + + +
diff --git a/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel4.java b/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel4.java index 14b50fb150..87861b89fb 100644 --- a/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel4.java +++ b/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel4.java @@ -43,7 +43,7 @@ final class AddImageVisualPanel4 extends JPanel { */ @Override public String getName() { - return "Done"; + return "Finish"; } /** This method is called from within the constructor to @@ -57,6 +57,7 @@ final class AddImageVisualPanel4 extends JPanel { addImgButton = new javax.swing.JButton(); crDbLabel = new javax.swing.JLabel(); jLabel1 = new javax.swing.JLabel(); + jLabel2 = new javax.swing.JLabel(); org.openide.awt.Mnemonics.setLocalizedText(addImgButton, org.openide.util.NbBundle.getMessage(AddImageVisualPanel4.class, "AddImageVisualPanel4.addImgButton.text")); // NOI18N addImgButton.addActionListener(new java.awt.event.ActionListener() { @@ -65,11 +66,13 @@ final class AddImageVisualPanel4 extends JPanel { } }); - crDbLabel.setFont(new java.awt.Font("Tahoma", 1, 14)); + crDbLabel.setFont(new java.awt.Font("Tahoma", 1, 14)); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(crDbLabel, org.openide.util.NbBundle.getMessage(AddImageVisualPanel4.class, "AddImageVisualPanel4.crDbLabel.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(AddImageVisualPanel4.class, "AddImageVisualPanel4.jLabel1.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(AddImageVisualPanel4.class, "AddImageVisualPanel4.jLabel2.text")); // NOI18N + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( @@ -79,7 +82,8 @@ final class AddImageVisualPanel4 extends JPanel { .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(crDbLabel) .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, 549, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(addImgButton)) + .addComponent(addImgButton) + .addComponent(jLabel2)) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); layout.setVerticalGroup( @@ -89,9 +93,11 @@ final class AddImageVisualPanel4 extends JPanel { .addComponent(crDbLabel) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(jLabel1) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jLabel2) .addGap(18, 18, 18) .addComponent(addImgButton) - .addContainerGap(31, Short.MAX_VALUE)) + .addContainerGap()) ); }// //GEN-END:initComponents @@ -110,5 +116,6 @@ final class AddImageVisualPanel4 extends JPanel { private javax.swing.JButton addImgButton; private javax.swing.JLabel crDbLabel; private javax.swing.JLabel jLabel1; + private javax.swing.JLabel jLabel2; // End of variables declaration//GEN-END:variables } diff --git a/Case/src/org/sleuthkit/autopsy/casemodule/Bundle.properties b/Case/src/org/sleuthkit/autopsy/casemodule/Bundle.properties index 5760343319..1701014740 100755 --- a/Case/src/org/sleuthkit/autopsy/casemodule/Bundle.properties +++ b/Case/src/org/sleuthkit/autopsy/casemodule/Bundle.properties @@ -103,10 +103,10 @@ NewJPanel.jButton1.text=Rename NewJPanel.jLabel4.text=Database: AddImageVisualPanel2.indexImageCheckBox.text=Index image for keyword search AddImageVisualPanel1.jLabel2.text= Press 'Next' to analyze the disk image to extract volume and file system data and populate a local database. -AddImageVisualPanel4.jLabel1.text=Image successfully processed and added to the case. You can add another image or return to the case. -AddImageVisualPanel4.crDbLabel.text=Finish or Add More Images +AddImageVisualPanel4.jLabel1.text=Image was successfully added to the case and is being processed. +AddImageVisualPanel4.crDbLabel.text=Image Added and Being Processed AddImageVisualPanel4.addImgButton.text=Add Another Image -AddImageVisualPanel3.titleLabel.text=Add image to ingest +AddImageVisualPanel3.titleLabel.text=Configure Ingest Modules AddImageVisualPanel3.subtitleLabel.text=Image has been commited. You can configure and run ingest modules on the new image. CasePropertiesForm.caseNumberLabel.text=Case Number: CasePropertiesForm.examinerLabel.text=Examiner: @@ -125,3 +125,4 @@ AddImageErrorsDialog.copyButton.toolTipText=Copy errors to clipboard AddImageErrorsDialog.copyButton.text=Copy AddImageErrorsDialog.closeButton.toolTipText=Close this window AddImageErrorsDialog.closeButton.text=Close +AddImageVisualPanel4.jLabel2.text=You can add another image or click Finish to return to the case and view results.