From: Anthony Towns <aj@erisian.com.au>
Date: Wed, 17 Nov 2010 19:54:06 +0000 (+1000)
Subject: Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
X-Git-Tag: debian/0.7.1+117+ge7954c8~8^2~16
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=939be6793238a275b7682ecc376fed14379cf044

Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox

Conflicts:
	ao-tools/altosui/AltosFlightUI.java
---

939be6793238a275b7682ecc376fed14379cf044
diff --cc ao-tools/altosui/AltosFlightUI.java
index f56b3d1b,78b005c0..1372cc00
--- a/ao-tools/altosui/AltosFlightUI.java
+++ b/ao-tools/altosui/AltosFlightUI.java
@@@ -44,9 -44,9 +44,10 @@@ public class AltosFlightUI extends JFra
  	AltosAscent	ascent;
  	AltosDescent	descent;
  	AltosLanded	landed;
 +    AltosSiteMap    sitemap;
  
- 	private AltosStatusTable flightStatus;
+ 	private AltosFlightStatus flightStatus;
+ 	private JScrollPane flightInfoPane;
  	private AltosInfoTable flightInfo;
  
  	static final int tab_pad = 1;
@@@ -119,13 -120,16 +122,17 @@@
  			}
  			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;
+ 	}
+ 
  	public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
-         AltosPreferences.init(this);
+ 		AltosPreferences.init(this);
  
  		voice = in_voice;
  		reader = in_reader;
@@@ -156,11 -160,9 +163,12 @@@
  		pane.add("Landed", landed);
  
  		flightInfo = new AltosInfoTable();
- 		pane.add("Table", new JScrollPane(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);
diff --cc ao-tools/altosui/Makefile.am
index fc532863,8d0fe16e..1c24ce13
--- a/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@@ -58,10 -59,9 +59,10 @@@ altosui_JAVA = 
  	AltosRomconfig.java \
  	AltosRomconfigUI.java \
  	AltosSerial.java \
+ 	AltosSerialInUseException.java \
  	AltosSerialMonitor.java \
 +	AltosSiteMap.java \
  	AltosState.java \
- 	AltosStatusTable.java \
  	AltosTelemetry.java \
  	AltosTelemetryIterable.java \
  	AltosUI.java \