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

5369 add wait cursor fix reset of instances list

Browse Source
This commit is contained in:
William Schaefer 2019-08-27 17:06:58 -04:00
parent f4708ab2fc
commit 6b39e0e22c
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.java
View File

@ -18,6 +18,7 @@
*/ */
package org.sleuthkit.autopsy.filequery; package org.sleuthkit.autopsy.filequery;
import java.awt.Cursor;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.awt.event.ItemEvent; import java.awt.event.ItemEvent;
@ -35,6 +36,7 @@ import javax.swing.JList;
import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener; import javax.swing.event.ListSelectionListener;
import org.openide.util.NbBundle; import org.openide.util.NbBundle;
import org.openide.windows.WindowManager;
import org.sleuthkit.autopsy.centralrepository.datamodel.EamDb; import org.sleuthkit.autopsy.centralrepository.datamodel.EamDb;
import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.filequery.FileSearch.GroupingAttributeType; import org.sleuthkit.autopsy.filequery.FileSearch.GroupingAttributeType;
@ -1170,6 +1172,7 @@ final class FileSearchPanel extends javax.swing.JPanel implements ActionListener
private void searchButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_searchButtonActionPerformed private void searchButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_searchButtonActionPerformed
searchButton.setEnabled(false); searchButton.setEnabled(false);
WindowManager.getDefault().getMainWindow().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
FileType searchType = fileTypeComboBox.getItemAt(fileTypeComboBox.getSelectedIndex()); FileType searchType = fileTypeComboBox.getItemAt(fileTypeComboBox.getSelectedIndex());
DiscoveryEvents.getDiscoveryEventBus().post(new DiscoveryEvents.SearchStartedEvent(searchType)); DiscoveryEvents.getDiscoveryEventBus().post(new DiscoveryEvents.SearchStartedEvent(searchType));
// For testing, allow the user to run different searches in loop // For testing, allow the user to run different searches in loop

3
Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.java
View File

@ -89,7 +89,7 @@ public class ResultsPanel extends javax.swing.JPanel {
instancesList.addListSelectionListener(listener); instancesList.addListSelectionListener(listener);
} }
private synchronized void populateInstancesList() { synchronized void populateInstancesList() {
SwingUtilities.invokeLater(() -> { SwingUtilities.invokeLater(() -> {
instancesListModel.removeAllElements(); instancesListModel.removeAllElements();
for (AbstractFile file : getInstancesForSelected()) { for (AbstractFile file : getInstancesForSelected()) {
@ -124,6 +124,7 @@ public class ResultsPanel extends javax.swing.JPanel {
@Subscribe @Subscribe
void handlePageRetrievedEvent(DiscoveryEvents.PageRetrievedEvent pageRetrievedEvent) { void handlePageRetrievedEvent(DiscoveryEvents.PageRetrievedEvent pageRetrievedEvent) {
SwingUtilities.invokeLater(() -> { SwingUtilities.invokeLater(() -> {
populateInstancesList();
currentPage = pageRetrievedEvent.getPageNumber(); currentPage = pageRetrievedEvent.getPageNumber();
updateControls(); updateControls();
thumbnailViewer.resetComponent(); thumbnailViewer.resetComponent();

3
Core/src/org/sleuthkit/autopsy/filequery/SearchWorker.java
View File

@ -18,11 +18,13 @@
*/ */
package org.sleuthkit.autopsy.filequery; package org.sleuthkit.autopsy.filequery;
import java.awt.Cursor;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import javax.swing.JButton; import javax.swing.JButton;
import javax.swing.SwingWorker; import javax.swing.SwingWorker;
import java.util.List; import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
import org.openide.windows.WindowManager;
import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.centralrepository.datamodel.EamDb; import org.sleuthkit.autopsy.centralrepository.datamodel.EamDb;
import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.Logger;
@ -83,5 +85,6 @@ final class SearchWorker extends SwingWorker<Void, Void> {
if (searchButtonToEnable != null) { if (searchButtonToEnable != null) {
searchButtonToEnable.setEnabled(true); searchButtonToEnable.setEnabled(true);
} }
WindowManager.getDefault().getMainWindow().setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR_CURSOR));
} }
} }