import tim.prune.data.Track;
import tim.prune.data.TrackInfo;
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,
private JMenuItem _exportKmlItem = null;
private JMenuItem _exportGpxItem = null;
private JMenuItem _exportPovItem = null;
- private JMenuItem _exportSvgItem = null;
private JMenuItem _exportImageItem = null;
private JMenu _recentFileMenu = null;
private JMenuItem _undoItem = 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 _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 _routingGraphHopperItem = null;
private JMenuItem _chartItem = null;
private JMenuItem _getGpsiesItem = null;
private JMenuItem _uploadGpsiesItem = null;
private JMenuItem _lookupSrtmItem = null;
private JMenuItem _downloadSrtmItem = null;
- private JMenuItem _lookupWikipediaItem = 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;
// Pov
_exportPovItem = makeMenuItem(FunctionLibrary.FUNCTION_POVEXPORT, false);
fileMenu.add(_exportPovItem);
- // Svg
- _exportSvgItem = makeMenuItem(FunctionLibrary.FUNCTION_SVGEXPORT, false);
- fileMenu.add(_exportSvgItem);
// Image
_exportImageItem = makeMenuItem(FunctionLibrary.FUNCTION_IMAGEEXPORT, false);
fileMenu.add(_exportImageItem);
// Upload to gpsies
_uploadGpsiesItem = makeMenuItem(FunctionLibrary.FUNCTION_UPLOAD_GPSIES, false);
onlineMenu.add(_uploadGpsiesItem);
+
onlineMenu.addSeparator();
- _lookupWikipediaItem = makeMenuItem(FunctionLibrary.FUNCTION_LOOKUP_WIKIPEDIA, false);
- onlineMenu.add(_lookupWikipediaItem);
+ // 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);
+ JMenuItem inlineMapItem = makeMenuItem(new WebMapFunction(_app, UrlGenerator.WebService.MAP_SOURCE_INLINESKATE, "menu.view.browser.inlinemap"));
+ _browserMapMenu.add(inlineMapItem);
+ _routingGraphHopperItem = makeMenuItem(new WebMapFunction(_app, UrlGenerator.WebService.MAP_SOURCE_GRAPHHOPPER, "menu.view.browser.graphhopper"));
+ _browserMapMenu.add(_routingGraphHopperItem);
+ 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);
- onlineMenu.addSeparator();
_getWeatherItem = makeMenuItem(FunctionLibrary.FUNCTION_GET_WEATHER_FORECAST, false);
onlineMenu.add(_getWeatherItem);
menubar.add(onlineMenu);
trackMenu.add(_clearUndoItem);
trackMenu.addSeparator();
_compressItem = makeMenuItem(FunctionLibrary.FUNCTION_COMPRESS, false);
- setShortcut(_compressItem, "shortcut.menu.edit.compress");
+ setShortcut(_compressItem, "shortcut.menu.track.compress");
trackMenu.add(_compressItem);
_markRectangleItem = new JMenuItem(I18nManager.getText("menu.track.markrectangle"));
_markRectangleItem.addActionListener(new ActionListener() {
});
_markRectangleItem.setEnabled(false);
trackMenu.add(_markRectangleItem);
- _deleteMarkedPointsItem = new JMenuItem(I18nManager.getText("menu.track.deletemarked"));
- _deleteMarkedPointsItem.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- _app.finishCompressTrack();
- }
- });
- _deleteMarkedPointsItem.setEnabled(false);
+ _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);
// 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);
};
_editPointItem.addActionListener(_editPointAction);
_editPointItem.setEnabled(false);
+ setShortcut(_editPointItem, "shortcut.menu.point.edit");
pointMenu.add(_editPointItem);
_editWaypointNameItem = makeMenuItem(FunctionLibrary.FUNCTION_EDIT_WAYPOINT_NAME, false);
pointMenu.add(_editWaypointNameItem);
// 3d
_show3dItem = makeMenuItem(FunctionLibrary.FUNCTION_3D, 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);
- }
- });
- _browserMapMenu.add(bingMapsItem);
- viewMenu.add(_browserMapMenu);
// Charts
_chartItem = makeMenuItem(FunctionLibrary.FUNCTION_CHARTS, false);
viewMenu.add(_chartItem);
// 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
settingsMenu.add(makeMenuItem(FunctionLibrary.FUNCTION_SET_PATHS));
// Set colours
settingsMenu.add(makeMenuItem(FunctionLibrary.FUNCTION_SET_COLOURS));
- // Set line width used for drawing
- settingsMenu.add(makeMenuItem(new ChooseSingleParameter(_app, FunctionLibrary.FUNCTION_SET_LINE_WIDTH)));
+ // display settings
+ JMenuItem setDisplaySettingsItem = makeMenuItem(FunctionLibrary.FUNCTION_SET_DISPLAY_SETTINGS);
+ settingsMenu.add(setDisplaySettingsItem);
// Set language
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
settingsMenu.add(makeMenuItem(FunctionLibrary.FUNCTION_SAVECONFIG));
_exportKmlItem.setEnabled(hasData);
_exportGpxItem.setEnabled(hasData);
_exportPovItem.setEnabled(hasMultiplePoints);
- _exportSvgItem.setEnabled(hasMultiplePoints);
_exportImageItem.setEnabled(hasMultiplePoints);
_compressItem.setEnabled(hasData);
_markRectangleItem.setEnabled(hasData);
+ _markUphillLiftsItem.setEnabled(hasData && _track.hasAltitudeData());
_deleteMarkedPointsItem.setEnabled(hasData && _track.hasMarkedPoints());
_rearrangeWaypointsItem.setEnabled(hasData && _track.hasTrackPoints() && _track.hasWaypoints());
- _splitSegmentsItem.setEnabled(hasData && _track.hasTrackPoints() && _track.getNumPoints() > 3);
- _sewSegmentsItem.setEnabled(hasData && _track.hasTrackPoints() && _track.getNumPoints() > 3);
+ 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(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);
- _lookupWikipediaItem.setEnabled(hasData);
+ _nearbyWikipediaItem.setEnabled(hasData);
+ _nearbyOsmPoiItem.setEnabled(hasData);
_downloadOsmItem.setEnabled(hasData);
_getWeatherItem.setEnabled(hasData);
_findWaypointItem.setEnabled(hasData && _track.hasWaypoints());
_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?
|| _selection.getCurrentPointIndex() > (_selection.getEnd()+1));
_cutAndMoveItem.setEnabled(canCutAndMove);
_cutAndMoveButton.setEnabled(canCutAndMove);
+ final boolean isTrackLengthTwo = hasData && _track.getNumPoints() == 2;
+ _routingGraphHopperItem.setEnabled(isTrackLengthTwo || (hasData && hasRange));
// Has the map been switched on/off?
boolean mapsOn = Config.getConfigBoolean(Config.KEY_SHOW_MAP);
if (_mapCheckbox.isSelected() != mapsOn) {
projects / GpsPrune.git / blobdiff