X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlightUI.java;h=f2bd70a0c5b44e10b9c10b7952b44d3ca1b73940;hp=aac4c9b0c655c638bc5e19d0dff5709d32beac62;hb=db2443fdbf65b65703217174303027c439124a83;hpb=9cb10d73fee0e3f36c778fd2a9c9992b87669fe2

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index aac4c9b0..f2bd70a0 100644
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -21,10 +21,10 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
-public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener {
+public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 	AltosVoice		voice;
 	AltosFlightReader	reader;
 	AltosDisplayThread	thread;
@@ -37,7 +37,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 	AltosDescent	descent;
 	AltosLanded	landed;
 	AltosCompanionInfo	companion;
-	AltosSiteMap    sitemap;
+	AltosUIMap      sitemap;
 	boolean		has_map;
 	boolean		has_companion;
 	boolean		has_state;
@@ -83,22 +83,29 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 		sitemap.reset();
 	}
 
-	public void set_font() {
-		pad.set_font();
-		ignitor.set_font();
-		ascent.set_font();
-		descent.set_font();
-		landed.set_font();
-		flightStatus.set_font();
-		flightInfo.set_font();
-		sitemap.set_font();
-		companion.set_font();
-	}
-
 	public void font_size_changed(int font_size) {
-		set_font();
+		pad.font_size_changed(font_size);
+		ignitor.font_size_changed(font_size);
+		ascent.font_size_changed(font_size);
+		descent.font_size_changed(font_size);
+		landed.font_size_changed(font_size);
+		flightStatus.font_size_changed(font_size);
+		flightInfo.font_size_changed(font_size);
+		sitemap.font_size_changed(font_size);
+		companion.font_size_changed(font_size);
 	}
 
+	public void units_changed(boolean imperial_units) {
+		pad.units_changed(imperial_units);
+		ignitor.units_changed(imperial_units);
+		ascent.units_changed(imperial_units);
+		descent.units_changed(imperial_units);
+		landed.units_changed(imperial_units);
+		flightStatus.units_changed(imperial_units);
+		flightInfo.units_changed(imperial_units);
+		sitemap.units_changed(imperial_units);
+		companion.units_changed(imperial_units);
+	}
 
 	AltosFlightStatusUpdate	status_update;
 
@@ -179,7 +186,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 
 	Container	bag;
 	AltosFreqList	frequencies;
-	JComboBox	telemetries;
+	JComboBox<String>	telemetries;
 	JLabel		telemetry;
 
 	ActionListener	show_timer;
@@ -225,8 +232,8 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 
 			// Telemetry format menu
 			if (reader.supports_telemetry(Altos.ao_telemetry_standard)) {
-				telemetries = new JComboBox();
-				for (int i = 1; i <= Altos.ao_telemetry_max; i++) 
+				telemetries = new JComboBox<String>();
+				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 ||
@@ -303,7 +310,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 		has_companion = false;
 		has_state = false;
 
-		sitemap = new AltosSiteMap();
+		sitemap = new AltosUIMap();
 		has_map = false;
 
 		/* Make the tabbed pane use the rest of the window space */
@@ -318,6 +325,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 
 		AltosUIPreferences.register_font_listener(this);
+		AltosPreferences.register_units_listener(this);
 
 		addWindowListener(new WindowAdapter() {
 				@Override
@@ -326,6 +334,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 					setVisible(false);
 					dispose();
 					AltosUIPreferences.unregister_font_listener(AltosFlightUI.this);
+					AltosPreferences.unregister_units_listener(AltosFlightUI.this);
 					if (exit_on_close)
 						System.exit(0);
 				}