Merge remote-tracking branch 'origin/micropeak-logging'

[fw/altos] / altosui / AltosUI.java

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 52b6b128c16bf411b7a3521d1aa2749ee6697c79..70142a93b5d3beeb6d7e0a8c75b8308e31800273 100644 (file)
--- 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);
                }