X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlightUI.java;h=533b1951f7c5cfdcb28840cc819d50c333a50e2a;hp=dcf852776a0904f4dd78850bb9300c3056440b6c;hb=3fe5c2f9fc01258d45c20070e9874d76bc6c8c07;hpb=8610fdae8f47e1e8b6e8525227cc912664ecfafd

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index dcf85277..533b1951 100644
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -20,28 +20,8 @@ package altosui;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
-import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
 import java.util.concurrent.*;
-
-class AltosFlightStatusUpdate implements ActionListener {
-
-	public AltosState	saved_state;
-	AltosFlightStatus	flightStatus;
-
-	public void actionPerformed (ActionEvent e) {
-		if (saved_state != null)
-			flightStatus.show(saved_state, 0);
-	}
-
-	public AltosFlightStatusUpdate (AltosFlightStatus in_flightStatus) {
-		flightStatus = in_flightStatus;
-	}
-}
+import org.altusmetrum.AltosLib.*;
 
 public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, AltosFontListener {
 	AltosVoice		voice;
@@ -169,11 +149,12 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 	Container	bag;
 	AltosFreqList	frequencies;
 	JComboBox	telemetries;
+	JLabel		telemetry;
 
 	ActionListener	show_timer;
 
 	public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
-		AltosPreferences.set_component(this);
+		AltosUIPreferences.set_component(this);
 
 		voice = in_voice;
 		reader = in_reader;
@@ -183,16 +164,12 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 
 		GridBagConstraints c = new GridBagConstraints();
 
-		java.net.URL imgURL = AltosUI.class.getResource("/altus-metrum-16x16.jpg");
-		if (imgURL != null)
-			setIconImage(new ImageIcon(imgURL).getImage());
-
 		setTitle(String.format("AltOS %s", reader.name));
 
 		/* Stick channel selector at top of table for telemetry monitoring */
 		if (serial >= 0) {
 			// Channel menu
-			frequencies = new AltosFreqList(AltosPreferences.frequency(serial));
+			frequencies = new AltosFreqList(AltosUIPreferences.frequency(serial));
 			frequencies.set_product("Monitor");
 			frequencies.set_serial(serial);
 			frequencies.addActionListener(new ActionListener() {
@@ -216,32 +193,53 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 			bag.add (frequencies, c);
 
 			// Telemetry format menu
-			telemetries = new JComboBox();
-			for (int i = 1; i <= Altos.ao_telemetry_max; i++)
-				telemetries.addItem(Altos.telemetry_name(i));
-			int telemetry = AltosPreferences.telemetry(serial);
-			if (telemetry <= Altos.ao_telemetry_off ||
-			    telemetry > Altos.ao_telemetry_max)
-				telemetry = Altos.ao_telemetry_standard;
-			telemetries.setSelectedIndex(telemetry - 1);
-			telemetries.setMaximumRowCount(Altos.ao_telemetry_max);
-			telemetries.setPreferredSize(null);
-			telemetries.revalidate();
-			telemetries.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						int telemetry = telemetries.getSelectedIndex() + 1;
-						reader.set_telemetry(telemetry);
-						reader.save_telemetry();
-					}
-				});
-			c.gridx = 1;
-			c.gridy = 0;
-			c.weightx = 0;
-			c.weighty = 0;
-			c.fill = GridBagConstraints.NONE;
-			c.anchor = GridBagConstraints.WEST;
-			bag.add (telemetries, c);
-			c.insets = new Insets(0, 0, 0, 0);
+			if (reader.supports_telemetry(Altos.ao_telemetry_standard)) {
+				telemetries = new JComboBox();
+				for (int i = 1; i <= Altos.ao_telemetry_max; i++) 
+					telemetries.addItem(Altos.telemetry_name(i));
+				int telemetry = AltosPreferences.telemetry(serial);
+				if (telemetry <= Altos.ao_telemetry_off ||
+				    telemetry > Altos.ao_telemetry_max)
+					telemetry = Altos.ao_telemetry_standard;
+				telemetries.setSelectedIndex(telemetry - 1);
+				telemetries.setMaximumRowCount(Altos.ao_telemetry_max);
+				telemetries.setPreferredSize(null);
+				telemetries.revalidate();
+				telemetries.addActionListener(new ActionListener() {
+						public void actionPerformed(ActionEvent e) {
+							int telemetry = telemetries.getSelectedIndex() + 1;
+							reader.set_telemetry(telemetry);
+							reader.save_telemetry();
+						}
+					});
+				c.gridx = 1;
+				c.gridy = 0;
+				c.weightx = 0;
+				c.weighty = 0;
+				c.fill = GridBagConstraints.NONE;
+				c.anchor = GridBagConstraints.WEST;
+				bag.add (telemetries, c);
+				c.insets = new Insets(0, 0, 0, 0);
+			} else {
+				String	version;
+
+				if (reader.supports_telemetry(Altos.ao_telemetry_0_9))
+					version = "Telemetry: 0.9";
+				else if (reader.supports_telemetry(Altos.ao_telemetry_0_8))
+					version = "Telemetry: 0.8";
+				else
+					version = "Telemetry: None";
+
+				telemetry = new JLabel(version);
+				c.gridx = 1;
+				c.gridy = 0;
+				c.weightx = 0;
+				c.weighty = 0;
+				c.fill = GridBagConstraints.NONE;
+				c.anchor = GridBagConstraints.WEST;
+				bag.add (telemetry, c);
+				c.insets = new Insets(0, 0, 0, 0);
+			}
 		}
 
 		/* Flight status is always visible */
@@ -291,7 +289,7 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 
-		AltosPreferences.register_font_listener(this);
+		AltosUIPreferences.register_font_listener(this);
 
 		addWindowListener(new WindowAdapter() {
 				@Override
@@ -299,7 +297,7 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 					disconnect();
 					setVisible(false);
 					dispose();
-					AltosPreferences.unregister_font_listener(AltosFlightUI.this);
+					AltosUIPreferences.unregister_font_listener(AltosFlightUI.this);
 					if (exit_on_close)
 						System.exit(0);
 				}