mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-16 09:47:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

3287 Fixed wait cursors with use of getGlassPane()

Browse Source
This commit is contained in:
William Schaefer 2017-12-08 16:25:28 -05:00
parent 42817363aa
commit c0861d24d9
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Core/src/org/sleuthkit/autopsy/casemodule/AddImageAction.java
View File

@ -29,6 +29,7 @@ import java.util.logging.Level;
import javax.swing.Action; import javax.swing.Action;
import javax.swing.ImageIcon; import javax.swing.ImageIcon;
import javax.swing.JButton; import javax.swing.JButton;
import javax.swing.RootPaneContainer;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
@ -56,13 +57,15 @@ import org.sleuthkit.datamodel.Image;
*/ */
@ActionID(category = "Tools", id = "org.sleuthkit.autopsy.casemodule.AddImageAction") @ActionID(category = "Tools", id = "org.sleuthkit.autopsy.casemodule.AddImageAction")
@ActionRegistration(displayName = "#CTL_AddImage", lazy = false) @ActionRegistration(displayName = "#CTL_AddImage", lazy = false)
@ActionReferences(value = {@ActionReference(path = "Toolbars/Case", position = 100)}) @ActionReferences(value = {
@ActionReference(path = "Toolbars/Case", position = 100)})
@ServiceProvider(service = AddImageAction.class) @ServiceProvider(service = AddImageAction.class)
public final class AddImageAction extends CallableSystemAction implements Presenter.Toolbar { public final class AddImageAction extends CallableSystemAction implements Presenter.Toolbar {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final Dimension SIZE = new Dimension(875, 550); private static final Dimension SIZE = new Dimension(875, 550);
private final ChangeSupport cleanupSupport = new ChangeSupport(this); private final ChangeSupport cleanupSupport = new ChangeSupport(this);
// private final static MouseAdapter mouseDisabler = new MouseAdapter() {};
// Keys into the WizardDescriptor properties that pass information between stages of the wizard // Keys into the WizardDescriptor properties that pass information between stages of the wizard
// <TYPE>: <DESCRIPTION> // <TYPE>: <DESCRIPTION>
@ -116,6 +119,9 @@ public final class AddImageAction extends CallableSystemAction implements Presen
String optionsDlgTitle = NbBundle.getMessage(this.getClass(), "AddImageAction.ingestConfig.ongoingIngest.title"); String optionsDlgTitle = NbBundle.getMessage(this.getClass(), "AddImageAction.ingestConfig.ongoingIngest.title");
String optionsDlgMessage = NbBundle.getMessage(this.getClass(), "AddImageAction.ingestConfig.ongoingIngest.msg"); String optionsDlgMessage = NbBundle.getMessage(this.getClass(), "AddImageAction.ingestConfig.ongoingIngest.msg");
if (IngestRunningCheck.checkAndConfirmProceed(optionsDlgTitle, optionsDlgMessage)) { if (IngestRunningCheck.checkAndConfirmProceed(optionsDlgTitle, optionsDlgMessage)) {
RootPaneContainer root = (RootPaneContainer) WindowManager.getDefault().getMainWindow();
root.getGlassPane().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
root.getGlassPane().setVisible(true);
WindowManager.getDefault().getMainWindow().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); WindowManager.getDefault().getMainWindow().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
iterator = new AddImageWizardIterator(this); iterator = new AddImageWizardIterator(this);
wizardDescriptor = new WizardDescriptor(iterator); wizardDescriptor = new WizardDescriptor(iterator);
@ -129,7 +135,8 @@ public final class AddImageAction extends CallableSystemAction implements Presen
dialog = DialogDisplayer.getDefault().createDialog(wizardDescriptor); dialog = DialogDisplayer.getDefault().createDialog(wizardDescriptor);
Dimension d = dialog.getSize(); Dimension d = dialog.getSize();
dialog.setSize(SIZE); dialog.setSize(SIZE);
WindowManager.getDefault().getMainWindow().setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); root.getGlassPane().setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
root.getGlassPane().setVisible(false);
dialog.setVisible(true); dialog.setVisible(true);
dialog.toFront(); dialog.toFront();

10
Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/RunIngestModulesAction.java
View File

@ -26,6 +26,7 @@ import java.util.List;
import javax.swing.AbstractAction; import javax.swing.AbstractAction;
import javax.swing.Action; import javax.swing.Action;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import javax.swing.RootPaneContainer;
import org.openide.DialogDisplayer; import org.openide.DialogDisplayer;
import org.openide.WizardDescriptor; import org.openide.WizardDescriptor;
import org.openide.util.NbBundle.Messages; import org.openide.util.NbBundle.Messages;
@ -50,6 +51,7 @@ public final class RunIngestModulesAction extends AbstractAction {
* used instead of this wizard and is retained for backwards compatibility. * used instead of this wizard and is retained for backwards compatibility.
*/ */
private static final String EXECUTION_CONTEXT = "org.sleuthkit.autopsy.ingest.RunIngestModulesDialog"; private static final String EXECUTION_CONTEXT = "org.sleuthkit.autopsy.ingest.RunIngestModulesDialog";
/** /**
* Display any warnings that the ingestJobSettings have. * Display any warnings that the ingestJobSettings have.
* *
@ -104,12 +106,15 @@ public final class RunIngestModulesAction extends AbstractAction {
* argument in the title format string will be supplied by * argument in the title format string will be supplied by
* WizardDescriptor.Panel.getComponent().getName(). * WizardDescriptor.Panel.getComponent().getName().
*/ */
WindowManager.getDefault().getMainWindow().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); RootPaneContainer root = (RootPaneContainer) WindowManager.getDefault().getMainWindow();
root.getGlassPane().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
root.getGlassPane().setVisible(true);
RunIngestModulesWizardIterator wizard = new RunIngestModulesWizardIterator(EXECUTION_CONTEXT, this.ingestType, this.dataSources); RunIngestModulesWizardIterator wizard = new RunIngestModulesWizardIterator(EXECUTION_CONTEXT, this.ingestType, this.dataSources);
WizardDescriptor wiz = new WizardDescriptor(wizard); WizardDescriptor wiz = new WizardDescriptor(wizard);
wiz.setTitleFormat(new MessageFormat("{0}")); wiz.setTitleFormat(new MessageFormat("{0}"));
wiz.setTitle(Bundle.RunIngestModulesAction_name()); wiz.setTitle(Bundle.RunIngestModulesAction_name());
WindowManager.getDefault().getMainWindow().setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); root.getGlassPane().setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
root.getGlassPane().setVisible(false);
if (DialogDisplayer.getDefault().notify(wiz) == WizardDescriptor.FINISH_OPTION) { if (DialogDisplayer.getDefault().notify(wiz) == WizardDescriptor.FINISH_OPTION) {
IngestJobSettings ingestJobSettings = wizard.getIngestJobSettings(); IngestJobSettings ingestJobSettings = wizard.getIngestJobSettings();
showWarnings(ingestJobSettings); showWarnings(ingestJobSettings);
@ -117,7 +122,6 @@ public final class RunIngestModulesAction extends AbstractAction {
} }
} }
@Override @Override
public Object clone() throws CloneNotSupportedException { public Object clone() throws CloneNotSupportedException {
throw new CloneNotSupportedException("Clone is not supported for the RunIngestModulesAction"); throw new CloneNotSupportedException("Clone is not supported for the RunIngestModulesAction");