projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
[fw/altos]
/
ao-tools
/
altosui
/
AltosFlightUI.java
diff --git
a/ao-tools/altosui/AltosFlightUI.java
b/ao-tools/altosui/AltosFlightUI.java
index 21b41528b32a056aee22989167cbead46b506425..6db6c67b192d04ad792bd3806be2380412fa4d56 100644
(file)
--- a/
ao-tools/altosui/AltosFlightUI.java
+++ b/
ao-tools/altosui/AltosFlightUI.java
@@
-131,6
+131,7
@@
public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
}
Container bag;
}
Container bag;
+ JComboBox channels;
public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
AltosPreferences.init(this);
public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
AltosPreferences.init(this);
@@
-151,10
+152,10
@@
public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
if (serial >= 0) {
// Channel menu
if (serial >= 0) {
// Channel menu
-
JComboBox
channels = new AltosChannelMenu(AltosPreferences.channel(serial));
+ channels = new AltosChannelMenu(AltosPreferences.channel(serial));
channels.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
channels.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- int channel =
Integer.parseInt(e.getActionCommand()
);
+ int channel =
channels.getSelectedIndex(
);
reader.set_channel(channel);
AltosPreferences.set_channel(serial, channel);
}
reader.set_channel(channel);
AltosPreferences.set_channel(serial, channel);
}