X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosFlightUI.java;h=c85fc9776259a150d5eabd8f1ed4ea46de08bb7e;hb=72f5e05f9f0055f2cef8b840812f090556c94338;hp=816ffa2374f1c9679344f8ea66c85960627d2cff;hpb=81e7b43ecad666e2e2310c7c94184f888bc86585;p=fw%2Faltos

diff --git a/ao-tools/altosui/AltosFlightUI.java b/ao-tools/altosui/AltosFlightUI.java
index 816ffa23..c85fc977 100644
--- a/ao-tools/altosui/AltosFlightUI.java
+++ b/ao-tools/altosui/AltosFlightUI.java
@@ -36,8 +36,6 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 	AltosFlightReader	reader;
 	AltosDisplayThread	thread;
 
-	private Box vbox;
-
 	JTabbedPane	pane;
 
 	AltosPad	pad;
@@ -46,7 +44,8 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 	AltosLanded	landed;
     AltosSiteMap    sitemap;
 
-	private AltosStatusTable flightStatus;
+	private AltosFlightStatus flightStatus;
+	private JScrollPane flightInfoPane;
 	private AltosInfoTable flightInfo;
 
 	static final int tab_pad = 1;
@@ -56,6 +55,8 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 
 	int cur_tab = 0;
 
+	boolean exit_on_close = false;
+
 	int which_tab(AltosState state) {
 		if (state.state < Altos.ao_flight_boost)
 			return tab_pad;
@@ -119,27 +120,57 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 			}
 			cur_tab = tab;
 		}
-		flightStatus.set(state);
+		flightStatus.show(state, crc_errors);
 		flightInfo.show(state, crc_errors);
 		sitemap.show(state, crc_errors);
 	}
 
+	public void set_exit_on_close() {
+		exit_on_close = true;
+	}
+
+	Container	bag;
+	JComboBox	channels;
+
 	public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
-        AltosPreferences.init(this);
+		AltosPreferences.init(this);
 
 		voice = in_voice;
 		reader = in_reader;
 
+		bag = getContentPane();
+		bag.setLayout(new GridBagLayout());
+
+		GridBagConstraints c = new GridBagConstraints();
+
 		java.net.URL imgURL = AltosUI.class.getResource("/altus-metrum-16x16.jpg");
 		if (imgURL != null)
 			setIconImage(new ImageIcon(imgURL).getImage());
 
 		setTitle(String.format("AltOS %s", reader.name));
 
-		flightStatus = new AltosStatusTable();
+		if (serial >= 0) {
+			// Channel menu
+			channels = new AltosChannelMenu(AltosPreferences.channel(serial));
+			channels.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						int channel = channels.getSelectedIndex();
+						reader.set_channel(channel);
+						AltosPreferences.set_channel(serial, channel);
+					}
+				});
+			c.gridx = 0;
+			c.gridy = 0;
+			c.anchor = GridBagConstraints.WEST;
+			bag.add (channels, c);
+		}
 
-		vbox = new Box (BoxLayout.Y_AXIS);
-		vbox.add(flightStatus);
+		flightStatus = new AltosFlightStatus();
+		c.gridx = 0;
+		c.gridy = 1;
+		c.fill = GridBagConstraints.HORIZONTAL;
+		c.weightx = 1;
+		bag.add(flightStatus, c);
 
 		pane = new JTabbedPane();
 
@@ -156,36 +187,20 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 		pane.add("Landed", landed);
 
 		flightInfo = new AltosInfoTable();
-		pane.add("Table", flightInfo.box());
+		flightInfoPane = new JScrollPane(flightInfo.box());
+		pane.add("Table", flightInfoPane);
 
         sitemap = new AltosSiteMap();
         pane.add("Site Map", sitemap);
 
-		vbox.add(pane);
-
-		this.add(vbox);
-
-		if (serial >= 0) {
-			JMenuBar menubar = new JMenuBar();
-
-			// Channel menu
-			{
-				JMenu menu = new AltosChannelMenu(AltosPreferences.channel(serial));
-				menu.addActionListener(new ActionListener() {
-						public void actionPerformed(ActionEvent e) {
-							int channel = Integer.parseInt(e.getActionCommand());
-							reader.set_channel(channel);
-							AltosPreferences.set_channel(serial, channel);
-						}
-					});
-				menu.setMnemonic(KeyEvent.VK_C);
-				menubar.add(menu);
-			}
-
-			this.setJMenuBar(menubar);
-		}
+		c.gridx = 0;
+		c.gridy = 2;
+		c.fill = GridBagConstraints.BOTH;
+		c.weightx = 1;
+		c.weighty = 1;
+		bag.add(pane, c);
 
-		this.setSize(new Dimension (width(), height()));
+		this.setSize(this.getPreferredSize());
 		this.validate();
 
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
@@ -195,6 +210,8 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 				disconnect();
 				setVisible(false);
 				dispose();
+				if (exit_on_close)
+					System.exit(0);
 			}
 		});