X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosUI.java;h=a6742f2f360d04e47b3de019a18602fead237d19;hb=a9cf50c9f29f42cc3ca0daff3c69a4087cf9aa1c;hp=a385b8b3923d4b842ac03951ce7575a436c59ea7;hpb=8af405f1ac4d1b930f10465fd0270a49176f16d1;p=fw%2Faltos

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index a385b8b3..a6742f2f 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -22,10 +22,10 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
-import org.altusmetrum.AltosLib.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;
 
-public class AltosUI extends AltosFrame {
+public class AltosUI extends AltosUIFrame {
 	public AltosVoice voice = new AltosVoice();
 
 	public static boolean load_library(Frame frame) {
@@ -48,7 +48,7 @@ public class AltosUI extends AltosFrame {
 		} catch (FileNotFoundException ee) {
 			JOptionPane.showMessageDialog(AltosUI.this,
 						      ee.getMessage(),
-						      "Cannot open target device",
+						      String.format ("Cannot open %s", device.toShortString()),
 						      JOptionPane.ERROR_MESSAGE);
 		} catch (AltosSerialInUseException si) {
 			JOptionPane.showMessageDialog(AltosUI.this,
@@ -58,17 +58,17 @@ public class AltosUI extends AltosFrame {
 						      JOptionPane.ERROR_MESSAGE);
 		} catch (IOException ee) {
 			JOptionPane.showMessageDialog(AltosUI.this,
-						      device.toShortString(),
-						      "Unkonwn I/O error",
+						      String.format ("Unknown I/O error on %s", device.toShortString()),
+						      "Unknown I/O error",
 						      JOptionPane.ERROR_MESSAGE);
 		} catch (TimeoutException te) {
 			JOptionPane.showMessageDialog(this,
-						      device.toShortString(),
+						      String.format ("Timeout on %s", device.toShortString()),
 						      "Timeout error",
 						      JOptionPane.ERROR_MESSAGE);
 		} catch (InterruptedException ie) {
 			JOptionPane.showMessageDialog(this,
-						      device.toShortString(),
+						      String.format("Interrupted %s", device.toShortString()),
 						      "Interrupted exception",
 						      JOptionPane.ERROR_MESSAGE);
 		}
@@ -224,14 +224,6 @@ public class AltosUI extends AltosFrame {
 		doLayout();
 		validate();
 
-		setVisible(true);
-
-		Insets i = getInsets();
-		Dimension ps = rootPane.getPreferredSize();
-		ps.width += i.left + i.right;
-		ps.height += i.top + i.bottom;
-		setPreferredSize(ps);
-		setSize(ps);
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 		addWindowListener(new WindowAdapter() {
 			@Override
@@ -239,6 +231,11 @@ public class AltosUI extends AltosFrame {
 				System.exit(0);
 			}
 		});
+
+		setLocationByPlatform(false);
+		
+		/* Insets aren't set before the window is visible */
+		setVisible(true);
 	}
 
 	private void ConnectToDevice() {
@@ -552,7 +549,6 @@ public class AltosUI extends AltosFrame {
 		/* Handle batch-mode */
 		if (args.length == 0) {
 			AltosUI altosui = new AltosUI();
-			altosui.setVisible(true);
 
 			java.util.List<AltosDevice> devices = AltosUSBDevice.list(Altos.product_basestation);
 			for (AltosDevice device : devices)