diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestDashboard.java b/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestDashboard.java index 3e7f5244ff..4c9932d8bd 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestDashboard.java +++ b/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestDashboard.java @@ -56,7 +56,7 @@ import org.sleuthkit.autopsy.core.ServicesMonitor; import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil; import org.sleuthkit.autopsy.ingest.IngestManager; import org.sleuthkit.autopsy.ingest.IngestProgressSnapshotDialog; -//ELTODO import 3RDPARTY.configuration.3RDPARTYOptionsDialog; +import org.sleuthkit.autopsy.configuration.OptionsDialog; /** * A panel for monitoring automated ingest by a cluster, and for controlling @@ -527,7 +527,8 @@ public final class AutoIngestDashboard extends JPanel implements Observer { * Sets the initial state of the buttons on the panel. */ private void initButtons() { - bnOptions.setEnabled(false); + //ELTODO bnOptions.setEnabled(false); // uncomment after AIM event processing is moved over to Autopsy + bnOptions.setEnabled(true); // ELTODO remove after AIM event processing is moved over to Autopsy bnDeleteCase.setEnabled(false); enablePendingTableButtons(false); bnShowCaseLog.setEnabled(false); @@ -1556,7 +1557,7 @@ public final class AutoIngestDashboard extends JPanel implements Observer { */ private void bnOptionsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnOptionsActionPerformed setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); - //ELTODO 3RDPARTYOptionsDialog dialog = new 3RDPARTYOptionsDialog(this.getTopLevelAncestor(), true); + OptionsDialog dialog = new OptionsDialog(this.getTopLevelAncestor(), true); setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); }//GEN-LAST:event_bnOptionsActionPerformed diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindow.java b/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindow.java index 8cc3c49b53..222dd68372 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindow.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindow.java @@ -29,6 +29,7 @@ import javax.swing.JDialog; import javax.swing.JTabbedPane; import javax.swing.WindowConstants; import org.openide.LifecycleManager; +import org.openide.util.ImageUtilities; import org.openide.util.NbBundle; import org.openide.util.lookup.ServiceProvider; import org.openide.windows.WindowManager; @@ -103,11 +104,13 @@ public final class StartupWindow extends JDialog implements StartupWindowInterfa * user. */ private void addPanelForMode() { + UserPreferences.setMode(UserPreferences.SelectedMode.AUTOMATED); // ELTODO remove UserPreferences.SelectedMode mode = UserPreferences.getMode(); switch (mode) { case AUTOMATED: this.setTitle(NbBundle.getMessage(StartupWindow.class, "StartupWindow.AutoIngestMode") + " (" + LOCAL_HOST_NAME + ")"); + setIconImage(ImageUtilities.loadImage("org/sleuthkit/autopsy/images/frame.gif", false)); //NON-NLS this.addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent e) { @@ -120,11 +123,13 @@ public final class StartupWindow extends JDialog implements StartupWindowInterfa case REVIEW: this.setTitle(NbBundle.getMessage(StartupWindow.class, "StartupWindow.ReviewMode") + " (" + LOCAL_HOST_NAME + ")"); //ELTODO caseManagementPanel = new ReviewModeCasePanel(this); + setIconImage(ImageUtilities.loadImage("org/sleuthkit/autopsy/images/frame.gif", false)); //NON-NLS //ELTODO add(caseManagementPanel); break; case COPYFILES: this.setTitle(NbBundle.getMessage(StartupWindow.class, "StartupWindow.CopyAndImportMode") + " (" + LOCAL_HOST_NAME + ")"); //ELTODO caseImportPanel = new CaseImportPanel(); + setIconImage(ImageUtilities.loadImage("org/sleuthkit/autopsy/images/frame.gif", false)); //NON-NLS //ELTODO copyPane.add(NbBundle.getMessage(StartupWindow.class, "StartupWindow.CaseImportMode"), caseImportPanel); this.addWindowListener(new WindowAdapter() { @Override diff --git a/Core/src/org/sleuthkit/autopsy/configuration/OptionsDialog.java b/Core/src/org/sleuthkit/autopsy/configuration/OptionsDialog.java index 4ce41daf72..d49bd2e087 100644 --- a/Core/src/org/sleuthkit/autopsy/configuration/OptionsDialog.java +++ b/Core/src/org/sleuthkit/autopsy/configuration/OptionsDialog.java @@ -21,7 +21,6 @@ package org.sleuthkit.autopsy.configuration; import java.awt.BorderLayout; import java.awt.Container; import java.awt.Dialog; -import java.awt.Dimension; import java.awt.Cursor; import java.awt.Window; import java.awt.event.KeyEvent; @@ -37,7 +36,7 @@ import org.openide.util.ImageUtilities; public class OptionsDialog extends JDialog { private static final String TITLE = "Options"; - private static final Dimension DIMENSIONS = new Dimension(791, 763); + private static final long serialVersionUID = 1L; /** * Constructs an instance of the dialog with its own frame. Could be modal. @@ -48,7 +47,7 @@ public class OptionsDialog extends JDialog { */ public OptionsDialog(Container owner, Boolean shouldBeModal) { super((Window) owner, TITLE, Dialog.ModalityType.MODELESS); - //ELTODO setIconImage(ImageUtilities.loadImage("viking/images/viking16.gif", false)); //NON-NLS + setIconImage(ImageUtilities.loadImage("org/sleuthkit/autopsy/images/frame.gif", false)); //NON-NLS if (shouldBeModal && owner instanceof JDialog) { // if called from a modal dialog, manipulate the parent be just under this in z order, and not modal. final JDialog pseudoOwner = (JDialog) owner; addWindowListener(new WindowAdapter() { diff --git a/Core/src/org/sleuthkit/autopsy/configuration/OptionsPanel.java b/Core/src/org/sleuthkit/autopsy/configuration/OptionsPanel.java index e8a96776a9..f2dec4d374 100644 --- a/Core/src/org/sleuthkit/autopsy/configuration/OptionsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/configuration/OptionsPanel.java @@ -1514,7 +1514,7 @@ public class OptionsPanel extends javax.swing.JPanel { } }); - jLabelAimDiagram.setIcon(new javax.swing.ImageIcon(getClass().getResource("/viking/images/viking.png"))); // NOI18N + jLabelAimDiagram.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/AIM.png"))); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(jLabelAimDiagram, org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.jLabelAimDiagram.text")); // NOI18N jLabelInvalidImageFolder.setForeground(new java.awt.Color(255, 0, 0)); @@ -2193,7 +2193,7 @@ public class OptionsPanel extends javax.swing.JPanel { jScrollPane.setMinimumSize(new Dimension(100, 100)); jDialog.add(jScrollPane); jDialog.setTitle(NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.FileExportRules.text")); - //ELTODO jDialog.setIconImage(ImageUtilities.loadImage("/viking/images/viking32.gif")); + jDialog.setIconImage(ImageUtilities.loadImage("org/sleuthkit/autopsy/images/frame32.gif")); jDialog.setModalityType(java.awt.Dialog.ModalityType.APPLICATION_MODAL); jDialog.pack(); jDialog.setLocationRelativeTo(this); diff --git a/Core/src/org/sleuthkit/autopsy/configuration/SharedConfiguration.java b/Core/src/org/sleuthkit/autopsy/configuration/SharedConfiguration.java index ea5d9afd5a..d7752037e1 100644 --- a/Core/src/org/sleuthkit/autopsy/configuration/SharedConfiguration.java +++ b/Core/src/org/sleuthkit/autopsy/configuration/SharedConfiguration.java @@ -43,7 +43,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.PlatformUtil; import org.sleuthkit.autopsy.coreutils.FileUtil; import org.sleuthkit.autopsy.ingest.IngestJobSettings; -import org.sleuthkit.autopsy.keywordsearch.KeywordListsManager; +//ELTODO import org.sleuthkit.autopsy.keywordsearch.KeywordListsManager; import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager; import org.sleuthkit.datamodel.TskCoreException; import org.sleuthkit.autopsy.core.ServicesMonitor; @@ -686,7 +686,7 @@ public class SharedConfiguration { copyToLocalFolder(KEYWORD_SEARCH_NSRL_LEGACY, moduleDirPath, remoteFolder, true); copyToLocalFolder(KEYWORD_SEARCH_OPTIONS_LEGACY, moduleDirPath, remoteFolder, true); copyToLocalFolder(KEYWORD_SEARCH_SCRIPTS_LEGACY, moduleDirPath, remoteFolder, true); - KeywordListsManager.reloadKeywordLists(); +//ELTODO KeywordListsManager.reloadKeywordLists(); } /** diff --git a/Core/src/org/sleuthkit/autopsy/images/frame.gif b/Core/src/org/sleuthkit/autopsy/images/frame.gif new file mode 100644 index 0000000000..c1fc81ff1b Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/images/frame.gif differ diff --git a/Core/src/org/sleuthkit/autopsy/images/frame32.gif b/Core/src/org/sleuthkit/autopsy/images/frame32.gif new file mode 100644 index 0000000000..b77aa72faa Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/images/frame32.gif differ