diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties b/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties
index e21db15ee9..338a91cdb1 100755
--- a/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties
@@ -35,4 +35,5 @@ GeolocationSettingsPanel.zipFileBrowseBnt.text=Browse
GeolocationSettingsPanel.mbtileTestBtn.text=Test
GeolocationTopComponent.reportButton.text=KML Report
GeolocationTopComponent.coordLabel.text=
-
+MapPanel.zoomInBtn.text=
+MapPanel.zoomOutBtn.text=
diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties-MERGED
index 1fbba07220..dc18db59e9 100755
--- a/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties-MERGED
@@ -11,7 +11,7 @@ GeolocationSettings_mbtile_test_success_message=The supplied file is a valid mbt
GeolocationSettings_mbtile_test_success_title=Success
GeolocationSettings_path_not_valid_message=The supplied file path is empty.\nPlease supply a valid file path.
GeolocationSettings_path_not_valid_title=File Not Valid
-GeolocationSettingsPanel_malformed_url_message=The supplies OSM tile server address is invalid.\nPlease supply a well formed url prefixed with http://
+GeolocationSettingsPanel_malformed_url_message=The supplied OSM tile server address is invalid.\nPlease supply a well formed url prefixed with http://
GeolocationSettingsPanel_malformed_url_message_tile=Malformed URL
GeolocationSettingsPanel_osm_server_test_fail_message=OSM tile server test failed.\nUnable to connect to server.
GeolocationSettingsPanel_osm_server_test_fail_message_title=Error
@@ -24,16 +24,16 @@ GeolocationTC_KML_report_title=KML Report
GeolocationTC_report_progress_title=KML Report Progress
GeoTopComponent_filer_data_invalid_msg=Unable to run waypoint filter.\nPlease select one or more data sources.
GeoTopComponent_filer_data_invalid_Title=Filter Failure
-GeoTopComponent_filter_exception_msg=Exception occured during waypoint filtering.
+GeoTopComponent_filter_exception_msg=Exception occurred during waypoint filtering.
GeoTopComponent_filter_exception_Title=Filter Failure
GeoTopComponent_no_waypoints_returned_mgs=Applied filter failed to find waypoints that matched criteria.\nRevise filter options and try again.
GeoTopComponent_no_waypoints_returned_Title=No Waypoints Found
-GLTopComponent_initilzation_error=An error occurred during waypoint initilization. Geolocation data maybe incomplete.
+GLTopComponent_initilzation_error=An error occurred during waypoint initialization, Geolocation data maybe incomplete.
GLTopComponent_name=Geolocation
HidingPane_default_title=Filters
MapPanel_connection_failure_message=Failed to connect to new geolocation map tile source.
MapPanel_connection_failure_message_title=Connection Failure
-MayWaypoint_ExternalViewer_label=Open in ExternalViewer
+MayWaypoint_ExternalViewer_label=Open in External Viewer
OpenGeolocationAction_displayName=Geolocation
OpenGeolocationAction_name=Geolocation
RefreshPanel.refreshLabel.text=The geolocation data has been updated, the visualization may be out of date.
@@ -70,5 +70,6 @@ GeolocationSettingsPanel.zipFileBrowseBnt.text=Browse
GeolocationSettingsPanel.mbtileTestBtn.text=Test
GeolocationTopComponent.reportButton.text=KML Report
GeolocationTopComponent.coordLabel.text=
-
+MapPanel.zoomInBtn.text=
+MapPanel.zoomOutBtn.text=
WaypointExtractAction_label=Extract Files(s)
diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/MapPanel.form b/Core/src/org/sleuthkit/autopsy/geolocation/MapPanel.form
index bea654be40..aa2abc9c2d 100755
--- a/Core/src/org/sleuthkit/autopsy/geolocation/MapPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/geolocation/MapPanel.form
@@ -14,7 +14,7 @@
-
+
@@ -46,26 +46,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -86,6 +67,61 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/MapPanel.java b/Core/src/org/sleuthkit/autopsy/geolocation/MapPanel.java
index 7645662e28..32e9bda1f6 100755
--- a/Core/src/org/sleuthkit/autopsy/geolocation/MapPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/geolocation/MapPanel.java
@@ -548,6 +548,8 @@ final public class MapPanel extends javax.swing.JPanel {
mapViewer = new org.jxmapviewer.JXMapViewer();
zoomPanel = new javax.swing.JPanel();
zoomSlider = new javax.swing.JSlider();
+ zoomInBtn = new javax.swing.JButton();
+ zoomOutBtn = new javax.swing.JButton();
setFocusable(false);
setLayout(new java.awt.BorderLayout());
@@ -573,6 +575,7 @@ final public class MapPanel extends javax.swing.JPanel {
zoomPanel.setFocusable(false);
zoomPanel.setOpaque(false);
zoomPanel.setRequestFocusEnabled(false);
+ zoomPanel.setLayout(new java.awt.GridBagLayout());
zoomSlider.setMaximum(15);
zoomSlider.setMinimum(10);
@@ -588,23 +591,44 @@ final public class MapPanel extends javax.swing.JPanel {
zoomSliderStateChanged(evt);
}
});
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 1;
+ zoomPanel.add(zoomSlider, gridBagConstraints);
- javax.swing.GroupLayout zoomPanelLayout = new javax.swing.GroupLayout(zoomPanel);
- zoomPanel.setLayout(zoomPanelLayout);
- zoomPanelLayout.setHorizontalGroup(
- zoomPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(zoomPanelLayout.createSequentialGroup()
- .addGap(0, 0, 0)
- .addComponent(zoomSlider, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- );
- zoomPanelLayout.setVerticalGroup(
- zoomPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, zoomPanelLayout.createSequentialGroup()
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(zoomSlider, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGap(0, 0, 0))
- );
+ zoomInBtn.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/plus-grey.png"))); // NOI18N
+ org.openide.awt.Mnemonics.setLocalizedText(zoomInBtn, org.openide.util.NbBundle.getMessage(MapPanel.class, "MapPanel.zoomInBtn.text")); // NOI18N
+ zoomInBtn.setBorder(null);
+ zoomInBtn.setBorderPainted(false);
+ zoomInBtn.setFocusPainted(false);
+ zoomInBtn.setRequestFocusEnabled(false);
+ zoomInBtn.setRolloverEnabled(false);
+ zoomInBtn.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ zoomInBtnActionPerformed(evt);
+ }
+ });
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 0;
+ zoomPanel.add(zoomInBtn, gridBagConstraints);
+
+ zoomOutBtn.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/minus-grey.png"))); // NOI18N
+ org.openide.awt.Mnemonics.setLocalizedText(zoomOutBtn, org.openide.util.NbBundle.getMessage(MapPanel.class, "MapPanel.zoomOutBtn.text")); // NOI18N
+ zoomOutBtn.setBorder(null);
+ zoomOutBtn.setBorderPainted(false);
+ zoomOutBtn.setFocusPainted(false);
+ zoomOutBtn.setRequestFocusEnabled(false);
+ zoomOutBtn.setRolloverEnabled(false);
+ zoomOutBtn.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ zoomOutBtnActionPerformed(evt);
+ }
+ });
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 2;
+ zoomPanel.add(zoomOutBtn, gridBagConstraints);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.anchor = java.awt.GridBagConstraints.SOUTHWEST;
@@ -652,9 +676,21 @@ final public class MapPanel extends javax.swing.JPanel {
}
}//GEN-LAST:event_mapViewerMouseClicked
+ private void zoomInBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_zoomInBtnActionPerformed
+ int currentValue = mapViewer.getZoom();
+ setZoom(currentValue-1);
+ }//GEN-LAST:event_zoomInBtnActionPerformed
+
+ private void zoomOutBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_zoomOutBtnActionPerformed
+ int currentValue = mapViewer.getZoom();
+ setZoom(currentValue+1);
+ }//GEN-LAST:event_zoomOutBtnActionPerformed
+
// Variables declaration - do not modify//GEN-BEGIN:variables
private org.jxmapviewer.JXMapViewer mapViewer;
+ private javax.swing.JButton zoomInBtn;
+ private javax.swing.JButton zoomOutBtn;
private javax.swing.JPanel zoomPanel;
private javax.swing.JSlider zoomSlider;
// End of variables declaration//GEN-END:variables
diff --git a/Core/src/org/sleuthkit/autopsy/images/minus-grey.png b/Core/src/org/sleuthkit/autopsy/images/minus-grey.png
new file mode 100755
index 0000000000..f30347473e
Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/images/minus-grey.png differ
diff --git a/Core/src/org/sleuthkit/autopsy/images/plus-grey.png b/Core/src/org/sleuthkit/autopsy/images/plus-grey.png
new file mode 100755
index 0000000000..52264ca1d5
Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/images/plus-grey.png differ