Merge tag '1.4' into fox

tagging 1.4 release

Conflicts:
	src/Makefile

1 files changed, 12 insertions, 9 deletions

diff --git a/altosui/AltosIdleMonitorUI.java b/altosui/AltosIdleMonitorUI.java
index 7ca935b6..042111ec 100644
--- a/altosui/AltosIdleMonitorUI.java
+++ b/altosui/AltosIdleMonitorUI.java
@@ -24,10 +24,10 @@ import javax.swing.event.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.Arrays;
-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
-public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener, AltosIdleMonitorListener, DocumentListener {
+public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDisplay, AltosIdleMonitorListener, DocumentListener {
 	AltosDevice		device;
 	JTabbedPane		pane;
 	AltosPad		pad;
@@ -56,13 +56,14 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 		flightInfo.clear();
 	}
 
-	public void set_font() {
-		pad.set_font();
-		flightInfo.set_font();
+	public void font_size_changed(int font_size) {
+		pad.font_size_changed(font_size);
+		flightInfo.font_size_changed(font_size);
 	}
 
-	public void font_size_changed(int font_size) {
-		set_font();
+	public void units_changed(boolean imperial_units) {
+		pad.units_changed(imperial_units);
+		flightInfo.units_changed(imperial_units);
 	}
 
 	AltosFlightStatusUpdate	status_update;
@@ -234,7 +235,9 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 					try {
 						disconnect();
 					} catch (Exception ex) {
-						System.out.println(Arrays.toString(ex.getStackTrace()));
+						System.out.printf("Exception %s\n", ex.toString());
+						for (StackTraceElement el : ex.getStackTrace())
+							System.out.printf("%s\n", el.toString());
 					}
 					setVisible(false);
 					dispose();