From d87bd0d50b1ef48fb71828c7147bd333526807c3 Mon Sep 17 00:00:00 2001 From: Eugene Livis Date: Wed, 10 Aug 2016 12:33:56 -0400 Subject: [PATCH] Options window comes up and is functional --- .../autopsy/autoingest/AutoIngestDashboard.java | 7 ++++--- .../autopsy/casemodule/StartupWindow.java | 5 +++++ .../autopsy/configuration/OptionsDialog.java | 5 ++--- .../autopsy/configuration/OptionsPanel.java | 4 ++-- .../configuration/SharedConfiguration.java | 4 ++-- Core/src/org/sleuthkit/autopsy/images/frame.gif | Bin 0 -> 785 bytes .../src/org/sleuthkit/autopsy/images/frame32.gif | Bin 0 -> 2191 bytes 7 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 Core/src/org/sleuthkit/autopsy/images/frame.gif create mode 100644 Core/src/org/sleuthkit/autopsy/images/frame32.gif 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 0000000000000000000000000000000000000000..c1fc81ff1b0fb3638d963b97462ecb01afcfa42d GIT binary patch literal 785 zcmV+s1Md8ZP)OS9=&t#u6wcEuhjHww*RBPzNhN#9xlQPJ|W? z#%c9Ya`1ZewBC9MGV;)UTFwxzrNqfW;WCV>^t*(@B1Ck^ZefDd_NXz z;Dbwu%^KX`5K^m{{w)>1 zY&QEgS&I9~9k9t+EWTjJl$t6iBvBCafAsEYd@NRxSSAOt-d(ab4HkTK_kHvF4`xrp zjFA;#vc8ufU^$*4tdEb=qDs=kq*XJ(hYkSv69H`fWz#GiSlDo1kf?!BDBSQ2VbSLT zq4+mCV>+s`+>nVx%lpY3Of>Mm`s4BiIKR3jV$X0wqEz>grz!n>%I>3>Rk#TX#VNJf zfoa1_5lA;)AkUP8iG!FRKVKxl;nqdCy?z;8m7gC`neB{8=k&c7_7fQ6b0{@Q5xpyb zn!N1rqH&`bp2dT)LhPeABqWdyFMBiGySWv!Mhv5jImM7jB&Yh6#|EEJ0wG1;{d|MX z33sp}tkY_#{clW$Awk>`=Qj3$GJwP3?vN>z_*3(=2)3+7OU*FYhg8w2)~FSBi=?vc z0-^9YS)b#J#8>4i?Uh7b%4w-Q@jJOv14E{l)+$wW+w1ixGNp74CLJFI5|{f2zFdt> zwId>j=1fHM&?1=gOOb3e(?+Kkp5Rcp3QCaf&4I<81$SXtlzgEI+L2pCK(bM3Glq9f zh`M0iU^3wc7YLMERAi=yC;DtKYgEX{D<+D|;4c{-apjkUUHPSyr>LAFifM9BJM&AZ zj6jIasi=WHub560i;%98|A)xZ4<-m>AE^Xl$wiIP28}#{CgvqOE`>K(0soLn0-_Q` zDO`D>=uDKuR}eyOFce(}N7shaeYwo;H#|=o#!U5^RHcP3-5D`C{csZiX&G)PQ;e{9 z1Mrmp1fzy#W7Dfnm~zT7Jm|&RiB5P*M#2*+kErw}aM|3yJWnNzS%J^t3%?etlAubn zQmRxl_+lwus;@&JCkM*ZbYu@HLuDu%p5kF}T`OZg)XJfMk;RU|b_i)WYq^#H7(x;g+Tb zh^5j`2kHWDzmJ5E0C3i_#A>8E3c_kj7FZ%BTpl0l$BstR>oZ}sTEP>FV6eO4EiQ*9 z)r3HP5Y=PG!kkqIS+b3ZgHg}Qf+xOUv$=n(38=8GDLwMhTo3Vi7Bp5L45ZTOZ7xVi zk4SU);3qD~B!$Ws8itIVAdJ2s>V8^EZJw70k43?hW6hH?f%B;O^NPu|jnG$wPVzad zkIB4pR%sIMZ1bV*T^rh#S#WHTA5+H^A&aD=EpIsN*@aM$ptNTfkqjwEprV@0CD52W zSl19h?OaM6|ulrC6Gu_ST~7o_+SfGZrzS4jm;1!v>2bGq<1!&ArZ@v zsV9|jmI)n8-8i_|i3L+~VfE%gOst?vF(5fT6Dd{)bZHiFB?^2zCj*^JJ(1tPZG}p~ z-Nh)f*`luf5r_u4E(vpX|2e$1hYs)Vc}N|(OHtiG_(a#GNQOTEQtYvD<3^n7JdZI! zE86B-ar`Y8u5NK)(`+-@9Tz;l5CW1RLWvA~LL7kvpH8*l=v&Un{sub?8o^#h+4%AC z?v}~4L6@ z3ZKt(;3%=e)txRZu1jW23^tnu4k2beJ*39DRbH&AHAI#VH$o>D@0KVuxoWlgWvNtJ zAG5-EgUgE*9oMKe?H95A+_yM*-)4n5U?d+!4ws&C%al?KB;=rYDe0lR8&Rn}r%ainxB7^8+V@cBYuNCO9q})Ki z``#s0=I5bU%2n z>o&FV?6>&jd=K{aJfO}4y(4Pt86gLWAvk?)wS>@)HPuEmmLyX-1}SEQbl5Z9PA{xZ zp_;06IJU%r)9aiMTWWO-Z*$zqiTyu?NTpKA8J}3Pa`4Kg?bL$9?O4^;fmOfTM`aBu zWdxi}PEI!WtC;E$_QcEQ7yEE}si*hya({U5`ZK-@MVo$g%h4WC%%qQ(_O&0qJl zYWoO{UN0fnpL5vkOLDb_N>FP^O0lmq{{?!zUK3|RcC1GTIGp7(h&z5e!5)5lh#qAY z`5ldfcZtmO>|hd{TJbIN*^2||gz-me=G?~oe0Ve(O+p+q=P|8XM#^<#vV^yb^XSye zxJN{&kV$VshQYL9_7mFW)BcLt1CYrb^sh+Vjt8QES5_7U&Wq#W#@#=4{1^TiiC(MD RhkyV8002ovPDHLkV1g-WEa(6L literal 0 HcmV?d00001