X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosUI.java;h=70142a93b5d3beeb6d7e0a8c75b8308e31800273;hp=52b6b128c16bf411b7a3521d1aa2749ee6697c79;hb=1ed6b13e87c1cc2d6618b6ba3a293ea6e3b5752e;hpb=08345b8909922f2ff8f9ed8b4497b9cbea6b26e9

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 52b6b128..70142a93 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -23,8 +23,9 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altosuilib.*;
 
-public class AltosUI extends AltosFrame {
+public class AltosUI extends AltosUIFrame {
 	public AltosVoice voice = new AltosVoice();
 
 	public static boolean load_library(Frame frame) {
@@ -98,7 +99,6 @@ public class AltosUI extends AltosFrame {
 
 		load_library(null);
 
-		AltosUIPreferences.init(new AltosUIPreferencesBackend());
 		AltosUIPreferences.set_component(this);
 
 		pane = getContentPane();
@@ -242,7 +242,7 @@ public class AltosUI extends AltosFrame {
 	}
 
 	private void ConnectToDevice() {
-		AltosDevice	device = AltosDeviceDialog.show(AltosUI.this,
+		AltosDevice	device = AltosDeviceUIDialog.show(AltosUI.this,
 								Altos.product_basestation);
 
 		if (device != null)
@@ -445,6 +445,8 @@ public class AltosUI extends AltosFrame {
 		//AltosReplayReader reader;
 		if (file.getName().endsWith("eeprom")) {
 			recs = new AltosEepromIterable(in);
+		} else if (file.getName().endsWith("mega")) {
+			recs = new AltosEepromMegaIterable(in);
 		} else {
 			recs = new AltosTelemetryIterable(in);
 		}