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

Conflicts:
	ao-tools/altosui/AltosFlightUI.java

diff --combined ao-tools/altosui/AltosFlightUI.java
index f56b3d1bd4cf200a79e6e8736fc1234ceaf486c9,78b005c0908656158496e3fe0f235c0c82651a1f..1372cc00d8da9368ded43ae3bb15c771d0862b71
--- 1/ao-tools/altosui/AltosFlightUI.java
--- 2/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;
@@@ -56,6 -56,8 +57,8 @@@
  
        int cur_tab = 0;
  
+       boolean exit_on_close = false;
+ 
        int which_tab(AltosState state) {
                if (state.state < Altos.ao_flight_boost)
                        return tab_pad;
@@@ -94,7 -96,6 +97,7 @@@
                descent.reset();
                landed.reset();
                flightInfo.clear();
 +              sitemap.reset();
        }
  
        public void show(AltosState state, int crc_errors) {
@@@ -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;
@@@ -136,7 -140,7 +143,7 @@@
  
                setTitle(String.format("AltOS %s", reader.name));
  
-               flightStatus = new AltosStatusTable();
+               flightStatus = new AltosFlightStatus();
  
                vbox = new Box (BoxLayout.Y_AXIS);
                vbox.add(flightStatus);
@@@ -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);
@@@ -185,7 -187,7 +193,7 @@@
                        this.setJMenuBar(menubar);
                }
  
-               this.setSize(new Dimension (width(), height()));
+               this.setSize(this.getPreferredSize());
                this.validate();
  
                setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
@@@ -195,6 -197,8 +203,8 @@@
                                disconnect();
                                setVisible(false);
                                dispose();
+                               if (exit_on_close)
+                                       System.exit(0);
                        }
                });
  

diff --combined ao-tools/altosui/AltosInfoTable.java
index 9964ab101b6dbb3258a0b6fb132f8e7e45dc47f4,289244106951f50478e2c8af693f88a4c3aab114..9f2bef5be6e3712230291fc43e6b4f15313e210d
--- 1/ao-tools/altosui/AltosInfoTable.java
--- 2/ao-tools/altosui/AltosInfoTable.java
+++ b/ao-tools/altosui/AltosInfoTable.java
@@@ -28,17 -28,14 +28,14 @@@ import java.text.*
  import java.util.prefs.*;
  import java.util.concurrent.LinkedBlockingQueue;
  
- import altosui.AltosFlightInfoTableModel;
- import altosui.AltosState;
- 
  public class AltosInfoTable {
        private Box                       box;
        private JTable                    table[];
        private AltosFlightInfoTableModel model[];
        private Box                       ibox[];
  
 -      private Font infoLabelFont = new Font("SansSerif", Font.PLAIN, 12);
 -      private Font infoValueFont = new Font("Monospaced", Font.PLAIN, 12);
 +      private Font infoLabelFont = new Font("SansSerif", Font.PLAIN, 14);
 +      private Font infoValueFont = new Font("Monospaced", Font.PLAIN, 14);
  
        static final int info_columns = 3;
        static final int info_rows = 17;

diff --combined ao-tools/altosui/Makefile.am
index fc532863008aaec0297aa182149b7d6b756ea6f5,8d0fe16eca2ec78e32f57e5b5b3b0806c7b6ac39..1c24ce13396fe0d2e58da7b616188763b78461a7
--- 1/ao-tools/altosui/Makefile.am
--- 2/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@@ -14,6 -14,7 +14,7 @@@ altosui_JAVA = 
        AltosChannelMenu.java \
        AltosConfig.java \
        AltosConfigUI.java \
+       AltosConfigureUI.java \
        AltosConvert.java \
        AltosCRCException.java \
        AltosCSV.java \
@@@ -33,7 -34,7 +34,7 @@@
        AltosFlightDisplay.java \
        AltosFlightInfoTableModel.java \
        AltosFlightReader.java \
-       AltosFlightStatusTableModel.java \
+       AltosFlightStatus.java \
        AltosFlightUI.java \
        AltosGPS.java \
        AltosGreatCircle.java \
@@@ -58,10 -59,9 +59,10 @@@
        AltosRomconfig.java \
        AltosRomconfigUI.java \
        AltosSerial.java \
+       AltosSerialInUseException.java \
        AltosSerialMonitor.java \
 +      AltosSiteMap.java \
        AltosState.java \
-       AltosStatusTable.java \
        AltosTelemetry.java \
        AltosTelemetryIterable.java \
        AltosUI.java \