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

Conflicts:
	ao-tools/altosui/AltosFlightUI.java

diff --cc ao-tools/altosui/AltosFlightUI.java
index 658d6f6f611f8e36a5b324b29bdc0c16e23dd559,56ab7ebc4ac01546d210b8446cb7c010d5816f9b..21b41528b32a056aee22989167cbead46b506425
--- 1/ao-tools/altosui/AltosFlightUI.java
--- 2/ao-tools/altosui/AltosFlightUI.java
+++ b/ao-tools/altosui/AltosFlightUI.java
@@@ -167,33 -186,12 +190,16 @@@ public class AltosFlightUI extends JFra
                flightInfoPane = new JScrollPane(flightInfo.box());
                pane.add("Table", flightInfoPane);
  
-               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);
-               }
 +        sitemap = new AltosSiteMap();
 +              sitemapPane = new JScrollPane(sitemap);
 +        pane.add("Site Map", sitemapPane);
 +
+               c.gridx = 0;
+               c.gridy = 2;
+               c.fill = GridBagConstraints.BOTH;
+               c.weightx = 1;
+               c.weighty = 1;
+               bag.add(pane, c);
  
                this.setSize(this.getPreferredSize());
                this.validate();

diff --cc ao-tools/altosui/Makefile.am
Simple merge