]> gitweb.fperrin.net Git - GpsPrune.git/blobdiff - tim/prune/gui/MenuManager.java
Version 19, May 2018
[GpsPrune.git] / tim / prune / gui / MenuManager.java
index 998a533ce4a73f58c1ae43cb95a2e5af84a24b7a..08ecf18677ed08ad8c2eb3023f5daec0c6c0b33b 100644 (file)
@@ -1,8 +1,8 @@
 package tim.prune.gui;
 
+import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 
 import javax.swing.JButton;
@@ -20,13 +20,20 @@ import tim.prune.GenericFunction;
 import tim.prune.I18nManager;
 import tim.prune.UpdateMessageBroker;
 import tim.prune.config.Config;
+import tim.prune.data.AudioClip;
+import tim.prune.data.DataPoint;
+import tim.prune.data.Field;
 import tim.prune.data.Photo;
-import tim.prune.data.PhotoList;
+import tim.prune.data.RecentFile;
+import tim.prune.data.RecentFileList;
 import tim.prune.data.Selection;
 import tim.prune.data.Track;
 import tim.prune.data.TrackInfo;
-import tim.prune.function.RearrangeWaypointsFunction.Rearrange;
+import tim.prune.function.ChooseSingleParameter;
+import tim.prune.function.SearchOpenCachingDeFunction;
 import tim.prune.function.browser.UrlGenerator;
+import tim.prune.function.browser.WebMapFunction;
+import tim.prune.function.search.SearchMapillaryFunction;
 
 /**
  * Class to manage the menu bar and tool bar,
@@ -37,7 +44,6 @@ public class MenuManager implements DataSubscriber
        private App _app = null;
        private Track _track = null;
        private Selection _selection = null;
-       private PhotoList _photos = null;
 
        // Menu items which need enabling/disabling
        private JMenuItem _sendGpsItem = null;
@@ -45,18 +51,25 @@ public class MenuManager implements DataSubscriber
        private JMenuItem _exportKmlItem = null;
        private JMenuItem _exportGpxItem = null;
        private JMenuItem _exportPovItem = null;
+       private JMenuItem _exportImageItem = null;
+       private JMenu     _recentFileMenu = null;
        private JMenuItem _undoItem = null;
        private JMenuItem _clearUndoItem = null;
        private JMenuItem _editPointItem = null;
        private JMenuItem _editWaypointNameItem = null;
        private JMenuItem _deletePointItem = null;
        private JMenuItem _deleteRangeItem = null;
+       private JMenuItem _cropTrackItem = null;
        private JMenuItem _compressItem = null;
+       private JMenuItem _markRectangleItem = null;
+       private JMenuItem _markUphillLiftsItem = null;
        private JMenuItem _deleteMarkedPointsItem = null;
+       private JMenuItem _deleteByDateItem = null;
        private JMenuItem _interpolateItem = null;
        private JMenuItem _averageItem = null;
        private JMenuItem _selectAllItem = null;
        private JMenuItem _selectNoneItem = null;
+       private JMenuItem _selectSegmentItem = null;
        private JMenuItem _selectStartItem = null;
        private JMenuItem _selectEndItem = null;
        private JMenuItem _findWaypointItem = null;
@@ -65,25 +78,52 @@ public class MenuManager implements DataSubscriber
        private JMenuItem _addTimeOffsetItem = null;
        private JMenuItem _addAltitudeOffsetItem = null;
        private JMenuItem _mergeSegmentsItem = null;
-       private JMenu     _rearrangeMenu = null;
+       private JMenuItem _rearrangeWaypointsItem = null;
+       private JMenuItem _splitSegmentsItem = null;
+       private JMenuItem _sewSegmentsItem = null;
+       private JMenuItem _createMarkerWaypointsItem = null;
        private JMenuItem _cutAndMoveItem = null;
        private JMenuItem _convertNamesToTimesItem = null;
+       private JMenuItem _deleteFieldValuesItem = null;
        private JCheckBoxMenuItem _mapCheckbox = null;
        private JMenuItem _show3dItem = null;
        private JMenu     _browserMapMenu = null;
        private JMenuItem _chartItem = null;
        private JMenuItem _getGpsiesItem = null;
+       private JMenuItem _uploadGpsiesItem = null;
+       private JMenuItem _lookupSrtmItem = null;
+       private JMenuItem _downloadSrtmItem = null;
+       private JMenuItem _nearbyWikipediaItem = null;
+       private JMenuItem _nearbyOsmPoiItem = null;
+       private JMenuItem _showPeakfinderItem = null;
+       private JMenuItem _showGeohackItem = null;
+       private JMenuItem _searchOpencachingDeItem = null;
+       private JMenuItem _searchMapillaryItem = null;
+       private JMenuItem _downloadOsmItem = null;
+       private JMenuItem _getWeatherItem = null;
        private JMenuItem _distanceItem = null;
        private JMenuItem _fullRangeDetailsItem = null;
+       private JMenuItem _estimateTimeItem = null;
+       private JMenuItem _learnEstimationParams = null;
+       private JMenuItem _autoplayTrack = null;
        private JMenuItem _saveExifItem = null;
+       private JMenuItem _photoPopupItem = null;
+       private JMenuItem _selectNoPhotoItem = null;
        private JMenuItem _connectPhotoItem = null;
-       private JMenuItem _deletePhotoItem = null;
+       private JMenuItem _removePhotoItem = null;
        private JMenuItem _disconnectPhotoItem = null;
        private JMenuItem _correlatePhotosItem = null;
        private JMenuItem _rearrangePhotosItem = null;
        private JMenuItem _rotatePhotoLeft = null;
        private JMenuItem _rotatePhotoRight = null;
        private JMenuItem _ignoreExifThumb = null;
+       private JMenuItem _connectAudioItem = null;
+       private JMenuItem _disconnectAudioItem = null;
+       private JMenuItem _removeAudioItem = null;
+       private JMenuItem _correlateAudiosItem = null;
+       private JMenuItem _selectNoAudioItem = null;
+       private JCheckBoxMenuItem _onlineCheckbox = null;
+       private JCheckBoxMenuItem _autosaveSettingsCheckbox = null;
 
        // ActionListeners for reuse by menu and toolbar
        private ActionListener _openFileAction = null;
@@ -92,10 +132,8 @@ public class MenuManager implements DataSubscriber
        private ActionListener _undoAction = null;
        private ActionListener _editPointAction = null;
        private ActionListener _deletePointAction = null;
-       private ActionListener _deleteRangeAction = null;
        private ActionListener _selectStartAction = null;
        private ActionListener _selectEndAction = null;
-       private ActionListener _connectPhotoAction = null;
 
        // Toolbar buttons which need enabling/disabling
        private JButton _saveButton = null;
@@ -103,9 +141,10 @@ public class MenuManager implements DataSubscriber
        private JButton _editPointButton = null;
        private JButton _deletePointButton = null;
        private JButton _deleteRangeButton = null;
+       private JButton _cutAndMoveButton = null;
        private JButton _selectStartButton = null;
        private JButton _selectEndButton = null;
-       private JButton _connectPhotoButton = null;
+       private JButton _connectButton = null;
 
        /** Array of key events */
        private static final int[] KEY_EVENTS = {
@@ -126,7 +165,6 @@ public class MenuManager implements DataSubscriber
                _app = inApp;
                _track = inTrackInfo.getTrack();
                _selection = inTrackInfo.getSelection();
-               _photos = inTrackInfo.getPhotoList();
        }
 
 
@@ -140,42 +178,48 @@ public class MenuManager implements DataSubscriber
                JMenu fileMenu = new JMenu(I18nManager.getText("menu.file"));
                setAltKey(fileMenu, "altkey.menu.file");
                // Open file
-               JMenuItem openMenuItem = new JMenuItem(I18nManager.getText("menu.file.open"));
+               JMenuItem openMenuItem = new JMenuItem(I18nManager.getText("function.open"));
                setShortcut(openMenuItem, "shortcut.menu.file.open");
                _openFileAction = new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
+                       public void actionPerformed(ActionEvent e) {
                                _app.openFile();
                        }
                };
                openMenuItem.addActionListener(_openFileAction);
                fileMenu.add(openMenuItem);
+               // import through gpsbabel
+               JMenuItem importBabelItem = makeMenuItem(FunctionLibrary.FUNCTION_IMPORTBABEL);
+               fileMenu.add(importBabelItem);
                // Add photos
                JMenuItem addPhotosMenuItem = new JMenuItem(I18nManager.getText("menu.file.addphotos"));
                _addPhotoAction = new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
+                       public void actionPerformed(ActionEvent e) {
                                _app.addPhotos();
                        }
                };
                addPhotosMenuItem.addActionListener(_addPhotoAction);
                fileMenu.add(addPhotosMenuItem);
+               // Add audio clips
+               JMenuItem addAudioMenuItem = makeMenuItem(FunctionLibrary.FUNCTION_LOAD_AUDIO);
+               fileMenu.add(addAudioMenuItem);
+               // recent files
+               _recentFileMenu = new JMenu(I18nManager.getText("menu.file.recentfiles"));
+               _recentFileMenu.setEnabled(false);
+               fileMenu.add(_recentFileMenu);
                fileMenu.addSeparator();
                // Load from GPS
                JMenuItem loadFromGpsMenuItem = makeMenuItem(FunctionLibrary.FUNCTION_GPSLOAD);
                setShortcut(loadFromGpsMenuItem, "shortcut.menu.file.load");
                fileMenu.add(loadFromGpsMenuItem);
                // Send to GPS
-               _sendGpsItem = makeMenuItem(FunctionLibrary.FUNCTION_GPSSAVE);
-               _sendGpsItem.setEnabled(false);
+               _sendGpsItem = makeMenuItem(FunctionLibrary.FUNCTION_GPSSAVE, false);
                fileMenu.add(_sendGpsItem);
                fileMenu.addSeparator();
                // Save
                _saveItem = new JMenuItem(I18nManager.getText("menu.file.save"), KeyEvent.VK_S);
                setShortcut(_saveItem, "shortcut.menu.file.save");
                _saveAction = new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
+                       public void actionPerformed(ActionEvent e) {
                                _app.saveFile();
                        }
                };
@@ -183,200 +227,221 @@ public class MenuManager implements DataSubscriber
                _saveItem.setEnabled(false);
                fileMenu.add(_saveItem);
                // Export - Kml
-               _exportKmlItem = makeMenuItem(FunctionLibrary.FUNCTION_KMLEXPORT);
-               _exportKmlItem.setEnabled(false);
+               _exportKmlItem = makeMenuItem(FunctionLibrary.FUNCTION_KMLEXPORT, false);
                fileMenu.add(_exportKmlItem);
                // Gpx
-               _exportGpxItem = makeMenuItem(FunctionLibrary.FUNCTION_GPXEXPORT);
-               _exportGpxItem.setEnabled(false);
+               _exportGpxItem = makeMenuItem(FunctionLibrary.FUNCTION_GPXEXPORT, false);
                fileMenu.add(_exportGpxItem);
                // Pov
-               _exportPovItem = makeMenuItem(FunctionLibrary.FUNCTION_POVEXPORT);
-               _exportPovItem.setEnabled(false);
+               _exportPovItem = makeMenuItem(FunctionLibrary.FUNCTION_POVEXPORT, false);
                fileMenu.add(_exportPovItem);
+               // Image
+               _exportImageItem = makeMenuItem(FunctionLibrary.FUNCTION_IMAGEEXPORT, false);
+               fileMenu.add(_exportImageItem);
                fileMenu.addSeparator();
+               // Exit
                JMenuItem exitMenuItem = new JMenuItem(I18nManager.getText("menu.file.exit"));
                exitMenuItem.addActionListener(new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
+                       public void actionPerformed(ActionEvent e) {
                                _app.exit();
                        }
                });
                fileMenu.add(exitMenuItem);
                menubar.add(fileMenu);
+
+               ////////////////////////////////////////////////////
+               // Online menu
+               JMenu onlineMenu = new JMenu(I18nManager.getText("menu.online"));
+               setAltKey(onlineMenu, "altkey.menu.online");
+               // SRTM
+               _lookupSrtmItem = makeMenuItem(FunctionLibrary.FUNCTION_LOOKUP_SRTM, false);
+               onlineMenu.add(_lookupSrtmItem);
+               _downloadSrtmItem = makeMenuItem(FunctionLibrary.FUNCTION_DOWNLOAD_SRTM, false);
+               onlineMenu.add(_downloadSrtmItem);
+               // Get gpsies tracks
+               _getGpsiesItem = makeMenuItem(FunctionLibrary.FUNCTION_GET_GPSIES, false);
+               onlineMenu.add(_getGpsiesItem);
+               // Upload to gpsies
+               _uploadGpsiesItem = makeMenuItem(FunctionLibrary.FUNCTION_UPLOAD_GPSIES, false);
+               onlineMenu.add(_uploadGpsiesItem);
+
+               onlineMenu.addSeparator();
+               // browser submenu
+               _browserMapMenu = new JMenu(I18nManager.getText("menu.view.browser"));
+               _browserMapMenu.setEnabled(false);
+               JMenuItem googleMapsItem = makeMenuItem(new WebMapFunction(_app, UrlGenerator.WebService.MAP_SOURCE_GOOGLE, "menu.view.browser.google"));
+               _browserMapMenu.add(googleMapsItem);
+               JMenuItem openMapsItem = makeMenuItem(new WebMapFunction(_app, UrlGenerator.WebService.MAP_SOURCE_OSM, "menu.view.browser.openstreetmap"));
+               _browserMapMenu.add(openMapsItem);
+               JMenuItem mapquestMapsItem = makeMenuItem(new WebMapFunction(_app, UrlGenerator.WebService.MAP_SOURCE_MAPQUEST, "menu.view.browser.mapquest"));
+               _browserMapMenu.add(mapquestMapsItem);
+               JMenuItem yahooMapsItem = makeMenuItem(new WebMapFunction(_app, UrlGenerator.WebService.MAP_SOURCE_YAHOO, "menu.view.browser.yahoo"));
+               _browserMapMenu.add(yahooMapsItem);
+               JMenuItem bingMapsItem = makeMenuItem(new WebMapFunction(_app, UrlGenerator.WebService.MAP_SOURCE_BING, "menu.view.browser.bing"));
+               _browserMapMenu.add(bingMapsItem);
+               onlineMenu.add(_browserMapMenu);
+               // wikipedia
+               _nearbyWikipediaItem = makeMenuItem(FunctionLibrary.FUNCTION_NEARBY_WIKIPEDIA, false);
+               onlineMenu.add(_nearbyWikipediaItem);
+               JMenuItem searchWikipediaNamesItem = makeMenuItem(FunctionLibrary.FUNCTION_SEARCH_WIKIPEDIA);
+               onlineMenu.add(searchWikipediaNamesItem);
+               _nearbyOsmPoiItem = makeMenuItem(FunctionLibrary.FUNCTION_SEARCH_OSMPOIS);
+               onlineMenu.add(_nearbyOsmPoiItem);
+               _showPeakfinderItem = makeMenuItem(new WebMapFunction(_app, UrlGenerator.WebService.MAP_SOURCE_PEAKFINDER, "webservice.peakfinder"), false);
+               onlineMenu.add(_showPeakfinderItem);
+               _showGeohackItem = makeMenuItem(new WebMapFunction(_app, UrlGenerator.WebService.MAP_SOURCE_GEOHACK, "webservice.geohack"), false);
+               onlineMenu.add(_showGeohackItem);
+
+               onlineMenu.addSeparator();
+               _searchOpencachingDeItem = makeMenuItem(new SearchOpenCachingDeFunction(_app), false);
+               onlineMenu.add(_searchOpencachingDeItem);
+               _searchMapillaryItem = makeMenuItem(new SearchMapillaryFunction(_app), false);
+               onlineMenu.add(_searchMapillaryItem);
+               _downloadOsmItem = makeMenuItem(FunctionLibrary.FUNCTION_DOWNLOAD_OSM, false);
+               onlineMenu.add(_downloadOsmItem);
+               _getWeatherItem = makeMenuItem(FunctionLibrary.FUNCTION_GET_WEATHER_FORECAST, false);
+               onlineMenu.add(_getWeatherItem);
+               menubar.add(onlineMenu);
+
+               ////////////////////////////////////////////////////
                // Track menu
                JMenu trackMenu = new JMenu(I18nManager.getText("menu.track"));
                setAltKey(trackMenu, "altkey.menu.track");
-               _undoItem = new JMenuItem(I18nManager.getText("menu.edit.undo"));
-               setShortcut(_undoItem, "shortcut.menu.edit.undo");
+               _undoItem = new JMenuItem(I18nManager.getText("menu.track.undo"));
+               setShortcut(_undoItem, "shortcut.menu.track.undo");
                _undoAction = new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
+                       public void actionPerformed(ActionEvent e) {
                                _app.beginUndo();
                        }
                };
                _undoItem.addActionListener(_undoAction);
                _undoItem.setEnabled(false);
                trackMenu.add(_undoItem);
-               _clearUndoItem = new JMenuItem(I18nManager.getText("menu.edit.clearundo"));
+               _clearUndoItem = new JMenuItem(I18nManager.getText("menu.track.clearundo"));
                _clearUndoItem.addActionListener(new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
+                       public void actionPerformed(ActionEvent e) {
                                _app.clearUndo();
                        }
                });
                _clearUndoItem.setEnabled(false);
                trackMenu.add(_clearUndoItem);
                trackMenu.addSeparator();
-               _compressItem = makeMenuItem(FunctionLibrary.FUNCTION_COMPRESS);
+               _compressItem = makeMenuItem(FunctionLibrary.FUNCTION_COMPRESS, false);
                setShortcut(_compressItem, "shortcut.menu.edit.compress");
-               _compressItem.setEnabled(false);
                trackMenu.add(_compressItem);
-               _deleteMarkedPointsItem = new JMenuItem(I18nManager.getText("menu.edit.deletemarked"));
-               _deleteMarkedPointsItem.addActionListener(new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
-                               _app.finishCompressTrack();
+               _markRectangleItem = new JMenuItem(I18nManager.getText("menu.track.markrectangle"));
+               _markRectangleItem.addActionListener(new ActionListener() {
+                       public void actionPerformed(ActionEvent e) {
+                               _app.setCurrentMode(App.AppMode.DRAWRECT);
+                               UpdateMessageBroker.informSubscribers();
                        }
                });
-               _deleteMarkedPointsItem.setEnabled(false);
+               _markRectangleItem.setEnabled(false);
+               trackMenu.add(_markRectangleItem);
+               _markUphillLiftsItem = makeMenuItem(FunctionLibrary.FUNCTION_MARK_LIFTS, false);
+               trackMenu.add(_markUphillLiftsItem);
+               _deleteMarkedPointsItem = makeMenuItem(FunctionLibrary.FUNCTION_DELETE_MARKED_POINTS, false);
                trackMenu.add(_deleteMarkedPointsItem);
+               _deleteByDateItem = makeMenuItem(FunctionLibrary.FUNCTION_DELETE_BY_DATE, false);
+               trackMenu.add(_deleteByDateItem);
                trackMenu.addSeparator();
                // Rearrange waypoints
-               _rearrangeMenu = new JMenu(I18nManager.getText("menu.edit.rearrange"));
-               _rearrangeMenu.setEnabled(false);
-               JMenuItem  rearrangeStartItem = new JMenuItem(I18nManager.getText("menu.edit.rearrange.start"));
-               rearrangeStartItem.addActionListener(new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
-                               FunctionLibrary.FUNCTION_REARRANGE_WAYPOINTS.rearrangeWaypoints(Rearrange.TO_START);
-                       }
-               });
-               rearrangeStartItem.setEnabled(true);
-               _rearrangeMenu.add(rearrangeStartItem);
-               JMenuItem rearrangeEndItem = new JMenuItem(I18nManager.getText("menu.edit.rearrange.end"));
-               rearrangeEndItem.addActionListener(new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
-                               FunctionLibrary.FUNCTION_REARRANGE_WAYPOINTS.rearrangeWaypoints(Rearrange.TO_END);
-                       }
-               });
-               rearrangeEndItem.setEnabled(true);
-               _rearrangeMenu.add(rearrangeEndItem);
-               JMenuItem rearrangeNearestItem = new JMenuItem(I18nManager.getText("menu.edit.rearrange.nearest"));
-               rearrangeNearestItem.addActionListener(new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
-                               FunctionLibrary.FUNCTION_REARRANGE_WAYPOINTS.rearrangeWaypoints(Rearrange.TO_NEAREST);
-                       }
-               });
-               rearrangeNearestItem.setEnabled(true);
-               _rearrangeMenu.add(rearrangeNearestItem);
-               trackMenu.add(_rearrangeMenu);
-               // Get gpsies tracks
-               _getGpsiesItem = makeMenuItem(FunctionLibrary.FUNCTION_GET_GPSIES);
-               _getGpsiesItem.setEnabled(false);
-               trackMenu.add(_getGpsiesItem);
+               _rearrangeWaypointsItem = makeMenuItem(FunctionLibrary.FUNCTION_REARRANGE_WAYPOINTS, false);
+               trackMenu.add(_rearrangeWaypointsItem);
+               // Split track segments
+               _splitSegmentsItem = makeMenuItem(FunctionLibrary.FUNCTION_SPLIT_SEGMENTS, false);
+               trackMenu.add(_splitSegmentsItem);
+               // Sew track segments
+               _sewSegmentsItem = makeMenuItem(FunctionLibrary.FUNCTION_SEW_SEGMENTS, false);
+               trackMenu.add(_sewSegmentsItem);
+               // Create marker waypoints
+               _createMarkerWaypointsItem = makeMenuItem(FunctionLibrary.FUNCTION_CREATE_MARKER_WAYPOINTS, false);
+               trackMenu.add(_createMarkerWaypointsItem);
+               trackMenu.addSeparator();
+               _learnEstimationParams = makeMenuItem(FunctionLibrary.FUNCTION_LEARN_ESTIMATION_PARAMS, false);
+               trackMenu.add(_learnEstimationParams);
                menubar.add(trackMenu);
 
                // Range menu
                JMenu rangeMenu = new JMenu(I18nManager.getText("menu.range"));
                setAltKey(rangeMenu, "altkey.menu.range");
-               _selectAllItem = new JMenuItem(I18nManager.getText("menu.select.all"));
-               setShortcut(_selectAllItem, "shortcut.menu.select.all");
+               _selectAllItem = new JMenuItem(I18nManager.getText("menu.range.all"));
+               setShortcut(_selectAllItem, "shortcut.menu.range.all");
                _selectAllItem.setEnabled(false);
                _selectAllItem.addActionListener(new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
+                       public void actionPerformed(ActionEvent e) {
                                _selection.selectRange(0, _track.getNumPoints()-1);
                        }
                });
                rangeMenu.add(_selectAllItem);
-               _selectNoneItem = new JMenuItem(I18nManager.getText("menu.select.none"));
+               _selectNoneItem = new JMenuItem(I18nManager.getText("menu.range.none"));
                _selectNoneItem.setEnabled(false);
                _selectNoneItem.addActionListener(new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
+                       public void actionPerformed(ActionEvent e) {
                                _app.selectNone();
                        }
                });
                rangeMenu.add(_selectNoneItem);
+               _selectSegmentItem = makeMenuItem(FunctionLibrary.FUNCTION_SELECT_SEGMENT);
+               rangeMenu.add(_selectSegmentItem);
                rangeMenu.addSeparator();
-               _selectStartItem = new JMenuItem(I18nManager.getText("menu.select.start"));
+               _selectStartItem = new JMenuItem(I18nManager.getText("menu.range.start"));
                _selectStartItem.setEnabled(false);
                _selectStartAction = new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
+                       public void actionPerformed(ActionEvent e) {
                                _selection.selectRangeStart();
                        }
                };
                _selectStartItem.addActionListener(_selectStartAction);
                rangeMenu.add(_selectStartItem);
-               _selectEndItem = new JMenuItem(I18nManager.getText("menu.select.end"));
+               _selectEndItem = new JMenuItem(I18nManager.getText("menu.range.end"));
                _selectEndItem.setEnabled(false);
                _selectEndAction = new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
+                       public void actionPerformed(ActionEvent e) {
                                _selection.selectRangeEnd();
                        }
                };
                _selectEndItem.addActionListener(_selectEndAction);
                rangeMenu.add(_selectEndItem);
                rangeMenu.addSeparator();
-               _deleteRangeItem = new JMenuItem(I18nManager.getText("menu.edit.deleterange"));
-               _deleteRangeAction = new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
-                               _app.deleteSelectedRange();
-                       }
-               };
-               _deleteRangeItem.addActionListener(_deleteRangeAction);
-               _deleteRangeItem.setEnabled(false);
+               _deleteRangeItem = makeMenuItem(FunctionLibrary.FUNCTION_DELETE_RANGE, false);
                rangeMenu.add(_deleteRangeItem);
-               _reverseItem = new JMenuItem(I18nManager.getText("menu.edit.reverse"));
+               _cropTrackItem = makeMenuItem(FunctionLibrary.FUNCTION_CROP_TRACK, false);
+               rangeMenu.add(_cropTrackItem);
+               _reverseItem = new JMenuItem(I18nManager.getText("menu.range.reverse"));
                _reverseItem.addActionListener(new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
+                       public void actionPerformed(ActionEvent e) {
                                _app.reverseRange();
                        }
                });
                _reverseItem.setEnabled(false);
                rangeMenu.add(_reverseItem);
-               _addTimeOffsetItem = makeMenuItem(FunctionLibrary.FUNCTION_ADD_TIME_OFFSET);
-               _addTimeOffsetItem.setEnabled(false);
+               _addTimeOffsetItem = makeMenuItem(FunctionLibrary.FUNCTION_ADD_TIME_OFFSET, false);
                rangeMenu.add(_addTimeOffsetItem);
-               _addAltitudeOffsetItem = makeMenuItem(FunctionLibrary.FUNCTION_ADD_ALTITUDE_OFFSET);
-               _addAltitudeOffsetItem.setEnabled(false);
+               _addAltitudeOffsetItem = makeMenuItem(FunctionLibrary.FUNCTION_ADD_ALTITUDE_OFFSET, false);
                rangeMenu.add(_addAltitudeOffsetItem);
-               _mergeSegmentsItem = new JMenuItem(I18nManager.getText("menu.edit.mergetracksegments"));
+               _mergeSegmentsItem = new JMenuItem(I18nManager.getText("menu.range.mergetracksegments"));
                _mergeSegmentsItem.addActionListener(new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
+                       public void actionPerformed(ActionEvent e) {
                                _app.mergeTrackSegments();
                        }
                });
                _mergeSegmentsItem.setEnabled(false);
                rangeMenu.add(_mergeSegmentsItem);
+               _deleteFieldValuesItem = makeMenuItem(FunctionLibrary.FUNCTION_DELETE_FIELD_VALUES, false);
+               rangeMenu.add(_deleteFieldValuesItem);
                rangeMenu.addSeparator();
-               _interpolateItem = new JMenuItem(I18nManager.getText("menu.edit.interpolate"));
-               _interpolateItem.addActionListener(new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
-                               _app.interpolateSelection();
-                       }
-               });
-               _interpolateItem.setEnabled(false);
+               _interpolateItem = makeMenuItem(new ChooseSingleParameter(_app, FunctionLibrary.FUNCTION_INTERPOLATE), false);
                rangeMenu.add(_interpolateItem);
-               _averageItem = new JMenuItem(I18nManager.getText("menu.edit.average"));
+               _averageItem = new JMenuItem(I18nManager.getText("menu.range.average"));
                _averageItem.addActionListener(new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
+                       public void actionPerformed(ActionEvent e) {
                                _app.averageSelection();
                        }
                });
                _averageItem.setEnabled(false);
                rangeMenu.add(_averageItem);
-               _cutAndMoveItem = new JMenuItem(I18nManager.getText("menu.edit.cutandmove"));
+               _cutAndMoveItem = new JMenuItem(I18nManager.getText("menu.range.cutandmove"));
                _cutAndMoveItem.addActionListener(new ActionListener() {
                        public void actionPerformed(ActionEvent e)
                        {
@@ -385,45 +450,40 @@ public class MenuManager implements DataSubscriber
                });
                _cutAndMoveItem.setEnabled(false);
                rangeMenu.add(_cutAndMoveItem);
-               _convertNamesToTimesItem = makeMenuItem(FunctionLibrary.FUNCTION_CONVERT_NAMES_TO_TIMES);
-               _convertNamesToTimesItem.setEnabled(false);
+               _convertNamesToTimesItem = makeMenuItem(FunctionLibrary.FUNCTION_CONVERT_NAMES_TO_TIMES, false);
                rangeMenu.add(_convertNamesToTimesItem);
                menubar.add(rangeMenu);
 
                // Point menu
                JMenu pointMenu = new JMenu(I18nManager.getText("menu.point"));
                setAltKey(pointMenu, "altkey.menu.point");
-               _editPointItem = new JMenuItem(I18nManager.getText("menu.edit.editpoint"));
+               _editPointItem = new JMenuItem(I18nManager.getText("menu.point.editpoint"));
                _editPointAction = new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
+                       public void actionPerformed(ActionEvent e) {
                                _app.editCurrentPoint();
                        }
                };
                _editPointItem.addActionListener(_editPointAction);
                _editPointItem.setEnabled(false);
                pointMenu.add(_editPointItem);
-               _editWaypointNameItem = makeMenuItem(FunctionLibrary.FUNCTION_EDIT_WAYPOINT_NAME);
-               _editWaypointNameItem.setEnabled(false);
+               _editWaypointNameItem = makeMenuItem(FunctionLibrary.FUNCTION_EDIT_WAYPOINT_NAME, false);
                pointMenu.add(_editWaypointNameItem);
-               _deletePointItem = new JMenuItem(I18nManager.getText("menu.edit.deletepoint"));
+               _deletePointItem = new JMenuItem(I18nManager.getText("menu.point.deletepoint"));
                _deletePointAction = new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
+                       public void actionPerformed(ActionEvent e) {
                                _app.deleteCurrentPoint();
                        }
                };
                _deletePointItem.addActionListener(_deletePointAction);
                _deletePointItem.setEnabled(false);
+               _deletePointItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0));
                pointMenu.add(_deletePointItem);
                pointMenu.addSeparator();
                // find a waypoint
-               _findWaypointItem = makeMenuItem(FunctionLibrary.FUNCTION_FIND_WAYPOINT);
-               _findWaypointItem.setEnabled(false);
+               _findWaypointItem = makeMenuItem(FunctionLibrary.FUNCTION_FIND_WAYPOINT, false);
                pointMenu.add(_findWaypointItem);
                // duplicate current point
-               _duplicatePointItem = makeMenuItem(FunctionLibrary.FUNCTION_DUPLICATE_POINT);
-               _duplicatePointItem.setEnabled(false);
+               _duplicatePointItem = makeMenuItem(FunctionLibrary.FUNCTION_DUPLICATE_POINT, false);
                pointMenu.add(_duplicatePointItem);
                // paste coordinates function
                JMenuItem pasteCoordsItem = makeMenuItem(FunctionLibrary.FUNCTION_PASTE_COORDINATES);
@@ -439,69 +499,40 @@ public class MenuManager implements DataSubscriber
                _mapCheckbox.addActionListener(new ActionListener() {
                        public void actionPerformed(ActionEvent e) {
                                Config.setConfigBoolean(Config.KEY_SHOW_MAP, _mapCheckbox.isSelected());
-                               UpdateMessageBroker.informSubscribers();
+                               UpdateMessageBroker.informSubscribers(MAPSERVER_CHANGED);
                        }
                });
                viewMenu.add(_mapCheckbox);
-               _show3dItem = makeMenuItem(FunctionLibrary.FUNCTION_3D);
-               _show3dItem.setEnabled(false);
-               viewMenu.add(_show3dItem);
-               // browser submenu
-               _browserMapMenu = new JMenu(I18nManager.getText("menu.view.browser"));
-               _browserMapMenu.setEnabled(false);
-               JMenuItem googleMapsItem = new JMenuItem(I18nManager.getText("menu.view.browser.google"));
-               googleMapsItem.addActionListener(new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
-                               _app.showExternalMap(UrlGenerator.MAP_SOURCE_GOOGLE);
-                       }
-               });
-               _browserMapMenu.add(googleMapsItem);
-               JMenuItem openMapsItem = new JMenuItem(I18nManager.getText("menu.view.browser.openstreetmap"));
-               openMapsItem.addActionListener(new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
-                               _app.showExternalMap(UrlGenerator.MAP_SOURCE_OSM);
-                       }
-               });
-               _browserMapMenu.add(openMapsItem);
-               JMenuItem mapquestMapsItem = new JMenuItem(I18nManager.getText("menu.view.browser.mapquest"));
-               mapquestMapsItem.addActionListener(new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
-                               _app.showExternalMap(UrlGenerator.MAP_SOURCE_MAPQUEST);
-                       }
-               });
-               _browserMapMenu.add(mapquestMapsItem);
-               JMenuItem yahooMapsItem = new JMenuItem(I18nManager.getText("menu.view.browser.yahoo"));
-               yahooMapsItem.addActionListener(new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
-                               _app.showExternalMap(UrlGenerator.MAP_SOURCE_YAHOO);
-                       }
-               });
-               _browserMapMenu.add(yahooMapsItem);
-               JMenuItem bingMapsItem = new JMenuItem(I18nManager.getText("menu.view.browser.bing"));
-               bingMapsItem.addActionListener(new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
-                               _app.showExternalMap(UrlGenerator.MAP_SOURCE_BING);
+               // Turn off the sidebars
+               JCheckBoxMenuItem sidebarsCheckbox = new JCheckBoxMenuItem(I18nManager.getText("menu.view.showsidebars"));
+               sidebarsCheckbox.setSelected(true);
+               sidebarsCheckbox.addActionListener(new ActionListener() {
+                       public void actionPerformed(ActionEvent e) {
+                               _app.toggleSidebars();
                        }
                });
-               _browserMapMenu.add(bingMapsItem);
-               viewMenu.add(_browserMapMenu);
+               sidebarsCheckbox.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F11, 0)); // shortcut F11
+               viewMenu.add(sidebarsCheckbox);
+               // 3d
+               _show3dItem = makeMenuItem(FunctionLibrary.FUNCTION_3D, false);
+               viewMenu.add(_show3dItem);
                // Charts
-               _chartItem = makeMenuItem(FunctionLibrary.FUNCTION_CHARTS);
-               _chartItem.setEnabled(false);
+               _chartItem = makeMenuItem(FunctionLibrary.FUNCTION_CHARTS, false);
                viewMenu.add(_chartItem);
+               viewMenu.addSeparator();
                // Distances
-               _distanceItem = makeMenuItem(FunctionLibrary.FUNCTION_DISTANCES);
-               _distanceItem.setEnabled(false);
+               _distanceItem = makeMenuItem(FunctionLibrary.FUNCTION_DISTANCES, false);
                viewMenu.add(_distanceItem);
                // full range details
-               _fullRangeDetailsItem = makeMenuItem(FunctionLibrary.FUNCTION_FULL_RANGE_DETAILS);
-               _fullRangeDetailsItem.setEnabled(false);
+               _fullRangeDetailsItem = makeMenuItem(FunctionLibrary.FUNCTION_FULL_RANGE_DETAILS, false);
                viewMenu.add(_fullRangeDetailsItem);
+               // estimate time
+               _estimateTimeItem = makeMenuItem(FunctionLibrary.FUNCTION_ESTIMATE_TIME, false);
+               viewMenu.add(_estimateTimeItem);
+               viewMenu.addSeparator();
+               // autoplay
+               _autoplayTrack = makeMenuItem(FunctionLibrary.FUNCTION_AUTOPLAY_TRACK, false);
+               viewMenu.add(_autoplayTrack);
                menubar.add(viewMenu);
 
                // Add photo menu
@@ -512,86 +543,120 @@ public class MenuManager implements DataSubscriber
                photoMenu.add(addPhotosMenuItem);
                _saveExifItem = new JMenuItem(I18nManager.getText("menu.photo.saveexif"));
                _saveExifItem.addActionListener(new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
+                       public void actionPerformed(ActionEvent e) {
                                _app.saveExif();
                        }
                });
                _saveExifItem.setEnabled(false);
                photoMenu.add(_saveExifItem);
-               _connectPhotoItem = new JMenuItem(I18nManager.getText("menu.photo.connect"));
-               _connectPhotoAction = new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
-                               _app.connectPhotoToPoint();
+               // Deselect current photo
+               _selectNoPhotoItem = new JMenuItem(I18nManager.getText("menu.range.none"));
+               _selectNoPhotoItem.setEnabled(false);
+               _selectNoPhotoItem.addActionListener(new ActionListener() {
+                       public void actionPerformed(ActionEvent e) {
+                               _app.getTrackInfo().selectPhoto(-1);
                        }
-               };
-               _connectPhotoItem.addActionListener(_connectPhotoAction);
-               _connectPhotoItem.setEnabled(false);
+               });
+               photoMenu.add(_selectNoPhotoItem);
                photoMenu.addSeparator();
+               _connectPhotoItem = makeMenuItem(FunctionLibrary.FUNCTION_CONNECT_TO_POINT, false);
                photoMenu.add(_connectPhotoItem);
                // disconnect photo
-               _disconnectPhotoItem = new JMenuItem(I18nManager.getText("menu.photo.disconnect"));
-               _disconnectPhotoItem.addActionListener(new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
-                               _app.disconnectPhotoFromPoint();
-                       }
-               });
-               _disconnectPhotoItem.setEnabled(false);
+               _disconnectPhotoItem = makeMenuItem(FunctionLibrary.FUNCTION_DISCONNECT_PHOTO, false);
                photoMenu.add(_disconnectPhotoItem);
-               _deletePhotoItem = new JMenuItem(I18nManager.getText("menu.photo.delete"));
-               _deletePhotoItem.addActionListener(new ActionListener() {
-                       public void actionPerformed(ActionEvent e)
-                       {
-                               _app.deleteCurrentPhoto();
-                       }
-               });
-               _deletePhotoItem.setEnabled(false);
-               photoMenu.add(_deletePhotoItem);
+               _removePhotoItem = makeMenuItem(FunctionLibrary.FUNCTION_REMOVE_PHOTO, false);
+               photoMenu.add(_removePhotoItem);
                // Rotate current photo
-               _rotatePhotoLeft = makeMenuItem(FunctionLibrary.FUNCTION_ROTATE_PHOTO_LEFT);
-               _rotatePhotoLeft.setEnabled(false);
+               _rotatePhotoLeft = makeMenuItem(FunctionLibrary.FUNCTION_ROTATE_PHOTO_LEFT, false);
                photoMenu.add(_rotatePhotoLeft);
-               _rotatePhotoRight = makeMenuItem(FunctionLibrary.FUNCTION_ROTATE_PHOTO_RIGHT);
-               _rotatePhotoRight.setEnabled(false);
+               _rotatePhotoRight = makeMenuItem(FunctionLibrary.FUNCTION_ROTATE_PHOTO_RIGHT, false);
                photoMenu.add(_rotatePhotoRight);
-               _ignoreExifThumb = makeMenuItem(FunctionLibrary.FUNCTION_IGNORE_EXIF_THUMB);
-               _ignoreExifThumb.setEnabled(false);
+               // Show photo popup
+               _photoPopupItem = makeMenuItem(FunctionLibrary.FUNCTION_PHOTO_POPUP, false);
+               photoMenu.add(_photoPopupItem);
+               _ignoreExifThumb = makeMenuItem(FunctionLibrary.FUNCTION_IGNORE_EXIF_THUMB, false);
                photoMenu.add(_ignoreExifThumb);
                photoMenu.addSeparator();
                // correlate all photos
-               _correlatePhotosItem = makeMenuItem(FunctionLibrary.FUNCTION_CORRELATE_PHOTOS);
-               _correlatePhotosItem.setEnabled(false);
+               _correlatePhotosItem = makeMenuItem(FunctionLibrary.FUNCTION_CORRELATE_PHOTOS, false);
                photoMenu.add(_correlatePhotosItem);
                // rearrange photo points
-               _rearrangePhotosItem = makeMenuItem(FunctionLibrary.FUNCTION_REARRANGE_PHOTOS);
-               _rearrangePhotosItem.setEnabled(false);
+               _rearrangePhotosItem = makeMenuItem(FunctionLibrary.FUNCTION_REARRANGE_PHOTOS, false);
                photoMenu.add(_rearrangePhotosItem);
                menubar.add(photoMenu);
 
+               // Audio menu
+               JMenu audioMenu = new JMenu(I18nManager.getText("menu.audio"));
+               setAltKey(audioMenu, "altkey.menu.audio");
+               addAudioMenuItem = makeMenuItem(FunctionLibrary.FUNCTION_LOAD_AUDIO);
+               audioMenu.add(addAudioMenuItem);
+               _selectNoAudioItem = new JMenuItem(I18nManager.getText("menu.range.none"));
+               _selectNoAudioItem.setEnabled(false);
+               _selectNoAudioItem.addActionListener(new ActionListener() {
+                       public void actionPerformed(ActionEvent e) {
+                               _app.getTrackInfo().selectAudio(-1);
+                       }
+               });
+               audioMenu.add(_selectNoAudioItem);
+               audioMenu.addSeparator();
+               // connect audio
+               _connectAudioItem = makeMenuItem(FunctionLibrary.FUNCTION_CONNECT_TO_POINT, false);
+               audioMenu.add(_connectAudioItem);
+               // Disconnect current audio clip
+               _disconnectAudioItem = makeMenuItem(FunctionLibrary.FUNCTION_DISCONNECT_AUDIO, false);
+               audioMenu.add(_disconnectAudioItem);
+               // Remove current audio clip
+               _removeAudioItem = makeMenuItem(FunctionLibrary.FUNCTION_REMOVE_AUDIO, false);
+               audioMenu.add(_removeAudioItem);
+               audioMenu.addSeparator();
+               // Correlate audio clips
+               _correlateAudiosItem = makeMenuItem(FunctionLibrary.FUNCTION_CORRELATE_AUDIOS, false);
+               audioMenu.add(_correlateAudiosItem);
+               menubar.add(audioMenu);
+
                // Settings menu
                JMenu settingsMenu = new JMenu(I18nManager.getText("menu.settings"));
                setAltKey(settingsMenu, "altkey.menu.settings");
                // Set the map background
                JMenuItem mapBgItem = makeMenuItem(FunctionLibrary.FUNCTION_SET_MAP_BG);
                settingsMenu.add(mapBgItem);
-               // Set kmz image size
-               JMenuItem setKmzImageSizeItem = makeMenuItem(FunctionLibrary.FUNCTION_SET_KMZ_IMAGE_SIZE);
-               settingsMenu.add(setKmzImageSizeItem);
+               _onlineCheckbox = new JCheckBoxMenuItem(I18nManager.getText("menu.settings.onlinemode"));
+               _onlineCheckbox.setSelected(Config.getConfigBoolean(Config.KEY_ONLINE_MODE));
+               _onlineCheckbox.addActionListener(new ActionListener() {
+                       public void actionPerformed(ActionEvent e) {
+                               boolean isOnline = _onlineCheckbox.isSelected();
+                               Config.setConfigBoolean(Config.KEY_ONLINE_MODE, isOnline);
+                               if (isOnline) {UpdateMessageBroker.informSubscribers();}
+                       }
+               });
+               settingsMenu.add(_onlineCheckbox);
+               settingsMenu.add(makeMenuItem(FunctionLibrary.FUNCTION_SET_DISK_CACHE));
+               settingsMenu.addSeparator();
                // Set program paths
-               JMenuItem setPathsItem = makeMenuItem(FunctionLibrary.FUNCTION_SET_PATHS);
-               settingsMenu.add(setPathsItem);
+               settingsMenu.add(makeMenuItem(FunctionLibrary.FUNCTION_SET_PATHS));
                // Set colours
-               JMenuItem setColoursItem = makeMenuItem(FunctionLibrary.FUNCTION_SET_COLOURS);
-               settingsMenu.add(setColoursItem);
+               settingsMenu.add(makeMenuItem(FunctionLibrary.FUNCTION_SET_COLOURS));
+               // display settings
+               JMenuItem setDisplaySettingsItem = makeMenuItem(FunctionLibrary.FUNCTION_SET_DISPLAY_SETTINGS);
+               settingsMenu.add(setDisplaySettingsItem);
                // Set language
-               JMenuItem setLanguageItem = makeMenuItem(FunctionLibrary.FUNCTION_SET_LANGUAGE);
-               settingsMenu.add(setLanguageItem);
+               settingsMenu.add(makeMenuItem(FunctionLibrary.FUNCTION_SET_LANGUAGE));
+               // Set altitude tolerance
+               settingsMenu.add(makeMenuItem(new ChooseSingleParameter(_app, FunctionLibrary.FUNCTION_SET_ALTITUDE_TOLERANCE)));
+               // Set timezone
+               settingsMenu.add(makeMenuItem(FunctionLibrary.FUNCTION_SET_TIMEZONE));
                settingsMenu.addSeparator();
                // Save configuration
-               JMenuItem saveConfigMenuItem = makeMenuItem(FunctionLibrary.FUNCTION_SAVECONFIG);
-               settingsMenu.add(saveConfigMenuItem);
+               settingsMenu.add(makeMenuItem(FunctionLibrary.FUNCTION_SAVECONFIG));
+               _autosaveSettingsCheckbox = new JCheckBoxMenuItem(
+                       I18nManager.getText("menu.settings.autosave"), false);
+               _autosaveSettingsCheckbox.setSelected(Config.getConfigBoolean(Config.KEY_AUTOSAVE_SETTINGS));
+               _autosaveSettingsCheckbox.addActionListener(new ActionListener() {
+                       public void actionPerformed(ActionEvent e) {
+                               Config.setConfigBoolean(Config.KEY_AUTOSAVE_SETTINGS, _autosaveSettingsCheckbox.isSelected());
+                       }
+               });
+               settingsMenu.add(_autosaveSettingsCheckbox);
                menubar.add(settingsMenu);
 
                // Help menu
@@ -600,17 +665,27 @@ public class MenuManager implements DataSubscriber
                JMenuItem helpItem = makeMenuItem(FunctionLibrary.FUNCTION_HELP);
                setShortcut(helpItem, "shortcut.menu.help.help");
                helpMenu.add(helpItem);
-               JMenuItem showKeysItem = makeMenuItem(FunctionLibrary.FUNCTION_SHOW_KEYS);
-               helpMenu.add(showKeysItem);
-               JMenuItem aboutItem = makeMenuItem(FunctionLibrary.FUNCTION_ABOUT);
-               helpMenu.add(aboutItem);
-               JMenuItem checkVersionItem = makeMenuItem(FunctionLibrary.FUNCTION_CHECK_VERSION);
-               helpMenu.add(checkVersionItem);
+               helpMenu.add(makeMenuItem(FunctionLibrary.FUNCTION_SHOW_KEYS));
+               helpMenu.add(makeMenuItem(FunctionLibrary.FUNCTION_ABOUT));
+               helpMenu.add(makeMenuItem(FunctionLibrary.FUNCTION_CHECK_VERSION));
                menubar.add(helpMenu);
 
                return menubar;
        }
 
+       /**
+        * Convenience method for making a menu item using a function
+        * @param inFunction function
+        * @param inEnabled flag to specify initial enabled state
+        * @return menu item using localized name of function
+        */
+       private static JMenuItem makeMenuItem(GenericFunction inFunction, boolean inEnabled)
+       {
+               JMenuItem item = makeMenuItem(inFunction);
+               item.setEnabled(inEnabled);
+               return item;
+       }
+
        /**
         * Convenience method for making a menu item using a function
         * @param inFunction function
@@ -658,7 +733,9 @@ public class MenuManager implements DataSubscriber
                        if (code >= 0 && code < 26)
                        {
                                // Found a valid code between A and Z
-                               inMenuItem.setAccelerator(KeyStroke.getKeyStroke(KEY_EVENTS[code], InputEvent.CTRL_DOWN_MASK));
+                               inMenuItem.setAccelerator(KeyStroke.getKeyStroke(KEY_EVENTS[code],
+                                       Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
+                               // use platform-specific key mask so Ctrl on Linux/Win, Clover on Mac
                        }
                }
        }
@@ -672,7 +749,7 @@ public class MenuManager implements DataSubscriber
                JToolBar toolbar = new JToolBar();
                // Add text file
                JButton openFileButton = new JButton(IconManager.getImageIcon(IconManager.OPEN_FILE));
-               openFileButton.setToolTipText(I18nManager.getText("menu.file.open"));
+               openFileButton.setToolTipText(I18nManager.getText("function.open"));
                openFileButton.addActionListener(_openFileAction);
                toolbar.add(openFileButton);
                // Add photo
@@ -688,44 +765,63 @@ public class MenuManager implements DataSubscriber
                toolbar.add(_saveButton);
                // Undo
                _undoButton = new JButton(IconManager.getImageIcon(IconManager.UNDO));
-               _undoButton.setToolTipText(I18nManager.getText("menu.edit.undo"));
+               _undoButton.setToolTipText(I18nManager.getText("menu.track.undo"));
                _undoButton.addActionListener(_undoAction);
                _undoButton.setEnabled(false);
                toolbar.add(_undoButton);
                // Edit point
                _editPointButton = new JButton(IconManager.getImageIcon(IconManager.EDIT_POINT));
-               _editPointButton.setToolTipText(I18nManager.getText("menu.edit.editpoint"));
+               _editPointButton.setToolTipText(I18nManager.getText("menu.point.editpoint"));
                _editPointButton.addActionListener(_editPointAction);
                _editPointButton.setEnabled(false);
                toolbar.add(_editPointButton);
                // Delete point
                _deletePointButton = new JButton(IconManager.getImageIcon(IconManager.DELETE_POINT));
-               _deletePointButton.setToolTipText(I18nManager.getText("menu.edit.deletepoint"));
+               _deletePointButton.setToolTipText(I18nManager.getText("menu.point.deletepoint"));
                _deletePointButton.addActionListener(_deletePointAction);
                _deletePointButton.setEnabled(false);
                toolbar.add(_deletePointButton);
                // Delete range
                _deleteRangeButton = new JButton(IconManager.getImageIcon(IconManager.DELETE_RANGE));
-               _deleteRangeButton.setToolTipText(I18nManager.getText("menu.edit.deleterange"));
-               _deleteRangeButton.addActionListener(_deleteRangeAction);
+               _deleteRangeButton.setToolTipText(I18nManager.getText("function.deleterange"));
+               _deleteRangeButton.addActionListener(new ActionListener() {
+                       public void actionPerformed(ActionEvent arg0) {
+                               FunctionLibrary.FUNCTION_DELETE_RANGE.begin();
+                       }
+               });
                _deleteRangeButton.setEnabled(false);
                toolbar.add(_deleteRangeButton);
+               // Cut and move
+               _cutAndMoveButton = new JButton(IconManager.getImageIcon(IconManager.CUT_AND_MOVE));
+               _cutAndMoveButton.setToolTipText(I18nManager.getText("menu.range.cutandmove"));
+               _cutAndMoveButton.addActionListener(new ActionListener() {
+                       public void actionPerformed(ActionEvent arg0) {
+                               _app.cutAndMoveSelection();
+                       }
+               });
+               _cutAndMoveButton.setEnabled(false);
+               toolbar.add(_cutAndMoveButton);
                // Select start, end
                _selectStartButton = new JButton(IconManager.getImageIcon(IconManager.SET_RANGE_START));
-               _selectStartButton.setToolTipText(I18nManager.getText("menu.select.start"));
+               _selectStartButton.setToolTipText(I18nManager.getText("menu.range.start"));
                _selectStartButton.addActionListener(_selectStartAction);
                _selectStartButton.setEnabled(false);
                toolbar.add(_selectStartButton);
                _selectEndButton = new JButton(IconManager.getImageIcon(IconManager.SET_RANGE_END));
-               _selectEndButton.setToolTipText(I18nManager.getText("menu.select.end"));
+               _selectEndButton.setToolTipText(I18nManager.getText("menu.range.end"));
                _selectEndButton.addActionListener(_selectEndAction);
                _selectEndButton.setEnabled(false);
                toolbar.add(_selectEndButton);
-               _connectPhotoButton = new JButton(IconManager.getImageIcon(IconManager.CONNECT_PHOTO));
-               _connectPhotoButton.setToolTipText(I18nManager.getText("menu.photo.connect"));
-               _connectPhotoButton.addActionListener(_connectPhotoAction);
-               _connectPhotoButton.setEnabled(false);
-               toolbar.add(_connectPhotoButton);
+               // Connect to point
+               _connectButton = new JButton(IconManager.getImageIcon(IconManager.CONNECT_PHOTO));
+               _connectButton.setToolTipText(I18nManager.getText(FunctionLibrary.FUNCTION_CONNECT_TO_POINT.getNameKey()));
+               _connectButton.addActionListener(new ActionListener() {
+                       public void actionPerformed(ActionEvent arg0) {
+                               FunctionLibrary.FUNCTION_CONNECT_TO_POINT.begin();
+                       }
+               });
+               _connectButton.setEnabled(false);
+               toolbar.add(_connectButton);
                // finish off
                toolbar.setFloatable(false);
                return toolbar;
@@ -751,32 +847,54 @@ public class MenuManager implements DataSubscriber
         */
        public void dataUpdated(byte inUpdateType)
        {
-               boolean hasData = (_track != null && _track.getNumPoints() > 0);
+               final boolean hasData = _track != null && _track.getNumPoints() > 0;
+               final boolean hasMultiplePoints = hasData && _track.getNumPoints() > 1;
+
                // set functions which require data
                _sendGpsItem.setEnabled(hasData);
                _saveItem.setEnabled(hasData);
                _saveButton.setEnabled(hasData);
                _exportKmlItem.setEnabled(hasData);
                _exportGpxItem.setEnabled(hasData);
-               _exportPovItem.setEnabled(hasData);
+               _exportPovItem.setEnabled(hasMultiplePoints);
+               _exportImageItem.setEnabled(hasMultiplePoints);
                _compressItem.setEnabled(hasData);
+               _markRectangleItem.setEnabled(hasData);
+               _markUphillLiftsItem.setEnabled(hasData && _track.hasAltitudeData());
                _deleteMarkedPointsItem.setEnabled(hasData && _track.hasMarkedPoints());
-               _rearrangeMenu.setEnabled(hasData && _track.hasTrackPoints() && _track.hasWaypoints());
+               _rearrangeWaypointsItem.setEnabled(hasData && _track.hasTrackPoints() && _track.hasWaypoints());
+               final boolean hasSeveralTrackPoints = hasData && _track.hasTrackPoints() && _track.getNumPoints() > 3;
+               _splitSegmentsItem.setEnabled(hasSeveralTrackPoints);
+               _sewSegmentsItem.setEnabled(hasSeveralTrackPoints);
+               _createMarkerWaypointsItem.setEnabled(hasSeveralTrackPoints);
                _selectAllItem.setEnabled(hasData);
                _selectNoneItem.setEnabled(hasData);
-               _show3dItem.setEnabled(hasData);
+               _show3dItem.setEnabled(hasMultiplePoints);
                _chartItem.setEnabled(hasData);
                _browserMapMenu.setEnabled(hasData);
                _distanceItem.setEnabled(hasData);
+               _autoplayTrack.setEnabled(hasData && _track.getNumPoints() > 3);
                _getGpsiesItem.setEnabled(hasData);
+               _uploadGpsiesItem.setEnabled(hasData && _track.hasTrackPoints());
+               _lookupSrtmItem.setEnabled(hasData);
+               _nearbyWikipediaItem.setEnabled(hasData);
+               _nearbyOsmPoiItem.setEnabled(hasData);
+               _downloadOsmItem.setEnabled(hasData);
+               _getWeatherItem.setEnabled(hasData);
                _findWaypointItem.setEnabled(hasData && _track.hasWaypoints());
+               // have we got a cache?
+               _downloadSrtmItem.setEnabled(hasData && Config.getConfigString(Config.KEY_DISK_CACHE) != null);
+               // have we got any timestamps?
+               _deleteByDateItem.setEnabled(hasData && _track.hasData(Field.TIMESTAMP));
+
                // is undo available?
                boolean hasUndo = !_app.getUndoStack().isEmpty();
                _undoItem.setEnabled(hasUndo);
                _undoButton.setEnabled(hasUndo);
                _clearUndoItem.setEnabled(hasUndo);
                // is there a current point?
-               boolean hasPoint = (hasData && _selection.getCurrentPointIndex() >= 0);
+               DataPoint currPoint = _app.getTrackInfo().getCurrentPoint();
+               boolean hasPoint = (currPoint != null);
                _editPointItem.setEnabled(hasPoint);
                _editPointButton.setEnabled(hasPoint);
                _editWaypointNameItem.setEnabled(hasPoint);
@@ -787,46 +905,104 @@ public class MenuManager implements DataSubscriber
                _selectEndItem.setEnabled(hasPoint);
                _selectEndButton.setEnabled(hasPoint);
                _duplicatePointItem.setEnabled(hasPoint);
+               _showPeakfinderItem.setEnabled(hasPoint);
+               _showGeohackItem.setEnabled(hasPoint);
+               _searchOpencachingDeItem.setEnabled(hasPoint);
+               _searchMapillaryItem.setEnabled(hasPoint);
+               // is it a waypoint?
+               _selectSegmentItem.setEnabled(hasPoint && !currPoint.isWaypoint());
                // are there any photos?
-               boolean anyPhotos = _photos != null && _photos.getNumPhotos() > 0;
-               _saveExifItem.setEnabled(anyPhotos);
-               // is there a current photo?
-               boolean hasPhoto = anyPhotos && _selection.getCurrentPhotoIndex() >= 0;
-               // connect is available if photo and point selected, and photo has no point
-               Photo currentPhoto = _photos.getPhoto(_selection.getCurrentPhotoIndex());
-               boolean connectAvailable = hasPhoto && hasPoint && currentPhoto != null
-                       && currentPhoto.getDataPoint() == null;
-               _connectPhotoItem.setEnabled(connectAvailable);
-               _connectPhotoButton.setEnabled(connectAvailable);
-               _disconnectPhotoItem.setEnabled(hasPhoto && currentPhoto != null && currentPhoto.getDataPoint() != null);
+               boolean anyPhotos = _app.getTrackInfo().getPhotoList().getNumPhotos() > 0;
+               _saveExifItem.setEnabled(anyPhotos && _app.getTrackInfo().getPhotoList().hasMediaWithFile());
+               // is there a current photo, audio?
+               Photo currentPhoto = _app.getTrackInfo().getCurrentPhoto();
+               boolean hasPhoto = currentPhoto != null;
+               AudioClip currentAudio = _app.getTrackInfo().getCurrentAudio();
+               boolean hasAudio = currentAudio != null;
+               // connect is available if (photo/audio) and point selected, and media has no point
+               boolean connectAvailable = (hasPhoto && hasPoint && currentPhoto.getDataPoint() == null)
+                       || (hasAudio && hasPoint && currentAudio.getDataPoint() == null);
+               _connectPhotoItem.setEnabled(hasPhoto && hasPoint && currentPhoto.getDataPoint() == null);
+               _connectButton.setEnabled(connectAvailable);
+               _disconnectPhotoItem.setEnabled(hasPhoto && currentPhoto.getDataPoint() != null);
                _correlatePhotosItem.setEnabled(anyPhotos && hasData);
-               _rearrangePhotosItem.setEnabled(anyPhotos && hasData && _track.getNumPoints() > 1);
-               _deletePhotoItem.setEnabled(hasPhoto);
+               _rearrangePhotosItem.setEnabled(anyPhotos && hasMultiplePoints);
+               _removePhotoItem.setEnabled(hasPhoto);
                _rotatePhotoLeft.setEnabled(hasPhoto);
                _rotatePhotoRight.setEnabled(hasPhoto);
-               _ignoreExifThumb.setEnabled(hasPhoto && currentPhoto != null && currentPhoto.getExifThumbnail() != null);
+               _photoPopupItem.setEnabled(hasPhoto);
+               _ignoreExifThumb.setEnabled(hasPhoto && currentPhoto.getExifThumbnail() != null);
+               _selectNoPhotoItem.setEnabled(hasPhoto);
+               boolean anyAudios = _app.getTrackInfo().getAudioList().getNumAudios() > 0;
+               _selectNoAudioItem.setEnabled(hasAudio);
+               _removeAudioItem.setEnabled(hasAudio);
+               _connectAudioItem.setEnabled(hasAudio && hasPoint && currentAudio.getDataPoint() == null);
+               _disconnectAudioItem.setEnabled(hasAudio && currentAudio.getDataPoint() != null);
+               _correlateAudiosItem.setEnabled(anyAudios && hasData);
                // is there a current range?
                boolean hasRange = (hasData && _selection.hasRangeSelected());
                _deleteRangeItem.setEnabled(hasRange);
                _deleteRangeButton.setEnabled(hasRange);
-               _interpolateItem.setEnabled(hasRange
-                       && (_selection.getEnd() - _selection.getStart()) == 1);
+               _cropTrackItem.setEnabled(hasRange);
+               _interpolateItem.setEnabled(hasRange);
                _averageItem.setEnabled(hasRange);
                _mergeSegmentsItem.setEnabled(hasRange);
                _reverseItem.setEnabled(hasRange);
                _addTimeOffsetItem.setEnabled(hasRange);
                _addAltitudeOffsetItem.setEnabled(hasRange);
                _convertNamesToTimesItem.setEnabled(hasRange && _track.hasWaypoints());
+               _deleteFieldValuesItem.setEnabled(hasRange);
                _fullRangeDetailsItem.setEnabled(hasRange);
+               _estimateTimeItem.setEnabled(hasRange);
+               _learnEstimationParams.setEnabled(hasData && _track.hasTrackPoints() && _track.hasData(Field.TIMESTAMP)
+                       && _track.hasAltitudeData());
                // Is the currently selected point outside the current range?
-               _cutAndMoveItem.setEnabled(hasRange && hasPoint &&
+               boolean canCutAndMove = hasRange && hasPoint &&
                        (_selection.getCurrentPointIndex() < _selection.getStart()
-                               || _selection.getCurrentPointIndex() > (_selection.getEnd()+1)));
+                       || _selection.getCurrentPointIndex() > (_selection.getEnd()+1));
+               _cutAndMoveItem.setEnabled(canCutAndMove);
+               _cutAndMoveButton.setEnabled(canCutAndMove);
                // Has the map been switched on/off?
                boolean mapsOn = Config.getConfigBoolean(Config.KEY_SHOW_MAP);
                if (_mapCheckbox.isSelected() != mapsOn) {
                        _mapCheckbox.setSelected(mapsOn);
                }
+               // Are there any recently-used files?
+               RecentFileList rfl = Config.getRecentFileList();
+               final int numRecentFiles = rfl.getNumEntries();
+               final boolean hasRecentFiles = numRecentFiles > 0;
+               _recentFileMenu.setEnabled(hasRecentFiles);
+               if (hasRecentFiles)
+               {
+                       int numItems = _recentFileMenu.getMenuComponentCount();
+                       if (numItems == numRecentFiles)
+                       {
+                               // Right number of items, just change texts
+                               for (int i=0; i<numRecentFiles; i++)
+                               {
+                                       JMenuItem item = _recentFileMenu.getItem(i);
+                                       RecentFile rf = rfl.getFile(i);
+                                       item.setText(rf==null?"":rf.getFile().getName());
+                                       item.setToolTipText(rf==null?null:rf.getFile().getAbsolutePath());
+                               }
+                       }
+                       else
+                       {
+                               // Rebuild menus
+                               _recentFileMenu.removeAll();
+                               for (int i=0; i<rfl.getSize(); i++)
+                               {
+                                       RecentFile rf = rfl.getFile(i);
+                                       if (rf != null && rf.isValid())
+                                       {
+                                               JMenuItem menuItem = new JMenuItem(rf.getFile().getName());
+                                               menuItem.setToolTipText(rf.getFile().getAbsolutePath());
+                                               menuItem.addActionListener(new RecentFileTrigger(_app, i));
+                                               _recentFileMenu.add(menuItem);
+                                       }
+                               }
+                       }
+               }
        }