From fe61ca7b521c6abed3e2e216e255191e00bc4ee9 Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Wed, 13 Feb 2013 12:46:29 -0500
Subject: [PATCH] set timeline icon

---
 .../sleuthkit/autopsy/timeline/Simile2.java   |  7 ++++--
 .../timeline/TimelineProgressDialog.java      | 23 +++++++++++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/Simile2.java b/Timeline/src/org/sleuthkit/autopsy/timeline/Simile2.java
index f85f88b8a9..fee14f5a53 100644
--- a/Timeline/src/org/sleuthkit/autopsy/timeline/Simile2.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/Simile2.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2013 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -83,6 +83,7 @@ import org.openide.util.HelpCtx;
 import org.openide.util.NbBundle;
 import org.openide.util.actions.CallableSystemAction;
 import org.openide.util.actions.Presenter;
+import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.corecomponents.DataContentPanel;
 import org.sleuthkit.autopsy.corecomponents.DataResultPanel;
@@ -155,9 +156,11 @@ public class Simile2 extends CallableSystemAction implements Presenter.Toolbar,
     }
     
     private void customize() {
-        
         //Making the main frame *
         jf = new JFrame(Case.getCurrentCase().getName() + " - Autopsy Timeline (Beta)");
+        
+        //use the same icon on jframe as main application
+        jf.setIconImage(WindowManager.getDefault().getMainWindow().getIconImage());
         jf.setSize(Width_Frame, Height_Frame); //(Width, Height)
 
         //JPanels are used as the cohesive glue that binds everything together.*/
diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.java b/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.java
index 71983d603d..833abfea15 100644
--- a/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.java
@@ -1,7 +1,22 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2013 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
+
 package org.sleuthkit.autopsy.timeline;
 
 import java.awt.event.ActionEvent;
@@ -11,6 +26,7 @@ import javax.swing.ActionMap;
 import javax.swing.InputMap;
 import javax.swing.JComponent;
 import javax.swing.KeyStroke;
+import org.openide.windows.WindowManager;
 
 /**
  *
@@ -35,6 +51,9 @@ public class TimelineProgressDialog extends javax.swing.JDialog {
         initComponents();
         
         setLocationRelativeTo(null);
+        
+        //set icon the same as main app
+        setIconImage(WindowManager.getDefault().getMainWindow().getIconImage());
 
         // Close the dialog when Esc is pressed
         String cancelName = "cancel";