Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

1 files changed, 20 insertions, 1 deletions

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index abe08a18..b44b9d43 100644
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -28,7 +28,7 @@ import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.*;
 
-public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
+public class AltosFlightUI extends JFrame implements AltosFlightDisplay, AltosFontListener {
 	AltosVoice		voice;
 	AltosFlightReader	reader;
 	AltosDisplayThread	thread;
@@ -83,6 +83,21 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 		sitemap.reset();
 	}
 
+	public void set_font() {
+		pad.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();
+	}
+
 	public void show(AltosState state, int crc_errors) {
 		JComponent tab = which_tab(state);
 		try {
@@ -254,12 +269,16 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 		bag.add(pane, c);
 
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+
+		AltosPreferences.register_font_listener(this);
+
 		addWindowListener(new WindowAdapter() {
 				@Override
 				public void windowClosing(WindowEvent e) {
 					disconnect();
 					setVisible(false);
 					dispose();
+					AltosPreferences.unregister_font_listener(AltosFlightUI.this);
 					if (exit_on_close)
 						System.exit(0);
 				}