diff --git a/Case/src/org/sleuthkit/autopsy/casemodule/Autopsy_logo.gif b/Case/src/org/sleuthkit/autopsy/casemodule/Autopsy_logo.gif deleted file mode 100644 index 42cc503314..0000000000 Binary files a/Case/src/org/sleuthkit/autopsy/casemodule/Autopsy_logo.gif and /dev/null differ diff --git a/Case/src/org/sleuthkit/autopsy/casemodule/Case.java b/Case/src/org/sleuthkit/autopsy/casemodule/Case.java index 3eff80cf11..6ebacbf2ce 100755 --- a/Case/src/org/sleuthkit/autopsy/casemodule/Case.java +++ b/Case/src/org/sleuthkit/autopsy/casemodule/Case.java @@ -45,6 +45,7 @@ import org.openide.util.actions.SystemAction; import org.openide.windows.WindowManager; import org.sleuthkit.autopsy.corecomponentinterfaces.CoreComponentControl; import org.sleuthkit.autopsy.coreutils.Log; +import org.sleuthkit.autopsy.coreutils.Version; import org.sleuthkit.datamodel.*; import org.sleuthkit.datamodel.SleuthkitJNI.CaseDbHandle.AddImageProcess; @@ -52,10 +53,9 @@ import org.sleuthkit.datamodel.SleuthkitJNI.CaseDbHandle.AddImageProcess; * Class to store the case information */ public class Case { - // change the CTL_MainWindow_Title in Bundle.properties as well if you change this value - private static final String autopsyVer = "3.0.0b2"; // current version of autopsy. Change it when the version is changed - private static final String appName = "Autopsy " + autopsyVer; + private static final String autopsyVer = Version.getVersion(); // current version of autopsy. Change it when the version is changed + private static final String appName = Version.getName() + " " + autopsyVer; /** * Property name that indicates the name of the current case has changed. * Fired with the case is renamed, and when the current case is diff --git a/Case/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.form b/Case/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.form index cc47a67c48..ef800ab9f0 100644 --- a/Case/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.form +++ b/Case/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.form @@ -18,13 +18,11 @@ - - - - - - - + @@ -35,12 +33,14 @@ - - + - - - + @@ -53,133 +53,72 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - - - - - - - - - - + + + - - + + - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - @@ -278,5 +217,18 @@ + + + + + + + + + + + + + diff --git a/Case/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java b/Case/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java index 2c6bcbc155..481b4fdeb4 100644 --- a/Case/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java +++ b/Case/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java @@ -27,6 +27,7 @@ import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JPanel; import org.openide.util.Lookup; +import org.sleuthkit.autopsy.coreutils.Version; /** * @@ -57,50 +58,18 @@ public class CueBannerPanel extends javax.swing.JPanel { private void initComponents() { closeButton = new javax.swing.JButton(); - logoPanel = new javax.swing.JPanel(); - autopsyLogo = new javax.swing.JLabel(); - this.autopsyLogo.setText(""); editorPanel = new javax.swing.JPanel(); - welcomeLabel = new javax.swing.JLabel(); - autopsyLabel = new javax.swing.JLabel(); - this.autopsyLabel.setText(Case.getAppName()); newCaseButton = new javax.swing.JButton(); openCaseButton = new javax.swing.JButton(); openRecentButton = new javax.swing.JButton(); createNewLabel = new javax.swing.JLabel(); openLabel = new javax.swing.JLabel(); openRecentLabel = new javax.swing.JLabel(); + autopsyLogo = new javax.swing.JLabel(); + this.autopsyLogo.setText(""); closeButton.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.closeButton.text")); // NOI18N - logoPanel.setBackground(new java.awt.Color(255, 255, 255)); - - autopsyLogo.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/casemodule/Autopsy_logo.gif"))); // NOI18N - autopsyLogo.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.autopsyLogo.text")); // NOI18N - - javax.swing.GroupLayout logoPanelLayout = new javax.swing.GroupLayout(logoPanel); - logoPanel.setLayout(logoPanelLayout); - logoPanelLayout.setHorizontalGroup( - logoPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(logoPanelLayout.createSequentialGroup() - .addContainerGap(13, Short.MAX_VALUE) - .addComponent(autopsyLogo) - .addContainerGap()) - ); - logoPanelLayout.setVerticalGroup( - logoPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(logoPanelLayout.createSequentialGroup() - .addGap(55, 55, 55) - .addComponent(autopsyLogo) - .addContainerGap(131, Short.MAX_VALUE)) - ); - - welcomeLabel.setFont(new java.awt.Font("Tahoma", 1, 18)); - welcomeLabel.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.welcomeLabel.text")); // NOI18N - - autopsyLabel.setFont(new java.awt.Font("Tahoma", 1, 32)); - autopsyLabel.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.autopsyLabel.text")); // NOI18N - newCaseButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/casemodule/btn_icon_create_new_case.png"))); // NOI18N newCaseButton.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.newCaseButton.text")); // NOI18N newCaseButton.setBorder(null); @@ -152,61 +121,62 @@ public class CueBannerPanel extends javax.swing.JPanel { editorPanelLayout.setHorizontalGroup( editorPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(editorPanelLayout.createSequentialGroup() - .addContainerGap() .addGroup(editorPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(welcomeLabel) - .addComponent(autopsyLabel) .addGroup(editorPanelLayout.createSequentialGroup() - .addGap(19, 19, 19) - .addGroup(editorPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(openCaseButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(newCaseButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(openRecentButton, javax.swing.GroupLayout.PREFERRED_SIZE, 70, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGap(18, 18, 18) - .addGroup(editorPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(openLabel) - .addComponent(createNewLabel) - .addComponent(openRecentLabel)))) - .addContainerGap(124, Short.MAX_VALUE)) + .addComponent(newCaseButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(createNewLabel)) + .addGroup(editorPanelLayout.createSequentialGroup() + .addComponent(openCaseButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(openLabel)) + .addGroup(editorPanelLayout.createSequentialGroup() + .addComponent(openRecentButton, javax.swing.GroupLayout.PREFERRED_SIZE, 70, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(openRecentLabel))) + .addContainerGap(60, Short.MAX_VALUE)) ); editorPanelLayout.setVerticalGroup( editorPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(editorPanelLayout.createSequentialGroup() - .addContainerGap() - .addComponent(welcomeLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(autopsyLabel) .addGroup(editorPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(editorPanelLayout.createSequentialGroup() - .addGap(18, 18, 18) - .addComponent(newCaseButton, javax.swing.GroupLayout.PREFERRED_SIZE, 68, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(18, 18, 18) - .addComponent(openCaseButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(18, 18, 18) - .addComponent(openRecentButton, javax.swing.GroupLayout.PREFERRED_SIZE, 67, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(17, 17, 17)) + .addGap(32, 32, 32) + .addComponent(newCaseButton, javax.swing.GroupLayout.PREFERRED_SIZE, 56, javax.swing.GroupLayout.PREFERRED_SIZE)) .addGroup(editorPanelLayout.createSequentialGroup() - .addGap(41, 41, 41) - .addComponent(createNewLabel) - .addGap(72, 72, 72) - .addComponent(openLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 70, Short.MAX_VALUE) - .addComponent(openRecentLabel) - .addGap(45, 45, 45)))) + .addGap(50, 50, 50) + .addComponent(createNewLabel))) + .addGroup(editorPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(editorPanelLayout.createSequentialGroup() + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(openCaseButton, javax.swing.GroupLayout.PREFERRED_SIZE, 58, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(editorPanelLayout.createSequentialGroup() + .addGap(31, 31, 31) + .addComponent(openLabel))) + .addGroup(editorPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(editorPanelLayout.createSequentialGroup() + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(openRecentButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(editorPanelLayout.createSequentialGroup() + .addGap(32, 32, 32) + .addComponent(openRecentLabel))) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); + autopsyLogo.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/casemodule/welcome_logo.png"))); // NOI18N + autopsyLogo.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.autopsyLogo.text")); // NOI18N + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addContainerGap() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(closeButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 73, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGroup(layout.createSequentialGroup() - .addComponent(logoPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(editorPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) + .addComponent(autopsyLogo) + .addGap(29, 29, 29) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(editorPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(closeButton, javax.swing.GroupLayout.PREFERRED_SIZE, 73, javax.swing.GroupLayout.PREFERRED_SIZE)) .addContainerGap()) ); layout.setVerticalGroup( @@ -214,11 +184,12 @@ public class CueBannerPanel extends javax.swing.JPanel { .addGroup(layout.createSequentialGroup() .addContainerGap() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(editorPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(logoPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addGap(20, 20, 20) - .addComponent(closeButton) - .addContainerGap()) + .addComponent(autopsyLogo, javax.swing.GroupLayout.PREFERRED_SIZE, 257, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(layout.createSequentialGroup() + .addComponent(editorPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(closeButton))) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); }// //GEN-END:initComponents @@ -262,18 +233,15 @@ public class CueBannerPanel extends javax.swing.JPanel { // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JLabel autopsyLabel; private javax.swing.JLabel autopsyLogo; private javax.swing.JButton closeButton; private javax.swing.JLabel createNewLabel; private javax.swing.JPanel editorPanel; - private javax.swing.JPanel logoPanel; private javax.swing.JButton newCaseButton; private javax.swing.JButton openCaseButton; private javax.swing.JLabel openLabel; private javax.swing.JButton openRecentButton; private javax.swing.JLabel openRecentLabel; - private javax.swing.JLabel welcomeLabel; // End of variables declaration//GEN-END:variables /** diff --git a/Case/src/org/sleuthkit/autopsy/casemodule/welcome_logo.png b/Case/src/org/sleuthkit/autopsy/casemodule/welcome_logo.png new file mode 100644 index 0000000000..e7a17e0815 Binary files /dev/null and b/Case/src/org/sleuthkit/autopsy/casemodule/welcome_logo.png differ diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/Installer.java b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/Installer.java index c50f296ac5..1f460b700e 100644 --- a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/Installer.java +++ b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/Installer.java @@ -38,8 +38,6 @@ public class Installer extends ModuleInstall { @Override public void restored() { - //TODO: the version number shouldn't really be stored in the Case class - System.setProperty("netbeans.buildnumber", Case.getAutopsyVersion()); WindowManager.getDefault().invokeWhenUIReady(new Runnable() { diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.form b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.form index 22a4af6f58..3c60a2c0ca 100644 --- a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.form +++ b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.form @@ -1,6 +1,11 @@ - +
+ + + + + @@ -68,13 +73,18 @@ + + + + + - - + + @@ -140,6 +150,9 @@ + + + diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java index 765575a021..08de451df7 100644 --- a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java +++ b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java @@ -75,6 +75,8 @@ class ProductInformationPanel extends JPanel implements HyperlinkListener { description = new javax.swing.JTextPane(); verboseLoggingButton = new javax.swing.JButton(); + setBackground(new java.awt.Color(255, 255, 255)); + jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); jLabel1.setIcon(about); jLabel1.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); @@ -84,9 +86,10 @@ class ProductInformationPanel extends JPanel implements HyperlinkListener { } }); + jPanel1.setBackground(new java.awt.Color(255, 255, 255)); jPanel1.setLayout(new java.awt.GridBagLayout()); - jButton2.setMnemonic(NbBundle.getMessage(ProductInformationPanel.class, "MNE_Close").charAt(0)); + jButton2.setBackground(new java.awt.Color(255, 255, 255)); jButton2.setText(NbBundle.getMessage(ProductInformationPanel.class, "LBL_Close")); // NOI18N jButton2.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -115,6 +118,7 @@ class ProductInformationPanel extends JPanel implements HyperlinkListener { description.setEditable(false); jScrollPane2.setViewportView(description); + verboseLoggingButton.setBackground(new java.awt.Color(255, 255, 255)); verboseLoggingButton.setText("Activate verbose logging"); verboseLoggingButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { diff --git a/CoreUtils/src/org/sleuthkit/autopsy/coreutils/Version.java b/CoreUtils/src/org/sleuthkit/autopsy/coreutils/Version.java new file mode 100644 index 0000000000..c1b23c10db --- /dev/null +++ b/CoreUtils/src/org/sleuthkit/autopsy/coreutils/Version.java @@ -0,0 +1,46 @@ +/* + * Autopsy Forensic Browser + * + * Copyright 2011 Basis Technology Corp. + * Contact: carrier sleuthkit 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.coreutils; + +import org.openide.util.NbBundle; + +/** + * + * @author dfickling + */ +public class Version { + + private Version() { } + + public enum Type{ + RELEASE, DEBUG; + } + + public static String getVersion() { + return NbBundle.getMessage(Version.class, "app.version"); + } + + public static String getName() { + return NbBundle.getMessage(Version.class, "app.name"); + } + + public static Version.Type getBuildType() { + return Type.valueOf(NbBundle.getMessage(Version.class, "build.type")); + } +} diff --git a/branding_autopsy/welcome_logo.png b/branding_autopsy/welcome_logo.png new file mode 100644 index 0000000000..e7a17e0815 Binary files /dev/null and b/branding_autopsy/welcome_logo.png differ diff --git a/build.xml b/build.xml index 921d233cd5..fa6c4d7c13 100644 --- a/build.xml +++ b/build.xml @@ -31,6 +31,15 @@ TSK_HOME: ${env.TSK_HOME} + + + + + + + + + @@ -66,17 +75,33 @@ - + - - - - + + + + + + + + + + + + + + + + + Suite in ${basedir} with clusters ${cluster.path.final}, build cluster ${cluster}, and sorted modules ${modules.sorted} @@ -84,7 +109,11 @@ - + + + + + @@ -96,7 +125,38 @@ - + + + + + + + ${app.name} branding + + + + + + + + + + + + + + + + + + + @@ -107,4 +167,13 @@ + + + + + + + + + diff --git a/nbproject/project.properties b/nbproject/project.properties index 5e919fcd1e..934cf16425 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,7 +1,13 @@ app.icon=branding/core/core.jar/org/netbeans/core/startup/frame48.gif -app.name=autopsy +### Title of the application app.title=Autopsy -app.version=3.0.0b2 +### lowercase version of above +app.name=autopsy +### if left unset, version will default to today's date +#app.version=3.0.0b2 +### Build type isn't used at this point, but it may be useful +### Must be one of: DEBUG, RELEASE +build.type=DEBUG auxiliary.org-netbeans-modules-apisupport-installer.license-type=apache.v2 auxiliary.org-netbeans-modules-apisupport-installer.os-linux=false auxiliary.org-netbeans-modules-apisupport-installer.os-macosx=false @@ -37,4 +43,4 @@ project.org.sleuthkit.autopsy.keywordsearch=KeywordSearch project.org.sleuthkit.autopsy.menuactions=MenuActions project.org.sleuthkit.autopsy.datamodel=DataModel project.org.sleuthkit.autopsy.recentactivity=RecentActivity -project.org.sleuthkit.autopsy.report=Report +project.org.sleuthkit.autopsy.report=Report \ No newline at end of file diff --git a/thirdparty/gstreamer/windows.zip b/thirdparty/gstreamer/windows.zip new file mode 100644 index 0000000000..eb8995abbf Binary files /dev/null and b/thirdparty/gstreamer/windows.zip differ