X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Ftim%2Fprune%2Fgui%2FMenuManager.java;fp=src%2Ftim%2Fprune%2Fgui%2FMenuManager.java;h=ed8474ca9b1d41978e9154e9d057c1f72aa20b44;hb=9b2386d166007f68fefcaba8c27a1eefcd67af8b;hp=d289b7828fca0086eacf58a6ce74275b1471c786;hpb=8b20e3e027058cdf6ff52993ee5576193d08667a;p=GpsPrune.git

diff --git a/src/tim/prune/gui/MenuManager.java b/src/tim/prune/gui/MenuManager.java
index d289b78..ed8474c 100644
--- a/src/tim/prune/gui/MenuManager.java
+++ b/src/tim/prune/gui/MenuManager.java
@@ -37,6 +37,10 @@ import tim.prune.function.SearchOpenCachingDeFunction;
 import tim.prune.function.browser.UrlGenerator;
 import tim.prune.function.browser.WebMapFunction;
 import tim.prune.function.search.SearchMapillaryFunction;
+import tim.prune.function.srtm.DownloadSrtmFunction;
+import tim.prune.function.srtm.SrtmGl1Source;
+import tim.prune.function.srtm.Srtm3Source;
+import tim.prune.function.srtm.SrtmViewfinderSource;
 import tim.prune.function.settings.SaveConfig;
 
 /**
@@ -82,6 +86,7 @@ public class MenuManager implements DataSubscriber
 	private JMenuItem _reverseItem = null;
 	private JMenuItem _addTimeOffsetItem = null;
 	private JMenuItem _addAltitudeOffsetItem = null;
+	private JMenuItem _removeAltitudesItem = null;
 	private JMenuItem _mergeSegmentsItem = null;
 	private JMenuItem _rearrangeWaypointsItem = null;
 	private JMenuItem _splitSegmentsItem = null;
@@ -96,7 +101,7 @@ public class MenuManager implements DataSubscriber
 	private JMenuItem _routingGraphHopperItem = null;
 	private JMenuItem _chartItem = null;
 	private JMenuItem _lookupSrtmItem = null;
-	private JMenuItem _downloadSrtmItem = null;
+	private JMenu     _downloadSrtmMenu = null;
 	private JMenuItem _nearbyWikipediaItem = null;
 	private JMenuItem _nearbyOsmPoiItem = null;
 	private JMenuItem _showPeakfinderItem = null;
@@ -260,8 +265,16 @@ public class MenuManager implements DataSubscriber
 		// SRTM
 		_lookupSrtmItem = makeMenuItem(FunctionLibrary.FUNCTION_LOOKUP_SRTM, false);
 		onlineMenu.add(_lookupSrtmItem);
-		_downloadSrtmItem = makeMenuItem(FunctionLibrary.FUNCTION_DOWNLOAD_SRTM, false);
-		onlineMenu.add(_downloadSrtmItem);
+		// Download SRTM sub-menu
+		_downloadSrtmMenu = new JMenu(I18nManager.getText("function.downloadsrtm"));
+		_downloadSrtmMenu.setEnabled(false);
+		JMenuItem downloadStrmGl1Item = makeMenuItem(new DownloadSrtmFunction(_app, new SrtmGl1Source()));
+		_downloadSrtmMenu.add(downloadStrmGl1Item);
+		JMenuItem downloadStrmViewfinderItem = makeMenuItem(new DownloadSrtmFunction(_app, new SrtmViewfinderSource()));
+		_downloadSrtmMenu.add(downloadStrmViewfinderItem);
+		JMenuItem downloadStrm3Item = makeMenuItem(new DownloadSrtmFunction(_app, new Srtm3Source()));
+		_downloadSrtmMenu.add(downloadStrm3Item);
+		onlineMenu.add(_downloadSrtmMenu);
 
 		onlineMenu.addSeparator();
 		// browser submenu
@@ -422,6 +435,8 @@ public class MenuManager implements DataSubscriber
 		rangeMenu.add(_addTimeOffsetItem);
 		_addAltitudeOffsetItem = makeMenuItem(FunctionLibrary.FUNCTION_ADD_ALTITUDE_OFFSET, false);
 		rangeMenu.add(_addAltitudeOffsetItem);
+		_removeAltitudesItem = makeMenuItem(FunctionLibrary.FUNCTION_REMOVE_ALTITUDES, false);
+		rangeMenu.add(_removeAltitudesItem);
 		_mergeSegmentsItem = new JMenuItem(I18nManager.getText("menu.range.mergetracksegments"));
 		_mergeSegmentsItem.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
@@ -656,6 +671,8 @@ public class MenuManager implements DataSubscriber
 		settingsMenu.add(makeMenuItem(new ChooseSingleParameter(_app, FunctionLibrary.FUNCTION_SET_ALTITUDE_TOLERANCE)));
 		// Set timezone
 		settingsMenu.add(makeMenuItem(FunctionLibrary.FUNCTION_SET_TIMEZONE));
+		// Set Earthdata authentication
+		settingsMenu.add(makeMenuItem(FunctionLibrary.FUNCTION_SET_EARTHDATA_AUTH));
 		settingsMenu.addSeparator();
 		// Save configuration
 		settingsMenu.add(makeMenuItem(FunctionLibrary.FUNCTION_SAVECONFIG));
@@ -895,7 +912,7 @@ public class MenuManager implements DataSubscriber
 		_getWeatherItem.setEnabled(hasData);
 		_findWaypointItem.setEnabled(hasData && _track.hasWaypoints());
 		// have we got a cache?
-		_downloadSrtmItem.setEnabled(hasData && Config.getConfigString(Config.KEY_DISK_CACHE) != null);
+		_downloadSrtmMenu.setEnabled(hasData && Config.getConfigString(Config.KEY_DISK_CACHE) != null);
 		// have we got any timestamps?
 		_deleteByDateItem.setEnabled(hasData && _track.hasData(Field.TIMESTAMP));
 
@@ -963,6 +980,7 @@ public class MenuManager implements DataSubscriber
 		_reverseItem.setEnabled(hasRange);
 		_addTimeOffsetItem.setEnabled(hasRange);
 		_addAltitudeOffsetItem.setEnabled(hasRange);
+		_removeAltitudesItem.setEnabled(hasRange);
 		_convertNamesToTimesItem.setEnabled(hasRange && _track.hasWaypoints());
 		_deleteFieldValuesItem.setEnabled(hasRange);
 		_viewFullDetailsItem.setEnabled(hasRange || hasPoint);