Version 18.4, April 2016

[GpsPrune.git] / tim / prune / save / GpsSaver.java

diff --git a/tim/prune/save/GpsSaver.java b/tim/prune/save/GpsSaver.java
index 944a7e4e4f1ff4780263d2a3ec58f80245caa5d6..3fa66c3096146e7fb57389e6816749e61eead45c 100644 (file)
--- a/tim/prune/save/GpsSaver.java
+++ b/tim/prune/save/GpsSaver.java
@@ -6,6 +6,8 @@ import java.awt.FlowLayout;
 import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
@@ -40,6 +42,7 @@ public class GpsSaver extends GenericFunction implements Runnable
        private JTextField _deviceField = null, _formatField = null;
        private JTextField _trackNameField = null;
        private JCheckBox _waypointCheckbox = null, _trackCheckbox = null;
+       private boolean _switchedWaypointsOff = false, _switchedTrackpointsOff = false;
        private JButton _okButton = null;
        private JProgressBar _progressBar = null;
        private boolean _cancelled = false;
@@ -82,8 +85,10 @@ public class GpsSaver extends GenericFunction implements Runnable
                                _dialog.pack();
                        }
                        // Initialise progress bars, buttons
+                       enableCheckboxes();
                        enableOkButton();
                        setupProgressBar(true);
+                       _trackNameField.requestFocus();
                        _dialog.setVisible(true);
                }
        }
@@ -121,6 +126,19 @@ public class GpsSaver extends GenericFunction implements Runnable
                gridPanel.setAlignmentX(Component.CENTER_ALIGNMENT);
                gridPanel.setBorder(BorderFactory.createEmptyBorder(10, 5, 5, 20));
                mainPanel.add(gridPanel);
+               // close dialog when escape pressed
+               KeyAdapter closer = new KeyAdapter() {
+                       public void keyReleased(KeyEvent e)
+                       {
+                               // close dialog if escape pressed
+                               if (e.getKeyCode() == KeyEvent.VK_ESCAPE) {
+                                       _dialog.dispose();
+                               }
+                       }
+               };
+               _deviceField.addKeyListener(closer);
+               _formatField.addKeyListener(closer);
+               _trackNameField.addKeyListener(closer);
 
                // checkboxes
                ChangeListener checkboxListener = new ChangeListener() {
@@ -182,6 +200,42 @@ public class GpsSaver extends GenericFunction implements Runnable
                _progressBar.setValue(0);
        }
 
+       /**
+        * Enable or disable the waypoints and trackpoints checkboxes
+        */
+       private void enableCheckboxes()
+       {
+               // Enable or disable waypoints checkbox depending on whether data is available
+               if (_waypointCheckbox.isSelected())
+               {
+                       if (!_app.getTrackInfo().getTrack().hasWaypoints())
+                       {
+                               _waypointCheckbox.setSelected(false);
+                               _switchedWaypointsOff = true;
+                       }
+                       else _switchedWaypointsOff = false;
+               }
+               else if (_app.getTrackInfo().getTrack().hasWaypoints() && _switchedWaypointsOff)
+               {
+                       _waypointCheckbox.setSelected(true);
+                       _switchedWaypointsOff = false;
+               }
+               // ... and the same for track points
+               if (_trackCheckbox.isSelected())
+               {
+                       if (!_app.getTrackInfo().getTrack().hasTrackPoints())
+                       {
+                               _trackCheckbox.setSelected(false);
+                               _switchedTrackpointsOff = true;
+                       }
+                       else _switchedTrackpointsOff = false;
+               }
+               else if (_app.getTrackInfo().getTrack().hasTrackPoints() && _switchedTrackpointsOff)
+               {
+                       _trackCheckbox.setSelected(true);
+                       _switchedTrackpointsOff = false;
+               }
+       }
 
        /**
         * Enable or disable the ok button
@@ -254,11 +308,11 @@ public class GpsSaver extends GenericFunction implements Runnable
                Process process = Runtime.getRuntime().exec(commands);
 
                String trackName = _trackNameField.getText();
-               if (trackName == null || trackName.equals("")) {trackName = "prune";}
+               if (trackName == null || trackName.equals("")) {trackName = "gpsprune";}
                // Generate the GPX file and send to the GPS
                OutputStreamWriter writer = new OutputStreamWriter(process.getOutputStream());
-               boolean[] saveFlags = {true, true, true, false, true}; // export everything
-               GpxExporter.exportData(writer, _app.getTrackInfo(), trackName, null, saveFlags, false);
+               boolean[] saveFlags = {true, true, true, true, false, true}; // export everything
+               GpxExporter.exportData(writer, _app.getTrackInfo(), trackName, null, saveFlags, null);
                writer.close();
 
                // Read the error stream to see if there's a better error message there