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

diff --combined ao-tools/altosui/AltosFlightUI.java
index b0cc521dbfc86596efa49cbbb017d645b2b30615,24d25bd7c46a0a4683fc732ce4441711a48a3fed..7fcfb8be6da68d5f356dd723ea146cf195089127
--- 1/ao-tools/altosui/AltosFlightUI.java
--- 2/ao-tools/altosui/AltosFlightUI.java
+++ b/ao-tools/altosui/AltosFlightUI.java
@@@ -47,17 -47,23 +47,17 @@@ public class AltosFlightUI extends JFra
        private AltosFlightStatus flightStatus;
        private AltosInfoTable flightInfo;
  
 -      static final int tab_pad = 1;
 -      static final int tab_ascent = 2;
 -      static final int tab_descent = 3;
 -      static final int tab_landed = 4;
 -
 -      int cur_tab = 0;
 -
        boolean exit_on_close = false;
  
 -      int which_tab(AltosState state) {
 +      JComponent cur_tab = null;
 +      JComponent which_tab(AltosState state) {
                if (state.state < Altos.ao_flight_boost)
 -                      return tab_pad;
 +                      return pad;
                if (state.state <= Altos.ao_flight_coast)
 -                      return tab_ascent;
 +                      return ascent;
                if (state.state <= Altos.ao_flight_main)
 -                      return tab_descent;
 -              return tab_landed;
 +                      return descent;
 +              return landed;
        }
  
        void stop_display() {
@@@ -84,14 -90,24 +84,14 @@@
        }
  
        public void show(AltosState state, int crc_errors) {
 -              int     tab = which_tab(state);
 +              JComponent tab = which_tab(state);
                pad.show(state, crc_errors);
                ascent.show(state, crc_errors);
                descent.show(state, crc_errors);
                landed.show(state, crc_errors);
                if (tab != cur_tab) {
 -                      switch (tab) {
 -                      case tab_pad:
 -                              pane.setSelectedComponent(pad);
 -                              break;
 -                      case tab_ascent:
 -                              pane.setSelectedComponent(ascent);
 -                              break;
 -                      case tab_descent:
 -                              pane.setSelectedComponent(descent);
 -                              break;
 -                      case tab_landed:
 -                              pane.setSelectedComponent(landed);
 +                      if (cur_tab == pane.getSelectedComponent()) {
 +                              pane.setSelectedComponent(tab);
                        }
                        cur_tab = tab;
                }
@@@ -132,7 -148,6 +132,6 @@@
                                public void actionPerformed(ActionEvent e) {
                                        int channel = channels.getSelectedIndex();
                                        reader.set_channel(channel);
-                                       AltosPreferences.set_channel(serial, channel);
                                }
                        });
                        c.gridx = 0;