X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosUI.java;h=0aa5d03ce142ef1a420b2c45d4d581b9654ac829;hp=ad7964e939a77c4f3ec1914c598395f0e35e4915;hb=7767a045d446ea2bc5fe1ec98d89274155f956c4;hpb=9a4c2c7fc6af922d052e23a1b99bf847fbf9b0e9

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index ad7964e9..0aa5d03c 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -22,8 +22,8 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_4.*;
-import org.altusmetrum.altosuilib_2.*;
+import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altosuilib_3.*;
 
 public class AltosUI extends AltosUIFrame {
 	public AltosVoice voice = new AltosVoice();
@@ -99,10 +99,25 @@ public class AltosUI extends AltosUIFrame {
 		return b;
 	}
 
+	/* OSXAdapter interfaces */
+	public void macosx_file_handler(String path) {
+		process_graph(new File(path));
+	}
+
+	public void macosx_quit_handler() {
+		System.exit(0);
+	}
+
+	public void macosx_preferences_handler() {
+		ConfigureAltosUI();
+	}
+
 	public AltosUI() {
 
 		load_library(null);
 
+		register_for_macosx_events();
+
 		AltosUIPreferences.set_component(this);
 
 		pane = getContentPane();
@@ -280,7 +295,7 @@ public class AltosUI extends AltosUIFrame {
 	}
 
 	void LoadMaps() {
-		new AltosSiteMapPreload(AltosUI.this);
+		new AltosUIMapPreload(AltosUI.this);
 	}
 
 	void LaunchController() {
@@ -306,7 +321,7 @@ public class AltosUI extends AltosUIFrame {
 	 * a TeleDongle over the packet link
 	 */
 	private void SaveFlightData() {
-		new AltosEepromManage(AltosUI.this);
+		new AltosEepromManage(AltosUI.this, AltosLib.product_any);
 	}
 
 	/* Load a flight log file and write out a CSV file containing
@@ -578,7 +593,7 @@ public class AltosUI extends AltosUIFrame {
 					} else {
 						double lat = Double.parseDouble(args[i+1]);
 						double lon = Double.parseDouble(args[i+2]);
-						AltosSiteMap.prefetchMaps(lat, lon);
+//						AltosSiteMap.prefetchMaps(lat, lon);
 						i += 2;
 					}
 				} else if (args[i].equals("--replay"))