From f721682d46e76c849278c38736c33d641a1f2231 Mon Sep 17 00:00:00 2001 From: sidheshenator Date: Wed, 1 Apr 2015 15:38:06 -0400 Subject: [PATCH 1/3] Cancel button disabled on report generation completion(with or without error) --- .../autopsy/report/ReportGenerationPanel.java | 2 +- .../autopsy/report/ReportProgressPanel.java | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java index e7b0ac07a4..59391b2cb2 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java @@ -88,7 +88,7 @@ import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus; void close() { boolean closeable = true; for (ReportProgressPanel panel : progressPanels) { - if (panel.getStatus() != ReportStatus.CANCELED && panel.getStatus() != ReportStatus.COMPLETE) { + if (panel.getStatus() != ReportStatus.CANCELED && panel.getStatus() != ReportStatus.COMPLETE && panel.getStatus() != ReportStatus.ERROR) { closeable = false; } } diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java index e79ba46ec3..060b34a220 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java @@ -255,9 +255,10 @@ public class ReportProgressPanel extends javax.swing.JPanel { processingLabel.setText( NbBundle.getMessage(this.getClass(), "ReportProgressPanel.complete.processLbl.text")); reportProgressBar.setValue(reportProgressBar.getMaximum()); - cancelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/report/images/report_complete.png"))); //NON-NLS + cancelButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/report/images/report_complete.png"))); //NON-NLS cancelButton.setToolTipText( NbBundle.getMessage(this.getClass(), "ReportProgressPanel.complete.cancelButton.text")); + cancelButton.setEnabled(false); break; } case ERROR: { @@ -265,9 +266,10 @@ public class ReportProgressPanel extends javax.swing.JPanel { processingLabel.setText( NbBundle.getMessage(this.getClass(), "ReportProgressPanel.complete.processLb2.text")); reportProgressBar.setValue(reportProgressBar.getMaximum()); - cancelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/report/images/report_complete_with_errors.png"))); //NON-NLS + cancelButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/report/images/report_complete_with_errors.png"))); //NON-NLS cancelButton.setToolTipText( NbBundle.getMessage(this.getClass(), "ReportProgressPanel.complete.cancelButton.text")); + cancelButton.setEnabled(false); break; } // add finer grained result codes here. @@ -299,7 +301,7 @@ public class ReportProgressPanel extends javax.swing.JPanel { setMinimumSize(new java.awt.Dimension(486, 68)); - cancelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/report/images/report_loading.png"))); // NOI18N NON-NLS + cancelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/report/images/report_loading.png"))); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(cancelButton, org.openide.util.NbBundle.getMessage(ReportProgressPanel.class, "ReportProgressPanel.cancelButton.text")); // NOI18N cancelButton.setToolTipText(org.openide.util.NbBundle.getMessage(ReportProgressPanel.class, "ReportProgressPanel.cancelButton.toolTipText")); // NOI18N cancelButton.setBorder(null); @@ -320,12 +322,12 @@ public class ReportProgressPanel extends javax.swing.JPanel { } }); - reportLabel.setFont(reportLabel.getFont().deriveFont(Font.BOLD, 11)); + reportLabel.setFont(new java.awt.Font("Tahoma", 1, 11)); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(reportLabel, org.openide.util.NbBundle.getMessage(ReportProgressPanel.class, "ReportProgressPanel.reportLabel.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(pathLabel, org.openide.util.NbBundle.getMessage(ReportProgressPanel.class, "ReportProgressPanel.pathLabel.text")); // NOI18N - processingLabel.setFont(processingLabel.getFont().deriveFont(Font.ITALIC, 10)); + processingLabel.setFont(new java.awt.Font("Tahoma", 2, 10)); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(processingLabel, org.openide.util.NbBundle.getMessage(ReportProgressPanel.class, "ReportProgressPanel.processingLabel.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(separationLabel, org.openide.util.NbBundle.getMessage(ReportProgressPanel.class, "ReportProgressPanel.separationLabel.text")); // NOI18N From 748c62091fe8f3d8918869a0da248cec060556de Mon Sep 17 00:00:00 2001 From: sidheshenator Date: Tue, 14 Apr 2015 10:57:29 -0400 Subject: [PATCH 2/3] ReportGeneration and progress panel modified for single report generation --- .../autopsy/report/Bundle.properties | 8 +- .../autopsy/report/ReportGenerationPanel.form | 15 +-- .../autopsy/report/ReportGenerationPanel.java | 67 ++++++------- .../autopsy/report/ReportProgressPanel.form | 32 +----- .../autopsy/report/ReportProgressPanel.java | 93 +++--------------- .../autopsy/report/images/report_cancel.png | Bin 877 -> 0 bytes .../report/images/report_cancel_hover.png | Bin 3679 -> 0 bytes .../autopsy/report/images/report_complete.png | Bin 634 -> 0 bytes .../images/report_complete_with_errors.png | Bin 619 -> 0 bytes 9 files changed, 57 insertions(+), 158 deletions(-) delete mode 100644 Core/src/org/sleuthkit/autopsy/report/images/report_cancel.png delete mode 100644 Core/src/org/sleuthkit/autopsy/report/images/report_cancel_hover.png delete mode 100644 Core/src/org/sleuthkit/autopsy/report/images/report_complete.png delete mode 100755 Core/src/org/sleuthkit/autopsy/report/images/report_complete_with_errors.png diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties index 2e4ae5d8f2..c7f862b1fc 100644 --- a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties @@ -11,12 +11,9 @@ ReportVisualPanel2.advancedButton.text=Data Types ArtifactSelectionDialog.deselectAllButton.text=Deselect All ArtifactSelectionDialog.selectAllButton.text=Select All ReportGenerationPanel.closeButton.text=Close -ReportGenerationPanel.cancelAllButton.text=Cancel All ReportProgressPanel.reportLabel.text=reportLabel ReportProgressPanel.pathLabel.text=pathLabel ReportProgressPanel.separationLabel.text=- -ReportProgressPanel.cancelButton.toolTipText=Queuing -ReportProgressPanel.cancelButton.text=Cancel ReportProgressPanel.processingLabel.text=processingLabel ReportGenerationPanel.titleLabel.text=Report Generation Progress ReportVisualPanel2.taggedResultsRadioButton.text=Tagged Results @@ -65,7 +62,7 @@ ReportExcel.cellVal.examiner=Examiner\: ReportExcel.cellVal.numImages=Number of Images\: ReportGenerationPanel.confDlg.sureToClose.msg=Are you sure you'd like to close the dialog?\nAll reports will be canceled. ReportGenerationPanel.confDlg.title.closing=Closing -ReportGenerationPanel.confDlg.cancelReports.msg=Are you sure you'd like to cancel all the reports? +ReportGenerationPanel.confDlg.cancelReport.msg=Are you sure you'd like to cancel the report? ReportGenerator.displayProgress.title.text=Report Generation Progress... ReportGenerator.progress.queryingDb.text=Querying database... ReportGenerator.progress.processingFile.text=Now processing {0} @@ -251,4 +248,5 @@ ReportGenerator.errList.failedQueryHashsetHits=Failed to query hashsets hits. ReportGenerator.errList.coreExceptionWhileGenRptRow=Core exception while generating row data for artifact report. ReportKML.latLongStartPoint={0};{1};;{2} (Start)\n ReportKML.latLongEndPoint={0};{1};;{2} (End)\n - +ReportGenerationPanel.cancelButton.actionCommand=Cancel +ReportGenerationPanel.cancelButton.text=Cancel diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.form b/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.form index f4c703439a..db7adcef79 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.form +++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.form @@ -32,8 +32,8 @@ - - + + @@ -56,7 +56,7 @@ - + @@ -74,14 +74,17 @@ - + - + + + + - + diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java index 59391b2cb2..49235fb5b9 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java @@ -20,8 +20,6 @@ package org.sleuthkit.autopsy.report; import java.awt.*; import java.awt.event.ActionListener; -import java.util.ArrayList; -import java.util.List; import javax.swing.Box; import javax.swing.JOptionPane; @@ -30,7 +28,7 @@ import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus; class ReportGenerationPanel extends javax.swing.JPanel { private GridBagConstraints c; - private List progressPanels; + ReportProgressPanel progressPanel; private Component glue; private ActionListener actionListener; @@ -44,7 +42,6 @@ import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus; private void customInit() { reportPanel.setLayout(new GridBagLayout()); - progressPanels = new ArrayList(); c = new GridBagConstraints(); c.fill = GridBagConstraints.BOTH; c.gridx = 0; @@ -64,12 +61,10 @@ import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus; // Remove the glue reportPanel.remove(glue); - // Add the new panel - ReportProgressPanel panel = new ReportProgressPanel(reportName, reportPath); - progressPanels.add(panel); + progressPanel = new ReportProgressPanel(reportName, reportPath); c.weighty = 0.0; c.anchor = GridBagConstraints.NORTH; - reportPanel.add(panel, c); + reportPanel.add(progressPanel, c); c.gridy++; // Add the glue back to the bottom @@ -77,9 +72,10 @@ import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus; c.anchor = GridBagConstraints.PAGE_END; reportPanel.add(glue, c); - reportPanel.setPreferredSize(new Dimension(600, progressPanels.size() * 80)); + // 80 px per progressPanel. + reportPanel.setPreferredSize(new Dimension(600, 1 * 80)); reportPanel.repaint(); - return panel; + return progressPanel; } /** @@ -87,10 +83,8 @@ import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus; */ void close() { boolean closeable = true; - for (ReportProgressPanel panel : progressPanels) { - if (panel.getStatus() != ReportStatus.CANCELED && panel.getStatus() != ReportStatus.COMPLETE && panel.getStatus() != ReportStatus.ERROR) { - closeable = false; - } + if (progressPanel.getStatus() != ReportStatus.CANCELED && progressPanel.getStatus() != ReportStatus.COMPLETE && progressPanel.getStatus() != ReportStatus.ERROR) { + closeable = false; } if (closeable) { actionListener.actionPerformed(null); @@ -102,20 +96,12 @@ import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus; "ReportGenerationPanel.confDlg.title.closing"), JOptionPane.YES_NO_OPTION); if (result == 0) { - cancelAllReports(); + progressPanel.cancel(); actionListener.actionPerformed(null); } } } - /** - * Cancel all reports. - */ - private void cancelAllReports() { - for (ReportProgressPanel panel : progressPanels) { - panel.cancel(); - } - } /** * This method is called from within the constructor to initialize the form. @@ -127,7 +113,7 @@ import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus; private void initComponents() { closeButton = new javax.swing.JButton(); - cancelAllButton = new javax.swing.JButton(); + cancelButton = new javax.swing.JButton(); reportScrollPane = new javax.swing.JScrollPane(); reportPanel = new javax.swing.JPanel(); titleLabel = new javax.swing.JLabel(); @@ -143,10 +129,11 @@ import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus; } }); - org.openide.awt.Mnemonics.setLocalizedText(cancelAllButton, org.openide.util.NbBundle.getMessage(ReportGenerationPanel.class, "ReportGenerationPanel.cancelAllButton.text")); // NOI18N - cancelAllButton.addActionListener(new java.awt.event.ActionListener() { + org.openide.awt.Mnemonics.setLocalizedText(cancelButton, org.openide.util.NbBundle.getMessage(ReportGenerationPanel.class, "ReportGenerationPanel.cancelButton.text")); // NOI18N + cancelButton.setActionCommand(org.openide.util.NbBundle.getMessage(ReportGenerationPanel.class, "ReportGenerationPanel.cancelButton.actionCommand")); // NOI18N + cancelButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { - cancelAllButtonActionPerformed(evt); + cancelButtonActionPerformed(evt); } }); @@ -168,7 +155,7 @@ import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus; reportScrollPane.setViewportView(reportPanel); - titleLabel.setFont(titleLabel.getFont().deriveFont(Font.BOLD, 11)); + titleLabel.setFont(new java.awt.Font("Tahoma", 1, 11)); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(titleLabel, org.openide.util.NbBundle.getMessage(ReportGenerationPanel.class, "ReportGenerationPanel.titleLabel.text")); // NOI18N titleSeparator.setForeground(new java.awt.Color(0, 0, 0)); @@ -189,8 +176,8 @@ import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus; .addComponent(titleLabel) .addGap(0, 522, Short.MAX_VALUE)) .addGroup(layout.createSequentialGroup() - .addGap(0, 380, Short.MAX_VALUE) - .addComponent(cancelAllButton) + .addGap(0, 546, Short.MAX_VALUE) + .addComponent(cancelButton) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(closeButton))) .addContainerGap()) @@ -209,7 +196,7 @@ import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus; .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(closeButton) - .addComponent(cancelAllButton)) + .addComponent(cancelButton)) .addContainerGap()) ); }// //GEN-END:initComponents @@ -218,23 +205,25 @@ import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus; close(); }//GEN-LAST:event_closeButtonActionPerformed - private void cancelAllButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelAllButtonActionPerformed - int result = JOptionPane.showConfirmDialog(null, NbBundle.getMessage(this.getClass(), - "ReportGenerationPanel.confDlg.cancelReports.msg"), + private void cancelButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelButtonActionPerformed + if(progressPanel.getStatus() == ReportStatus.QUEUING || progressPanel.getStatus() == ReportStatus.RUNNING) { + int result = JOptionPane.showConfirmDialog(null, NbBundle.getMessage(this.getClass(), + "ReportGenerationPanel.confDlg.cancelReport.msg"), NbBundle.getMessage(this.getClass(), - "ReportGenerationPanel.cancelAllButton.text"), - JOptionPane.YES_NO_OPTION); + "ReportGenerationPanel.cancelButton.text"), + JOptionPane.YES_NO_OPTION); if (result == 0) { - cancelAllReports(); + progressPanel.cancel(); } - }//GEN-LAST:event_cancelAllButtonActionPerformed + } + }//GEN-LAST:event_cancelButtonActionPerformed void addCloseAction(ActionListener l) { this.actionListener = l; } // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JButton cancelAllButton; + private javax.swing.JButton cancelButton; private javax.swing.JButton closeButton; private javax.swing.JSeparator optionSeparator; private javax.swing.JPanel reportPanel; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.form b/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.form index 0c673fdafc..f45e8810a7 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.form +++ b/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.form @@ -27,8 +27,7 @@ - - + @@ -46,10 +45,7 @@ - - - - + @@ -66,30 +62,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java index 060b34a220..fc8dc035fd 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java @@ -138,9 +138,6 @@ public class ReportProgressPanel extends javax.swing.JPanel { EventQueue.invokeLater(new Runnable() { @Override public void run() { - cancelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/report/images/report_cancel.png"))); //NON-NLS - cancelButton.setToolTipText( - NbBundle.getMessage(this.getClass(), "ReportProgressPanel.start.cancelButton.text")); processingLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressPanel.start.progress.text")); STATUS = ReportStatus.RUNNING; } @@ -252,24 +249,24 @@ public class ReportProgressPanel extends javax.swing.JPanel { switch (reportStatus) { case COMPLETE: { STATUS = ReportStatus.COMPLETE; + processingLabel.setForeground(Color.BLACK); processingLabel.setText( NbBundle.getMessage(this.getClass(), "ReportProgressPanel.complete.processLbl.text")); reportProgressBar.setValue(reportProgressBar.getMaximum()); - cancelButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/report/images/report_complete.png"))); //NON-NLS - cancelButton.setToolTipText( - NbBundle.getMessage(this.getClass(), "ReportProgressPanel.complete.cancelButton.text")); - cancelButton.setEnabled(false); + reportProgressBar.setStringPainted(true); + reportProgressBar.setForeground(Color.GREEN); + reportProgressBar.setString("Complete"); //NON-NLS break; } case ERROR: { STATUS = ReportStatus.ERROR; + processingLabel.setForeground(Color.RED); processingLabel.setText( NbBundle.getMessage(this.getClass(), "ReportProgressPanel.complete.processLb2.text")); reportProgressBar.setValue(reportProgressBar.getMaximum()); - cancelButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/report/images/report_complete_with_errors.png"))); //NON-NLS - cancelButton.setToolTipText( - NbBundle.getMessage(this.getClass(), "ReportProgressPanel.complete.cancelButton.text")); - cancelButton.setEnabled(false); + reportProgressBar.setStringPainted(true); + reportProgressBar.setForeground(Color.RED); + reportProgressBar.setString("Error"); //NON-NLS break; } // add finer grained result codes here. @@ -293,7 +290,6 @@ public class ReportProgressPanel extends javax.swing.JPanel { private void initComponents() { reportProgressBar = new javax.swing.JProgressBar(); - cancelButton = new javax.swing.JButton(); reportLabel = new javax.swing.JLabel(); pathLabel = new javax.swing.JLabel(); processingLabel = new javax.swing.JLabel(); @@ -301,27 +297,6 @@ public class ReportProgressPanel extends javax.swing.JPanel { setMinimumSize(new java.awt.Dimension(486, 68)); - cancelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/report/images/report_loading.png"))); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(cancelButton, org.openide.util.NbBundle.getMessage(ReportProgressPanel.class, "ReportProgressPanel.cancelButton.text")); // NOI18N - cancelButton.setToolTipText(org.openide.util.NbBundle.getMessage(ReportProgressPanel.class, "ReportProgressPanel.cancelButton.toolTipText")); // NOI18N - cancelButton.setBorder(null); - cancelButton.setBorderPainted(false); - cancelButton.setContentAreaFilled(false); - cancelButton.setFocusPainted(false); - cancelButton.addMouseListener(new java.awt.event.MouseAdapter() { - public void mouseEntered(java.awt.event.MouseEvent evt) { - cancelButtonMouseEntered(evt); - } - public void mouseExited(java.awt.event.MouseEvent evt) { - cancelButtonMouseExited(evt); - } - }); - cancelButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - cancelButtonActionPerformed(evt); - } - }); - reportLabel.setFont(new java.awt.Font("Tahoma", 1, 11)); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(reportLabel, org.openide.util.NbBundle.getMessage(ReportProgressPanel.class, "ReportProgressPanel.reportLabel.text")); // NOI18N @@ -342,8 +317,7 @@ public class ReportProgressPanel extends javax.swing.JPanel { .addComponent(processingLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(layout.createSequentialGroup() .addComponent(reportProgressBar, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(cancelButton)) + .addGap(58, 58, 58)) .addGroup(layout.createSequentialGroup() .addComponent(reportLabel) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) @@ -356,9 +330,7 @@ public class ReportProgressPanel extends javax.swing.JPanel { layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addContainerGap() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(cancelButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(reportProgressBar, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(reportProgressBar, javax.swing.GroupLayout.PREFERRED_SIZE, 16, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(reportLabel) @@ -370,10 +342,6 @@ public class ReportProgressPanel extends javax.swing.JPanel { ); }// //GEN-END:initComponents - private void cancelButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelButtonActionPerformed - cancel(); - }//GEN-LAST:event_cancelButtonActionPerformed - /** * Cancels the current report, based on it's status. If the report is * complete or has already been completed, nothing happens. @@ -384,53 +352,22 @@ public class ReportProgressPanel extends javax.swing.JPanel { break; case CANCELED: break; + case ERROR: + break; default: STATUS = ReportStatus.CANCELED; - cancelButton.setEnabled(false); - cancelButton.setToolTipText( - NbBundle.getMessage(this.getClass(), "ReportProgressPanel.cancel.cancelButton.toolTipText")); reportProgressBar.setIndeterminate(false); reportProgressBar.setValue(0); - reportProgressBar.setForeground(Color.RED); - reportProgressBar.setBackground(Color.RED); + reportProgressBar.setStringPainted(true); + reportProgressBar.setForeground(Color.red); + reportProgressBar.setString("Cancelled"); //NON-NLS processingLabel.setForeground(Color.RED); processingLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressPanel.cancel.procLbl.text")); break; } } - private void cancelButtonMouseEntered(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_cancelButtonMouseEntered - switch(STATUS) { - case COMPLETE: - break; - case CANCELED: - break; - default: - setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); - cancelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/report/images/report_cancel_hover.png"))); //NON-NLS - break; - } - }//GEN-LAST:event_cancelButtonMouseEntered - - private void cancelButtonMouseExited(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_cancelButtonMouseExited - switch(STATUS) { - case COMPLETE: - break; - case CANCELED: - break; - case QUEUING: - setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); - cancelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/report/images/report_loading.png"))); //NON-NLS - break; - case RUNNING: - setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); - cancelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/report/images/report_cancel.png"))); //NON-NLS - break; - } - }//GEN-LAST:event_cancelButtonMouseExited - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JButton cancelButton; private javax.swing.JLabel pathLabel; private javax.swing.JLabel processingLabel; private javax.swing.JLabel reportLabel; diff --git a/Core/src/org/sleuthkit/autopsy/report/images/report_cancel.png b/Core/src/org/sleuthkit/autopsy/report/images/report_cancel.png deleted file mode 100644 index 04f98945f5fea0c6cd9bf88776038e8497461e92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 877 zcmV-z1CsoSP)RhSq$RIC{~WpD?Sfi5rv zMMzPE>nJsr62vu_UfksD<7}VreE-)4ENI8R@#%d(ec$^S5#j#~|Mz0p?V`Q4W%@fi zUrDn3B^ZMk4iC~7FaB|o$HV~6+deG~2M+(}PO&8NOCe zwp~+-#h<6|-~V-Na&qt=z~J~;c~vfdFC85GFtNO>E4dt?DDQ0z5xseX)}u!qVOc*~ z4<7t9mdQi_AOU~~LmaKG-4NC4UGwHmT{aAeejnf*;2fgYgRJW?mzQ->t=>IaTe~5` z5FuyN2ZT>)^AqV3`cyc~EmXD8MCmbMySD1>yVIlwoLc5CBnx zpi%);6^WS{06^Gip#Sh8q;41T!~~MMt_k1I0@&y8KRJ+mUr3GvAq2=YKdFj{5TBet zdifG$nvgtCFrvXIf>tcPjy=y2wHl&!8;M)Dpv=r5sMitH>quO)1=TeslBj39m^ueFlaB6**)3VnEjv|0b<`rvs}Kq zm(4z}t7?3tY1A4Yr`Gs59cdcXRW;trW}i39<*Tvpk954(>%sFpG~d2u)qH;I&-wZ9 z^k>h${UVOPR)qK*03yJCB}u<^=H`CMO;0xpFJ7=|%c68T4OXdC*!udq^2h#u@-N3p z_QNodjN?>Vh{-hY836VUaJ!Op9LRESjPuYm&7e>y1S=~mA#+_9jYflQZ*NPdr>8s& zLpc^g7DSAQBmiIlNsN&!%Q5GCXc$Jkw6qi#3I+NHF(-mZk7s#q00000NkvXXu0mjf DKwg(n diff --git a/Core/src/org/sleuthkit/autopsy/report/images/report_cancel_hover.png b/Core/src/org/sleuthkit/autopsy/report/images/report_cancel_hover.png deleted file mode 100644 index 6306e466cb8e1d3811e0142c48168eae7c22283a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3679 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 Date: Thu, 16 Apr 2015 09:41:00 -0400 Subject: [PATCH 3/3] made reportProgressBar color less bright --- .../autopsy/report/ReportProgressPanel.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java index fc8dc035fd..0afef6e3b1 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java @@ -254,18 +254,20 @@ public class ReportProgressPanel extends javax.swing.JPanel { NbBundle.getMessage(this.getClass(), "ReportProgressPanel.complete.processLbl.text")); reportProgressBar.setValue(reportProgressBar.getMaximum()); reportProgressBar.setStringPainted(true); - reportProgressBar.setForeground(Color.GREEN); + // set reportProgressBar color as green. + reportProgressBar.setForeground(new Color(50,205,50)); reportProgressBar.setString("Complete"); //NON-NLS break; } case ERROR: { STATUS = ReportStatus.ERROR; - processingLabel.setForeground(Color.RED); + processingLabel.setForeground(new Color(178,34,34)); processingLabel.setText( NbBundle.getMessage(this.getClass(), "ReportProgressPanel.complete.processLb2.text")); reportProgressBar.setValue(reportProgressBar.getMaximum()); reportProgressBar.setStringPainted(true); - reportProgressBar.setForeground(Color.RED); + // set reportProgressBar color as red. + reportProgressBar.setForeground(new Color(178,34,34)); reportProgressBar.setString("Error"); //NON-NLS break; } @@ -359,9 +361,10 @@ public class ReportProgressPanel extends javax.swing.JPanel { reportProgressBar.setIndeterminate(false); reportProgressBar.setValue(0); reportProgressBar.setStringPainted(true); - reportProgressBar.setForeground(Color.red); + // set reportProgressBar color as red. + reportProgressBar.setForeground(new Color(178,34,34)); reportProgressBar.setString("Cancelled"); //NON-NLS - processingLabel.setForeground(Color.RED); + processingLabel.setForeground(new Color(178,34,34)); processingLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressPanel.cancel.procLbl.text")); break; }