X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosUI.java;h=49e3097e34b99843669fd4f33d360b9f489563b8;hb=ed200884f3e4fb895ee17ef38a9b6d3371b59625;hp=dcc0de600817aab22666705581ffe42afa8de996;hpb=c607bd1442e60fec1421955c996f6aad1d98647a;p=fw%2Faltos

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index dcc0de60..49e3097e 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -22,9 +22,10 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
-import org.altusmetrum.AltosLib.*;
+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) {
@@ -223,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
@@ -238,10 +231,15 @@ public class AltosUI extends AltosFrame {
 				System.exit(0);
 			}
 		});
+
+		setLocationByPlatform(false);
+		
+		/* Insets aren't set before the window is visible */
+		setVisible(true);
 	}
 
 	private void ConnectToDevice() {
-		AltosDevice	device = AltosDeviceDialog.show(AltosUI.this,
+		AltosDevice	device = AltosDeviceUIDialog.show(AltosUI.this,
 								Altos.product_basestation);
 
 		if (device != null)
@@ -551,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)