From: Anthony Towns <aj@erisian.com.au>
Date: Sun, 21 Nov 2010 00:45:15 +0000 (+1000)
Subject: Merge branch 'buttonbox' into sitemap
X-Git-Tag: debian/0.7.1+117+ge7954c8~6^2~1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=2a7dc3ba36bac81640a9498e0d0caf1470b57c19;p=fw%2Faltos

Merge branch 'buttonbox' into sitemap

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

2a7dc3ba36bac81640a9498e0d0caf1470b57c19
diff --cc ao-tools/altosui/AltosFlightUI.java
index c85fc977,d5bcdb10..1107d527
--- a/ao-tools/altosui/AltosFlightUI.java
+++ b/ao-tools/altosui/AltosFlightUI.java
@@@ -42,10 -42,8 +42,9 @@@ public class AltosFlightUI extends JFra
  	AltosAscent	ascent;
  	AltosDescent	descent;
  	AltosLanded	landed;
-     AltosSiteMap    sitemap;
++	AltosSiteMap    sitemap;
  
  	private AltosFlightStatus flightStatus;
- 	private JScrollPane flightInfoPane;
  	private AltosInfoTable flightInfo;
  
  	static final int tab_pad = 1;
@@@ -153,12 -142,12 +145,12 @@@
  			// Channel menu
  			channels = new AltosChannelMenu(AltosPreferences.channel(serial));
  			channels.addActionListener(new ActionListener() {
--					public void actionPerformed(ActionEvent e) {
--						int channel = channels.getSelectedIndex();
--						reader.set_channel(channel);
--						AltosPreferences.set_channel(serial, channel);
--					}
--				});
++				public void actionPerformed(ActionEvent e) {
++					int channel = channels.getSelectedIndex();
++					reader.set_channel(channel);
++					AltosPreferences.set_channel(serial, channel);
++				}
++			});
  			c.gridx = 0;
  			c.gridy = 0;
  			c.anchor = GridBagConstraints.WEST;
@@@ -187,12 -180,9 +183,12 @@@
  		pane.add("Landed", landed);
  
  		flightInfo = new AltosInfoTable();
- 		flightInfoPane = new JScrollPane(flightInfo.box());
- 		pane.add("Table", flightInfoPane);
+ 		pane.add("Table", new JScrollPane(flightInfo));
  
-         sitemap = new AltosSiteMap();
-         pane.add("Site Map", sitemap);
++		sitemap = new AltosSiteMap();
++		pane.add("Site Map", sitemap);
 +
+ 		/* Make the tabbed pane use the rest of the window space */
  		c.gridx = 0;
  		c.gridy = 2;
  		c.fill = GridBagConstraints.BOTH;
diff --cc ao-tools/altosui/AltosInfoTable.java
index 9f2bef5b,c571d5c9..723f8301
--- a/ao-tools/altosui/AltosInfoTable.java
+++ b/ao-tools/altosui/AltosInfoTable.java
@@@ -28,14 -28,11 +28,11 @@@ import java.text.*
  import java.util.prefs.*;
  import java.util.concurrent.LinkedBlockingQueue;
  
- public class AltosInfoTable {
- 	private Box			  box;
- 	private JTable			  table[];
- 	private AltosFlightInfoTableModel model[];
- 	private Box			  ibox[];
+ public class AltosInfoTable extends JTable {
+ 	private AltosFlightInfoTableModel model;
  
 -	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;