diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties index aed1969445..7339a32a0a 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties @@ -45,3 +45,4 @@ DataSourceSummaryTabbedPane.noDataSourceLabel.text=No data source has been selec WhereUsedPanel.cityCountsLabel.text=Cities WhereUsedPanel.viewInGeolocationBtn.text=View In Geolocation TimelinePanel.activityRangeLabel.text=Activity Range +WhereUsedPanel.withinDistanceLabel.text=Points must be within 150 Km to be considered diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED index 6cca4f4351..7a0683673e 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED @@ -45,16 +45,13 @@ DataSourceSummaryNode.column.type.header=Type DataSourceSummaryNode.viewDataSourceAction.text=Go to Data Source DataSourceSummaryTabbedPane_analysisTab_title=Analysis DataSourceSummaryTabbedPane_detailsTab_title=Container -DataSourceSummaryTabbedPane_geolocationTab_title=Geolocation DataSourceSummaryTabbedPane_ingestHistoryTab_title=Ingest History DataSourceSummaryTabbedPane_pastCasesTab_title=Past Cases DataSourceSummaryTabbedPane_recentFileTab_title=Recent Files DataSourceSummaryTabbedPane_timelineTab_title=Timeline DataSourceSummaryTabbedPane_typesTab_title=Types DataSourceSummaryTabbedPane_userActivityTab_title=User Activity -GeolocationPanel_cityColumn_title=City -GeolocationPanel_countColumn_title=Count -GeolocationPanel_onNoCrIngest_message=No results will be shown because the GPX Parser was not run. +DataSourceSummaryTabbedPane_whereUsedTab_title=Where Used PastCasesPanel_caseColumn_title=Case PastCasesPanel_countColumn_title=Count PastCasesPanel_onNoCrIngest_message=No results will be shown because the Central Repository module was not run. @@ -106,8 +103,6 @@ RecentFilesPanel.attachmentLabel.text=Recent Attachments PastCasesPanel.notableFileLabel.text=Cases with Common Items That Were Tagged as Notable PastCasesPanel.sameIdLabel.text=Past Cases with the Same Device IDs DataSourceSummaryTabbedPane.noDataSourceLabel.text=No data source has been selected. -GeolocationPanel.cityCountsLabel.text=Cities -TimelinePanel.activityRangeLabel.text=Activity Range UserActivityPanel_noDataExists=No communication data exists UserActivityPanel_tab_title=User Activity UserActivityPanel_TopAccountTableModel_accountType_header=Account Type @@ -126,3 +121,10 @@ UserActivityPanel_TopWebSearchTableModel_dateAccessed_header=Date Accessed UserActivityPanel_TopWebSearchTableModel_searchString_header=Search String UserActivityPanel_TopWebSearchTableModel_translatedResult_header=Translated ViewSummaryInformationAction.name.text=View Summary Information +WhereUsedPanel.cityCountsLabel.text=Cities +WhereUsedPanel.viewInGeolocationBtn.text=View In Geolocation +TimelinePanel.activityRangeLabel.text=Activity Range +WhereUsedPanel.withinDistanceLabel.text=Points must be within 150 Km to be considered +WhereUsedPanel_cityColumn_title=Closest City +WhereUsedPanel_countColumn_title=Count +WhereUsedPanel_onNoCrIngest_message=No results will be shown because the GPX Parser was not run. diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/WhereUsedPanel.form b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/WhereUsedPanel.form index 1a6576d3bd..310b0563c4 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/WhereUsedPanel.form +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/WhereUsedPanel.form @@ -128,6 +128,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/WhereUsedPanel.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/WhereUsedPanel.java index cf9ae0d2f9..e05109a46f 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/WhereUsedPanel.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/WhereUsedPanel.java @@ -37,7 +37,7 @@ import org.sleuthkit.datamodel.DataSource; * A tab shown in data source summary displaying information about a data source's geolocation data. */ @Messages({ - "WhereUsedPanel_cityColumn_title=City", + "WhereUsedPanel_cityColumn_title=Closest City", "WhereUsedPanel_countColumn_title=Count", "WhereUsedPanel_onNoCrIngest_message=No results will be shown because the GPX Parser was not run." }) @@ -142,6 +142,9 @@ public class WhereUsedPanel extends BaseDataSourceSummaryPanel { javax.swing.JLabel cityCountsLabel = new javax.swing.JLabel(); javax.swing.Box.Filler filler1 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 2), new java.awt.Dimension(0, 2), new java.awt.Dimension(0, 2)); javax.swing.JPanel cityCountsPanel = cityCountsTable; + javax.swing.Box.Filler filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 2), new java.awt.Dimension(0, 2), new java.awt.Dimension(0, 2)); + javax.swing.JLabel withinDistanceLabel = new javax.swing.JLabel(); + javax.swing.Box.Filler filler3 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 10), new java.awt.Dimension(0, 10), new java.awt.Dimension(0, 10)); viewInGeolocationBtn = new javax.swing.JButton(); javax.swing.Box.Filler filler5 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 32767)); @@ -167,6 +170,15 @@ public class WhereUsedPanel extends BaseDataSourceSummaryPanel { cityCountsPanel.setPreferredSize(new java.awt.Dimension(100, 212)); mainContentPanel.add(cityCountsPanel); + filler2.setAlignmentX(0.0F); + mainContentPanel.add(filler2); + + org.openide.awt.Mnemonics.setLocalizedText(withinDistanceLabel, org.openide.util.NbBundle.getMessage(WhereUsedPanel.class, "WhereUsedPanel.withinDistanceLabel.text")); // NOI18N + mainContentPanel.add(withinDistanceLabel); + + filler3.setAlignmentX(0.0F); + mainContentPanel.add(filler3); + org.openide.awt.Mnemonics.setLocalizedText(viewInGeolocationBtn, org.openide.util.NbBundle.getMessage(WhereUsedPanel.class, "WhereUsedPanel.viewInGeolocationBtn.text")); // NOI18N mainContentPanel.add(viewInGeolocationBtn);