projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosuilib: Provide dialog while waiting for flash target to re-appear
[fw/altos]
/
altosui
/
AltosConfigureUI.java
diff --git
a/altosui/AltosConfigureUI.java
b/altosui/AltosConfigureUI.java
index 5e42f43055ec55d9b13dabe3044f789d04693785..8b62a212a0e8350526b2db1dfff9fa95e20653ea 100644
(file)
--- a/
altosui/AltosConfigureUI.java
+++ b/
altosui/AltosConfigureUI.java
@@
-3,7
+3,8
@@
*
* 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
*
* 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.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-22,7
+23,7
@@
import java.awt.event.*;
import java.beans.*;
import javax.swing.*;
import javax.swing.event.*;
import java.beans.*;
import javax.swing.*;
import javax.swing.event.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altosuilib_1
3
.*;
public class AltosConfigureUI
extends AltosUIConfigure
public class AltosConfigureUI
extends AltosUIConfigure
@@
-31,7
+32,7
@@
public class AltosConfigureUI
AltosVoice voice;
public JTextField callsign_value;
AltosVoice voice;
public JTextField callsign_value;
- public JComboBox position_value;
+ public JComboBox
<String>
position_value;
/* DocumentListener interface methods */
public void insertUpdate(DocumentEvent e) {
/* DocumentListener interface methods */
public void insertUpdate(DocumentEvent e) {
@@
-89,6
+90,8
@@
public class AltosConfigureUI
row++;
}
row++;
}
+ boolean has_bluetooth;
+
public void add_bluetooth() {
JButton manage_bluetooth = new JButton("Manage Bluetooth");
manage_bluetooth.addActionListener(new ActionListener() {
public void add_bluetooth() {
JButton manage_bluetooth = new JButton("Manage Bluetooth");
manage_bluetooth.addActionListener(new ActionListener() {
@@
-98,6
+101,7
@@
public class AltosConfigureUI
});
pane.add(manage_bluetooth, constraints(0, 2));
/* in the same row as add_frequencies, so don't bump row */
});
pane.add(manage_bluetooth, constraints(0, 2));
/* in the same row as add_frequencies, so don't bump row */
+ has_bluetooth = true;
}
public void add_frequencies() {
}
public void add_frequencies() {
@@
-108,7
+112,10
@@
public class AltosConfigureUI
}
});
manage_frequencies.setToolTipText("Configure which values are shown in frequency menus");
}
});
manage_frequencies.setToolTipText("Configure which values are shown in frequency menus");
- pane.add(manage_frequencies, constraints(2, 1));
+ if (has_bluetooth)
+ pane.add(manage_frequencies, constraints(2, 1));
+ else
+ pane.add(manage_frequencies, constraints(0, 3));
row++;
}
row++;
}
@@
-123,11
+130,11
@@
public class AltosConfigureUI
"Bottom",
"Bottom right",
};
"Bottom",
"Bottom right",
};
-
+
public void add_position() {
pane.add(new JLabel ("Menu position"), constraints(0, 1));
public void add_position() {
pane.add(new JLabel ("Menu position"), constraints(0, 1));
-
- position_value = new JComboBox
(position_names);
+
+ position_value = new JComboBox
<String>
(position_names);
position_value.setMaximumRowCount(position_names.length);
int position = AltosUIPreferences.position();
position_value.setSelectedIndex(position);
position_value.setMaximumRowCount(position_names.length);
int position = AltosUIPreferences.position();
position_value.setSelectedIndex(position);