X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosUI.java;h=a2816a3a6dc4cf7158e28d6273b3a7a298613f73;hb=97663f922e236f4ee7bd08277ca80d419b5cd10f;hp=6993abab92ae2e49bb03cf621f537b56e50f065a;hpb=bdfcc9112c41c494de23594963980a730b625cc4;p=fw%2Faltos

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 6993abab..a2816a3a 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -108,7 +108,7 @@ public class AltosUI extends AltosFrame {
 		if (imgURL != null)
 			setIconImage(new ImageIcon(imgURL).getImage());
 
-		AltosPreferences.set_component(this);
+		AltosUIPreferences.set_component(this);
 
 		pane = getContentPane();
 		gridbag = new GridBagLayout();
@@ -262,9 +262,9 @@ public class AltosUI extends AltosFrame {
 		String	result;
 		result = JOptionPane.showInputDialog(AltosUI.this,
 						     "Configure Callsign",
-						     AltosPreferences.callsign());
+						     AltosUIPreferences.callsign());
 		if (result != null)
-			AltosPreferences.set_callsign(result);
+			AltosUIPreferences.set_callsign(result);
 	}
 
 	void ConfigureTeleMetrum() {
@@ -365,6 +365,8 @@ public class AltosUI extends AltosFrame {
 			in = new FileInputStream(file);
 			if (filename.endsWith("eeprom"))
 				return new AltosEepromIterable(in);
+			else if (filename.endsWith("mega"))
+				return new AltosEepromMegaIterable(in);
 			else
 				return new AltosTelemetryIterable(in);
 		} catch (FileNotFoundException fe) {
@@ -536,7 +538,7 @@ public class AltosUI extends AltosFrame {
 	
 	public static void main(final String[] args) {
 		try {
-			UIManager.setLookAndFeel(AltosPreferences.look_and_feel());
+			UIManager.setLookAndFeel(AltosUIPreferences.look_and_feel());
 		} catch (Exception e) {
 		}
 		/* Handle batch-mode */