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>
---
 altosuilib/AltosUITelemetryList.java | 47 ++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 altosuilib/AltosUITelemetryList.java

(limited to 'altosuilib/AltosUITelemetryList.java')

diff --git a/altosuilib/AltosUITelemetryList.java b/altosuilib/AltosUITelemetryList.java
new file mode 100644
index 00000000..facfdcde
--- /dev/null
+++ b/altosuilib/AltosUITelemetryList.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2014 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.altosuilib_3;
+
+import java.util.*;
+import javax.swing.*;
+import org.altusmetrum.altoslib_5.*;
+
+
+public class AltosUITelemetryList extends JComboBox<String> {
+	public int get_selected() {
+		return getSelectedIndex() + 1;
+	}
+
+	public void set_selected(int telemetry) {
+		setSelectedIndex(telemetry-1);
+	}
+
+	public AltosUITelemetryList(int serial) {
+		super();
+		for (int i = AltosLib.ao_telemetry_min; i <= AltosLib.ao_telemetry_max; i++)
+			addItem(AltosLib.telemetry_name(i));
+
+		int telemetry = AltosPreferences.telemetry(serial);
+		if (telemetry < AltosLib.ao_telemetry_min || AltosLib.ao_telemetry_max < telemetry)
+			telemetry = AltosLib.ao_telemetry_standard;
+		setMaximumRowCount(AltosLib.ao_telemetry_max);
+		set_selected(telemetry);
+		revalidate();
+	}
+}
+
-- 
cgit v1.2.3