X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosUI.java;h=8799d560767a6d8f532bdc47914e6b228f498121;hb=d77a4ea206d627635159f35c76c744687d4e633b;hp=36c08882413fe61b1907d96f654e3769b617a7ab;hpb=998adccc1c4f8f6c44833bbf4a52d9441748b996;p=fw%2Faltos

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 36c08882..8799d560 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -30,7 +30,7 @@ import java.util.concurrent.*;
 
 import libaltosJNI.*;
 
-public class AltosUI extends JFrame {
+public class AltosUI extends AltosFrame {
 	public AltosVoice voice = new AltosVoice();
 
 	public static boolean load_library(Frame frame) {
@@ -52,8 +52,7 @@ public class AltosUI extends JFrame {
 				new AltosFlightUI(voice, reader, device.getSerial());
 		} catch (FileNotFoundException ee) {
 			JOptionPane.showMessageDialog(AltosUI.this,
-						      String.format("Cannot open device \"%s\"",
-								    device.toShortString()),
+						      ee.getMessage(),
 						      "Cannot open target device",
 						      JOptionPane.ERROR_MESSAGE);
 		} catch (AltosSerialInUseException si) {
@@ -210,6 +209,13 @@ public class AltosUI extends JFrame {
 			});
 		b.setToolTipText("Check flight readiness of altimeter in idle mode");
 
+		b = addButton(3, 2, "Launch Controller");
+		b.addActionListener(new ActionListener() {
+				public void actionPerformed(ActionEvent e) {
+					LaunchController();
+				}
+			});
+
 		setTitle("AltOS");
 
 		pane.doLayout();
@@ -272,6 +278,10 @@ public class AltosUI extends JFrame {
 		new AltosSiteMapPreload(AltosUI.this);
 	}
 
+	void LaunchController() {
+		new AltosLaunchUI(AltosUI.this);
+	}
+
 	/*
 	 * Replay a flight from telemetry data
 	 */
@@ -345,7 +355,7 @@ public class AltosUI extends JFrame {
 			else
 				return new AltosTelemetryIterable(in);
 		} catch (FileNotFoundException fe) {
-			System.out.printf("Cannot open '%s'\n", filename);
+			System.out.printf("%s\n", fe.getMessage());
 			return null;
 		}
 	}
@@ -355,7 +365,7 @@ public class AltosUI extends JFrame {
 		try {
 			return new AltosCSV(file);
 		} catch (FileNotFoundException fe) {
-			System.out.printf("Cannot open '%s'\n", filename);
+			System.out.printf("%s\n", fe.getMessage());
 			return null;
 		}
 	}
@@ -365,7 +375,7 @@ public class AltosUI extends JFrame {
 		try {
 			return new AltosKML(file);
 		} catch (FileNotFoundException fe) {
-			System.out.printf("Cannot open '%s'\n", filename);
+			System.out.printf("%s\n", fe.getMessage());
 			return null;
 		}
 	}
@@ -508,6 +518,10 @@ public class AltosUI extends JFrame {
 	}
 	
 	public static void main(final String[] args) {
+		try {
+			UIManager.setLookAndFeel(AltosPreferences.look_and_feel());
+		} catch (Exception e) {
+		}
 		/* Handle batch-mode */
 		if (args.length == 0) {
 			AltosUI altosui = new AltosUI();