From 98c3c3f7edd58358939f7dacf5b8f4c336712f5b Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Fri, 4 Jul 2014 23:38:53 -0700
Subject: altosui/telegps: Undo the frequency/telemetry menu changes

Using menus for these items isn't what we want; we want to show the
current value on the screen, which is what a combo box is for. Switch
back to those and remove the frequency and telemetry config from the
TeleGPS menu bar so that Mac OS X is happy.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 telegps/TeleGPS.java         | 28 ++++++++++++++++++----------
 telegps/TeleGPSConfigUI.java | 10 +++-------
 2 files changed, 21 insertions(+), 17 deletions(-)

(limited to 'telegps')

diff --git a/telegps/TeleGPS.java b/telegps/TeleGPS.java
index e78c2124..7e5ff42a 100644
--- a/telegps/TeleGPS.java
+++ b/telegps/TeleGPS.java
@@ -58,7 +58,7 @@ public class TeleGPS
 	JMenu			file_menu;
 	JMenu			monitor_menu;
 	JMenu			device_menu;
-	AltosFreqList		frequencies;
+	AltosUIFreqList		frequencies;
 	ActionListener		frequency_listener;
 
 	Container		bag;
@@ -351,18 +351,17 @@ public class TeleGPS
 		frequencies.set_product("Monitor");
 		frequencies.set_serial(serial);
 		frequencies.set_frequency(AltosUIPreferences.frequency(serial));
+		frequencies.setEnabled(true);
 
-		menu_bar.add(frequencies);
-		menu_bar.repaint();
 	}
 
 	void disable_frequency_menu() {
-		if (frequency_listener == null)
-			return;
-		frequencies.removeActionListener(frequency_listener);
-		menu_bar.remove(frequencies);
-		menu_bar.repaint();
-		frequency_listener = null;
+		if (frequency_listener != null) {
+			frequencies.removeActionListener(frequency_listener);
+			frequencies.setEnabled(false);
+			frequency_listener = null;
+		}
+
 	}
 
 	public void set_reader(AltosFlightReader reader, AltosDevice device) {
@@ -457,7 +456,16 @@ public class TeleGPS
 		file_menu = make_menu("File", file_menu_entries);
 		monitor_menu = make_menu("Monitor", monitor_menu_entries);
 		device_menu = make_menu("Device", device_menu_entries);
-		frequencies = new AltosFreqList();
+
+		frequencies = new AltosUIFreqList();
+		frequencies.setEnabled(false);
+		c.gridx = 0;
+		c.gridy = 0;
+		c.fill = GridBagConstraints.NONE;
+		c.anchor = GridBagConstraints.WEST;
+		c.weightx = 0;
+		c.gridwidth = 1;
+		bag.add(frequencies, c);
 
 		displays = new LinkedList<AltosFlightDisplay>();
 
diff --git a/telegps/TeleGPSConfigUI.java b/telegps/TeleGPSConfigUI.java
index ee2fbd2d..e5ac6d7e 100644
--- a/telegps/TeleGPSConfigUI.java
+++ b/telegps/TeleGPSConfigUI.java
@@ -50,7 +50,7 @@ public class TeleGPSConfigUI
 	JLabel			product_value;
 	JLabel			version_value;
 	JLabel			serial_value;
-	AltosFreqList		radio_frequency_value;
+	AltosUIFreqList		radio_frequency_value;
 	JTextField		radio_calibration_value;
 	JRadioButton		radio_enable_value;
 	JComboBox<String>	aprs_interval_value;
@@ -270,13 +270,9 @@ public class TeleGPSConfigUI
 		c.anchor = GridBagConstraints.LINE_START;
 		c.insets = ir;
 		c.ipady = 5;
-		radio_frequency_value = new AltosFreqList();
+		radio_frequency_value = new AltosUIFreqList();
 		radio_frequency_value.addItemListener(this);
-
-		JMenuBar menu_bar = new JMenuBar();
-		menu_bar.add(radio_frequency_value);
-
-		pane.add(menu_bar, c);
+		pane.add(radio_frequency_value, c);
 		radio_frequency_value.setToolTipText("Telemetry, RDF and packet frequency");
 		row++;
 
-- 
cgit v1.2.3