Merge pull request #5928 from APriestman/6299_aboutPanel

6299 Updated links on About page.
2025-07-12 16:06:15 +00:00 · 2020-06-12 11:01:38 -04:00 · 2020-06-12 11:01:38 -04:00 · 3988ab8abb
commit 3988ab8abb
parent 4eb17e49ab 9b9bf66130
4 changed files with 44 additions and 17 deletions
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowPanel.java
@ -19,12 +19,16 @@
 package org.sleuthkit.autopsy.corecomponents;

 import java.awt.Cursor;
+import java.awt.Desktop;
 import java.awt.Window;
 import java.io.File;
+import java.io.IOException;
 import java.net.MalformedURLException;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.text.MessageFormat;
 import java.util.Locale;
+import java.util.logging.Level;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
 import javax.swing.JPanel;
@ -32,10 +36,10 @@ import javax.swing.SwingUtilities;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;
 import org.netbeans.core.actions.HTMLViewAction;
-import org.openide.awt.HtmlBrowser;
 import org.openide.modules.Places;
 import org.openide.util.ImageUtilities;
 import org.openide.util.NbBundle;
+import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
 import org.sleuthkit.autopsy.coreutils.Version;
 import org.sleuthkit.datamodel.SleuthkitJNI;
@ -47,6 +51,7 @@ import org.sleuthkit.datamodel.SleuthkitJNI;
 public final class AboutWindowPanel extends JPanel implements HyperlinkListener {

    private static final long serialVersionUID = 1L;
+    private static final Logger logger = Logger.getLogger(AboutWindowPanel.class.getName());
    private URL url = null;
    private final Icon about;
    private boolean verboseLogging;
@ -67,12 +72,32 @@ public final class AboutWindowPanel extends JPanel implements HyperlinkListener
        description.setText(org.openide.util.NbBundle.getMessage(AboutWindowPanel.class,
                "LBL_Description", new Object[]{getProductVersionValue(), getJavaValue(), getVMValue(),
                    getOperatingSystemValue(), getEncodingValue(), getSystemLocaleValue(), getUserDirValue(), getSleuthKitVersionValue(), Version.getNetbeansBuild(), Version.getBuildType().toString()}));
-        description.addHyperlinkListener(this);
-        copyright.addHyperlinkListener(this);
        copyright.setBackground(getBackground());
        if (verboseLoggingIsSet()) {
            disableVerboseLoggingButton();
        }        
+	
+        AboutPanelHyperlinkListener hyperlinkListener = new AboutPanelHyperlinkListener();
+        copyright.addHyperlinkListener(hyperlinkListener);
+        description.addHyperlinkListener(hyperlinkListener);
+    }
+    
+    /**
+     * Listener to display hyperlinks in an external viewer.
+     */
+    private class AboutPanelHyperlinkListener implements HyperlinkListener {
+        @Override
+        public void hyperlinkUpdate(HyperlinkEvent e) {
+            if(e.getEventType() == HyperlinkEvent.EventType.ACTIVATED
+		    && Desktop.isDesktopSupported()) {
+                // Try to display the URL in the user's browswer. 
+		try {
+		    Desktop.getDesktop().browse(e.getURL().toURI());
+		} catch (IOException | URISyntaxException ex) {
+		    logger.log(Level.WARNING, "Failed to display URL in external viewer", ex);
+		}
+            }
+        }
    }

    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
@ -212,7 +237,14 @@ private void logoLabelMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:e
        if (url != null) {
            org.openide.awt.StatusDisplayer.getDefault().setStatusText(
                    NbBundle.getMessage(HTMLViewAction.class, "CTL_OpeningBrowser")); //NON-NLS
-            HtmlBrowser.URLDisplayer.getDefault().showURL(url);
+            // Try to display the URL in the user's browswer. 
+            if(Desktop.isDesktopSupported()) {
+                try {
+                    Desktop.getDesktop().browse(url.toURI());
+                } catch (IOException | URISyntaxException ex) {
+                   logger.log(Level.WARNING, "Failed to display URL in external viewer", ex);
+                }
+            }
        }
    }

--- a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
@ -17,7 +17,7 @@ DataContentViewerHex.pageLabel2.text=Page
 # Product Information panel
 LBL_Description=<div style=\"font-size: 12pt; font-family: Verdana, 'Verdana CE',  Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif;\">\n    <b>Product Version:</b> {0} ({9}) <br><b>Sleuth Kit Version:</b> {7} <br><b>Netbeans RCP Build:</b> {8} <br> <b>Java:</b> {1}; {2}<br> <b>System:</b> {3}; {4}; {5}<br><b>Userdir:</b> {6}</div>
 Format_OperatingSystem_Value={0} version {1} running on {2}
-LBL_Copyright=<div style\="font-size: 12pt; font-family: Verdana, 'Verdana CE',  Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif; ">Autopsy&trade; is a digital forensics platform based on The Sleuth Kit&trade; and other tools. <br><ul><li>General Information: <a style\="color: \#1E2A60;" href\="http://www.sleuthkit.org">http://www.sleuthkit.org</a>.</li><li>Training: <a style\="color: \#1E2A60;" href\="http://www.basistech.com/autopsy-training">http://www.basistech.com/autopsy-training</a></li><li>Commercial Support: <a style\="color: \#1E2A60;" href\="http://www.basistech.com/digital-forensics/autopsy/support/">http://www.basistech.com/digital-forensics/autopsy/support/</a></li></ul>Copyright &copy; 2003-2018. </div>
+LBL_Copyright=<div style\="font-size: 12pt; font-family: Verdana, 'Verdana CE',  Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif; ">Autopsy&trade; is a digital forensics platform based on The Sleuth Kit&trade; and other tools. <br><ul><li>General Information: <a style\="color: \#1E2A60;" href\="http://www.sleuthkit.org">http://www.sleuthkit.org</a>.</li><li>Training: <a style\="color: \#1E2A60;" href\="https://www.autopsy.com/support/training/">https://www.autopsy.com/support/training/</a></li><li>Support: <a style\="color: \#1E2A60;" href\="https://www.sleuthkit.org/support.php">https://www.sleuthkit.org/support.php</a></li></ul>Copyright &copy; 2003-2020. </div>
 URL_ON_IMG=http://www.sleuthkit.org/
 FILE_FOR_LOCAL_HELP=file:///
 INDEX_FOR_LOCAL_HELP=/docs/index.html
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties-MERGED
@ -17,9 +17,6 @@ CTL_DataContentTopComponent=Data Content
 CTL_CustomAboutAction=About
 CTL_OfflineHelpAction=Offline Autopsy Documentation
 CTL_OnlineHelpAction=Online Autopsy Documentation
-DataContentViewerArtifact.attrsTableHeader.sources=Source(s)
-DataContentViewerArtifact.attrsTableHeader.type=Type
-DataContentViewerArtifact.attrsTableHeader.value=Value
 DataContentViewerArtifact.failedToGetAttributes.message=Failed to get some or all attributes from case database
 DataContentViewerArtifact.failedToGetSourcePath.message=Failed to get source file path from case database
 DataContentViewerHex.copyingFile=Copying file to open in HxD...
@ -63,9 +60,9 @@ DataContentViewerHex.totalPageLabel.text_1=100
 DataContentViewerHex.pageLabel2.text=Page

 # Product Information panel
-LBL_Description=<div style="font-size: 12pt; font-family: Verdana, 'Verdana CE',  Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif;">\n    <b>Product Version:</b> {0} ({9}) <br><b>Sleuth Kit Version:</b> {7} <br><b>Netbeans RCP Build:</b> {8} <br> <b>Java:</b> {1}; {2}<br> <b>System:</b> {3}; {4}; {5}<br><b>Userdir:</b> {6}</div>
+LBL_Description=<div style=\"font-size: 12pt; font-family: Verdana, 'Verdana CE',  Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif;\">\n    <b>Product Version:</b> {0} ({9}) <br><b>Sleuth Kit Version:</b> {7} <br><b>Netbeans RCP Build:</b> {8} <br> <b>Java:</b> {1}; {2}<br> <b>System:</b> {3}; {4}; {5}<br><b>Userdir:</b> {6}</div>
 Format_OperatingSystem_Value={0} version {1} running on {2}
-LBL_Copyright=<div style="font-size: 12pt; font-family: Verdana, 'Verdana CE',  Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif; ">Autopsy&trade; is a digital forensics platform based on The Sleuth Kit&trade; and other tools. <br><ul><li>General Information: <a style="color: #1E2A60;" href="http://www.sleuthkit.org">http://www.sleuthkit.org</a>.</li><li>Training: <a style="color: #1E2A60;" href="http://www.basistech.com/autopsy-training">http://www.basistech.com/autopsy-training</a></li><li>Commercial Support: <a style="color: #1E2A60;" href="http://www.basistech.com/digital-forensics/autopsy/support/">http://www.basistech.com/digital-forensics/autopsy/support/</a></li></ul>Copyright &copy; 2003-2018. </div>
+LBL_Copyright=<div style\="font-size: 12pt; font-family: Verdana, 'Verdana CE',  Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif; ">Autopsy&trade; is a digital forensics platform based on The Sleuth Kit&trade; and other tools. <br><ul><li>General Information: <a style\="color: \#1E2A60;" href\="http://www.sleuthkit.org">http://www.sleuthkit.org</a>.</li><li>Training: <a style\="color: \#1E2A60;" href\="https://www.autopsy.com/support/training/">https://www.autopsy.com/support/training/</a></li><li>Support: <a style\="color: \#1E2A60;" href\="https://www.sleuthkit.org/support.php">https://www.sleuthkit.org/support.php</a></li></ul>Copyright &copy; 2003-2020. </div>
 SortChooser.dialogTitle=Choose Sort Criteria
 ThumbnailViewChildren.progress.cancelling=(Cancelling)
 # {0} - file name
@ -82,8 +79,6 @@ DataContentViewerArtifact.pageLabel2.text=Result
 DataContentViewerArtifact.nextPageButton.text=
 DataContentViewerArtifact.currentPageLabel.text=1
 DataContentViewerArtifact.ofLabel.text=of
-DataContentViewerArtifact.copyMenuItem.text=Copy
-DataContentViewerArtifact.selectAllMenuItem.text=Select All
 DataContentViewerArtifact.pageLabel.text=Result:
 AdvancedConfigurationDialog.applyButton.text=OK
 DataContentViewerHex.goToPageTextField.text=
@ -95,7 +90,7 @@ DataResultViewerThumbnail.pageNextButton.text=
 DataResultViewerThumbnail.imagesLabel.text=Images:
 DataResultViewerThumbnail.imagesRangeLabel.text=-
 DataResultViewerThumbnail.pageNumLabel.text=-
-DataResultViewerThumbnail.filePathLabel.text=\   
+DataResultViewerThumbnail.filePathLabel.text=\ \ \ 
 DataResultViewerThumbnail.goToPageLabel.text=Go to Page:
 DataResultViewerThumbnail.goToPageField.text=
 AdvancedConfigurationDialog.cancelButton.text=Cancel
@ -129,9 +124,9 @@ DataResultViewerThumbnail.switchPage.done.errMsg=Error making thumbnails: {0}
 AboutWindowPanel.actVerboseLogging.text=Activate verbose logging
 OptionsCategory_Name_Multi_User_Settings=Multi-User
 OptionsCategory_Keywords_Multi_User_Options=Multi-User Settings
-MultiUserSettingsPanel.lbSolrSettings.text=Solr Settings
+MultiUserSettingsPanel.lbSolrSettings.text=Solr Server Settings
 MultiUserSettingsPanel.cbEnableMultiUser.text=Enable multi-user cases
-MultiUserSettingsPanel.lbDatabaseSettings.text=Database Settings
+MultiUserSettingsPanel.lbDatabaseSettings.text=Database Server Settings
 MultiUserSettingsPanel.validationErrMsg.incomplete=Fill in all values
 MultiUserSettingsPanel.nonWindowsOs.msg=Multi-user cases are only available on Windows platforms
 MultiUserSettingsPanel.validationErrMsg.invalidDatabasePort=Invalid database port number
@ -159,7 +154,7 @@ MultiUserSettingsPanel.tbSolrHostname.toolTipText=Hostname or IP Address
 MultiUserSettingsPanel.tbSolrPort.toolTipText=Port Number
 MultiUserSettingsPanel.lbTestMessageService.text=
 MultiUserSettingsPanel.bnTestMessageService.text=Test
-MultiUserSettingsPanel.lbMessageServiceSettings.text=ActiveMQ Message Service Settings
+MultiUserSettingsPanel.lbMessageServiceSettings.text=ActiveMQ Message Server Settings
 MultiUserSettingsPanel.tbMsgPort.toolTipText=Port Number
 MultiUserSettingsPanel.tbMsgPort.text=
 MultiUserSettingsPanel.tbMsgUsername.toolTipText=User Name (optional)
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle_ja.properties
@ -65,7 +65,7 @@ DataContentViewerHex.pageLabel2.text=\u30da\u30fc\u30b8
 # \u88fd\u54c1\u60c5\u5831\u30d1\u30cd\u30eb
 LBL_Description=<div style=\"font-size: 12pt; font-family: Verdana, 'Verdana CE',  Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif;\">\n    <b>\u88fd\u54c1\u30d0\u30fc\u30b8\u30e7\u30f3:</b> {0} ({9}) <br><b>Sleuth Kit\u30d0\u30fc\u30b8\u30e7\u30f3:</b> {7} <br><b>Netbeans RCP\u30d3\u30eb\u30c9:</b> {8} <br> <b>Java:</b> {1}; {2}<br> <b>\u30b7\u30b9\u30c6\u30e0:</b> {3}; {4}; {5}<br><b>Userdir:</b> {6}</div>
 Format_OperatingSystem_Value={2} \u4e0a\u3067 {0} \u30d0\u30fc\u30b8\u30e7\u30f3 {1} \u304c\u5b9f\u884c\u4e2d\u3067\u3059
-LBL_Copyright=<div style\="font-size: 12pt; font-family: Verdana, 'Verdana CE',  Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif; ">Autopsy&trade; \u306fSleuth Kit&trade\u3068\u305d\u306e\u4ed6\u30c4\u30fc\u30eb\u3092\u30d9\u30fc\u30b9\u3068\u3057\u305f\u30c7\u30b8\u30bf\u30eb\u30d5\u30a9\u30ec\u30f3\u30b8\u30c3\u30af\u30fb\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3067\u3059\u3002<br><ul><li>\u5168\u822c\u60c5\u5831: <a style\="color: \#1E2A60;" href\="http://www.sleuthkit.org">http://www.sleuthkit.org</a>.</li><li>\u30c8\u30ec\u30fc\u30cb\u30f3\u30b0: <a style\="color: \#1E2A60;" href\="http://www.basistech.com/autopsy-training">http://www.basistech.com/autopsy-training</a></li><li>\u30b3\u30de\u30fc\u30b7\u30e3\u30eb\u30b5\u30dd\u30fc\u30c8: <a style\="color: \#1E2A60;" href\="http://www.basistech.com/digital-forensics/autopsy/support/">http://www.basistech.com/digital-forensics/autopsy/support/</a></li></ul>\u8457\u4f5c\u6a29 &copy; 2003-2018.</div>
+LBL_Copyright=<div style\="font-size: 12pt; font-family: Verdana, 'Verdana CE',  Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif; ">Autopsy&trade; \u306fSleuth Kit&trade\u3068\u305d\u306e\u4ed6\u30c4\u30fc\u30eb\u3092\u30d9\u30fc\u30b9\u3068\u3057\u305f\u30c7\u30b8\u30bf\u30eb\u30d5\u30a9\u30ec\u30f3\u30b8\u30c3\u30af\u30fb\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3067\u3059\u3002<br><ul><li>\u5168\u822c\u60c5\u5831: <a style\="color: \#1E2A60;" href\="http://www.sleuthkit.org">http://www.sleuthkit.org</a>.</li><li>\u30c8\u30ec\u30fc\u30cb\u30f3\u30b0: <a style\="color: \#1E2A60;" https://www.autopsy.com/support/training/">https://www.autopsy.com/support/training/</a></li><li>\u30b5\u30dd\u30fc\u30c8: <a style\="color: \#1E2A60;" href\="https://www.sleuthkit.org/support.php">https://www.sleuthkit.org/support.php</a></li></ul>\u8457\u4f5c\u6a29 &copy; 2003-2020.</div>
 SortChooser.dialogTitle=\u30bd\u30fc\u30c8\u6761\u4ef6\u3092\u9078\u629e
 ThumbnailViewChildren.progress.cancelling=(\u53d6\u308a\u6d88\u3057\u4e2d)
 # {0} - \u30d5\u30a1\u30a4\u30eb\u540d