* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altosuilib;
+package org.altusmetrum.altosuilib_1;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import javax.swing.event.*;
-class DelegatingRenderer implements ListCellRenderer {
+class DelegatingRenderer implements ListCellRenderer<Object> {
// ...
- public static void install(JComboBox comboBox) {
+ public static void install(JComboBox<Object> comboBox) {
DelegatingRenderer renderer = new DelegatingRenderer(comboBox);
renderer.initialise();
comboBox.setRenderer(renderer);
private final JComboBox comboBox;
// ...
- private ListCellRenderer delegate;
+ private ListCellRenderer<? super Object> delegate;
// ...
private DelegatingRenderer(JComboBox comboBox) {
// ...
private void initialise() {
- delegate = new JComboBox().getRenderer();
+ JComboBox<Object> c = new JComboBox<Object>();
+ delegate = c.getRenderer();
comboBox.addPropertyChangeListener("UI", new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
- delegate = new JComboBox().getRenderer();
+ delegate = new JComboBox<Object>().getRenderer();
}
});
}
// ...
- public Component getListCellRendererComponent(JList list,
+ public Component getListCellRendererComponent(JList<?> list,
Object value, int index, boolean isSelected, boolean cellHasFocus) {
return delegate.getListCellRendererComponent(list,
- ((UIManager.LookAndFeelInfo) value).getName(),
+ ((UIManager.LookAndFeelInfo)value).getName(),
index, isSelected, cellHasFocus);
}
}
public class AltosUIConfigure
extends AltosUIDialog
- implements DocumentListener
{
- JFrame owner;
- Container pane;
+ public JFrame owner;
+ public Container pane;
- JRadioButton enable_voice;
- JButton test_voice;
- JButton close;
-
- JButton configure_log;
- JTextField log_directory;
-
- JLabel callsign_label;
- JTextField callsign_value;
-
- JRadioButton imperial_units;
-
- JLabel font_size_label;
- JComboBox font_size_value;
-
- JLabel look_and_feel_label;
- JComboBox look_and_feel_value;
-
- JRadioButton serial_debug;
-
- JButton manage_bluetooth;
- JButton manage_frequencies;
-
- int row;
+ public int row;
final static String[] font_size_names = { "Small", "Medium", "Large" };
- /* DocumentListener interface methods */
- public void changedUpdate(DocumentEvent e) {
- if (callsign_value != null)
- AltosUIPreferences.set_callsign(callsign_value.getText());
- }
-
- public void insertUpdate(DocumentEvent e) {
- changedUpdate(e);
- }
-
- public void removeUpdate(DocumentEvent e) {
- changedUpdate(e);
- }
-
public GridBagConstraints constraints (int x, int width, int fill) {
GridBagConstraints c = new GridBagConstraints();
Insets insets = new Insets(4, 4, 4, 4);
c.fill = fill;
if (width == 3)
c.anchor = GridBagConstraints.CENTER;
+ else if (x == 2)
+ c.anchor = GridBagConstraints.EAST;
else
c.anchor = GridBagConstraints.WEST;
c.gridx = x;
}
public void add_voice() {
-// GridBagConstraints c = new GridBagConstraints();
-//
-// /* Voice settings */
-// c.gridx = 0;
-// c.gridy = row;
-// c.gridwidth = 1;
-// c.fill = GridBagConstraints.NONE;
-// c.anchor = GridBagConstraints.WEST;
-// pane.add(new JLabel("Voice"), c);
-//
-// enable_voice = new JRadioButton("Enable", AltosUIPreferences.voice());
-// enable_voice.addActionListener(new ActionListener() {
-// public void actionPerformed(ActionEvent e) {
-// JRadioButton item = (JRadioButton) e.getSource();
-// boolean enabled = item.isSelected();
-// AltosUIPreferences.set_voice(enabled);
-// if (enabled)
-// voice.speak_always("Enable voice.");
-// else
-// voice.speak_always("Disable voice.");
-// }
-// });
-// c.gridx = 1;
-// c.gridy = row;
-// c.gridwidth = 1;
-// c.weightx = 1;
-// c.fill = GridBagConstraints.NONE;
-// c.anchor = GridBagConstraints.WEST;
-// pane.add(enable_voice, c);
-// enable_voice.setToolTipText("Enable/Disable all audio in-flight announcements");
-//
-// c.gridx = 2;
-// c.gridy = row++;
-// c.gridwidth = 1;
-// c.weightx = 1;
-// c.fill = GridBagConstraints.NONE;
-// c.anchor = GridBagConstraints.EAST;
-// test_voice = new JButton("Test Voice");
-// test_voice.addActionListener(new ActionListener() {
-// public void actionPerformed(ActionEvent e) {
-// voice.speak("That's one small step for man; one giant leap for mankind.");
-// }
-// });
-// pane.add(test_voice, c);
-// test_voice.setToolTipText("Play a stock audio clip to check volume");
-// row++;
}
public void add_log_dir() {
/* Log directory settings */
pane.add(new JLabel("Log Directory"), constraints(0, 1));
- configure_log = new JButton(AltosUIPreferences.logdir().getPath());
+ final JButton configure_log = new JButton(AltosUIPreferences.logdir().getPath());
configure_log.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
AltosUIPreferences.ConfigureLog();
}
public void add_callsign() {
-// /* Callsign setting */
-// pane.add(new JLabel("Callsign"), constraints(0, 1));
-//
-// callsign_value = new JTextField(AltosUIPreferences.callsign());
-// callsign_value.getDocument().addDocumentListener(this);
-// callsign_value.setToolTipText("Callsign sent in packet mode");
-// pane.add(callsign_value, constraints(1, 2, GridBagConstraints.BOTH));
-// row++;
}
public void add_units() {
/* Imperial units setting */
pane.add(new JLabel("Imperial Units"), constraints(0, 1));
- imperial_units = new JRadioButton("Enable", AltosUIPreferences.imperial_units());
+ JRadioButton imperial_units = new JRadioButton("Enable", AltosUIPreferences.imperial_units());
imperial_units.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
JRadioButton item = (JRadioButton) e.getSource();
/* Font size setting */
pane.add(new JLabel("Font size"), constraints(0, 1));
- font_size_value = new JComboBox(font_size_names);
+ final JComboBox<String> font_size_value = new JComboBox<String>(font_size_names);
int font_size = AltosUIPreferences.font_size();
font_size_value.setSelectedIndex(font_size - AltosUILib.font_size_small);
font_size_value.addActionListener(new ActionListener() {
final UIManager.LookAndFeelInfo[] look_and_feels = UIManager.getInstalledLookAndFeels();
- look_and_feel_value = new JComboBox(look_and_feels);
+ final JComboBox<Object> look_and_feel_value = new JComboBox<Object>(look_and_feels);
DelegatingRenderer.install(look_and_feel_value);
row++;
}
- public void add_serial_debug() {
- GridBagConstraints c = new GridBagConstraints();
+ public void add_position () {
+ }
+ public void add_serial_debug() {
/* Serial debug setting */
pane.add(new JLabel("Serial Debug"), constraints(0, 1));
- serial_debug = new JRadioButton("Enable", AltosUIPreferences.serial_debug());
+ JRadioButton serial_debug = new JRadioButton("Enable", AltosUIPreferences.serial_debug());
serial_debug.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
JRadioButton item = (JRadioButton) e.getSource();
}
});
serial_debug.setToolTipText("Enable/Disable USB I/O getting sent to the console");
+ pane.add(serial_debug, constraints(1,2));
+ row++;
}
public void add_bluetooth() {
-// GridBagConstraints c = new GridBagConstraints();
-// c.gridx = 1;
-// c.gridy = row++;
-// c.gridwidth = 3;
-// c.fill = GridBagConstraints.NONE;
-// c.anchor = GridBagConstraints.WEST;
-// pane.add(serial_debug, c);
-//
-// manage_bluetooth = new JButton("Manage Bluetooth");
-// manage_bluetooth.addActionListener(new ActionListener() {
-// public void actionPerformed(ActionEvent e) {
-// AltosBTManage.show(owner, AltosBTKnown.bt_known());
-// }
-// });
-// c.gridx = 0;
-// c.gridy = row;
-// c.gridwidth = 2;
-// c.fill = GridBagConstraints.NONE;
-// c.anchor = GridBagConstraints.WEST;
-// pane.add(manage_bluetooth, c);
}
public void add_frequencies() {
-// GridBagConstraints c = new GridBagConstraints();
-// manage_frequencies = new JButton("Manage Frequencies");
-// manage_frequencies.addActionListener(new ActionListener() {
-// public void actionPerformed(ActionEvent e) {
-// AltosConfigFreqUI.show(owner);
-// }
-// });
-// manage_frequencies.setToolTipText("Configure which values are shown in frequency menus");
-// c.gridx = 2;
-// c.gridx = 2;
-// c.gridy = row++;
-// c.gridwidth = 2;
-// c.fill = GridBagConstraints.NONE;
-// c.anchor = GridBagConstraints.WEST;
-// pane.add(manage_frequencies, c);
}
public AltosUIConfigure(JFrame in_owner) {
add_log_dir();
add_callsign();
add_units();
+ add_serial_debug();
add_font_size();
add_look_and_feel();
+ add_position();
add_bluetooth();
add_frequencies();
/* And a close button at the bottom */
- close = new JButton("Close");
+ JButton close = new JButton("Close");
close.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
setVisible(false);
projects / fw / altos / blobdiff