summaryrefslogtreecommitdiff
path: root/altosui/AltosConfigUI.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2014-07-04 23:38:53 -0700
committerKeith Packard <keithp@keithp.com>2014-07-05 00:38:09 -0700
commit98c3c3f7edd58358939f7dacf5b8f4c336712f5b (patch)
tree8580e11d93fb6f7c777ef175f1baf4dfdb14c4d7 /altosui/AltosConfigUI.java
parent505c6a1f8b8d68fe6f74dcb4428c860157fae3de (diff)
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>
Diffstat (limited to 'altosui/AltosConfigUI.java')
-rw-r--r--altosui/AltosConfigUI.java9
1 files changed, 3 insertions, 6 deletions
diff --git a/altosui/AltosConfigUI.java b/altosui/AltosConfigUI.java
index de1b582e..91c37fd5 100644
--- a/altosui/AltosConfigUI.java
+++ b/altosui/AltosConfigUI.java
@@ -59,7 +59,7 @@ public class AltosConfigUI
JComboBox<String> main_deploy_value;
JComboBox<String> apogee_delay_value;
JComboBox<String> apogee_lockout_value;
- AltosFreqList radio_frequency_value;
+ AltosUIFreqList radio_frequency_value;
JTextField radio_calibration_value;
JRadioButton radio_enable_value;
JComboBox<String> aprs_interval_value;
@@ -432,12 +432,9 @@ public class AltosConfigUI
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++;