From: Anthony Towns <aj@erisian.com.au>
Date: Sat, 20 Nov 2010 07:40:49 +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~11
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=081fbd5715f9d3d81d98e149fb95d40447c07a79

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

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

081fbd5715f9d3d81d98e149fb95d40447c07a79
diff --cc ao-tools/altosui/AltosFlightUI.java
index 658d6f6f,56ab7ebc..21b41528
--- a/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);
  
 +        sitemap = new AltosSiteMap();
 +		sitemapPane = new JScrollPane(sitemap);
 +        pane.add("Site Map", sitemapPane);
 +
- 		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(this.getPreferredSize());
  		this.validate();