X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosConfigureUI.java;h=c576b052f71f2db15e9360ba253fbfc9762ad2fa;hp=06b5745c7d493196fa170d6493dfd0db47f0bce3;hb=6e0d672b8a516a604d8ea1abd2bed113c608143f;hpb=7ecde50fbebe68a2e2200a2f8d081fd37074f840

diff --git a/altosui/AltosConfigureUI.java b/altosui/AltosConfigureUI.java
index 06b5745c..c576b052 100644
--- a/altosui/AltosConfigureUI.java
+++ b/altosui/AltosConfigureUI.java
@@ -21,15 +21,7 @@ import java.awt.*;
 import java.awt.event.*;
 import java.beans.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
 import javax.swing.event.*;
-import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
-import java.util.concurrent.LinkedBlockingQueue;
-import javax.swing.plaf.basic.*;
 
 class DelegatingRenderer implements ListCellRenderer {
 
@@ -90,6 +82,8 @@ public class AltosConfigureUI
 	JLabel		callsign_label;
 	JTextField	callsign_value;
 
+	JRadioButton	imperial_units;
+
 	JLabel		font_size_label;
 	JComboBox	font_size_value;
 
@@ -105,7 +99,7 @@ public class AltosConfigureUI
 
 	/* DocumentListener interface methods */
 	public void changedUpdate(DocumentEvent e) {
-		AltosPreferences.set_callsign(callsign_value.getText());
+		AltosUIPreferences.set_callsign(callsign_value.getText());
 	}
 
 	public void insertUpdate(DocumentEvent e) {
@@ -158,12 +152,12 @@ public class AltosConfigureUI
 		c.anchor = GridBagConstraints.WEST;
 		pane.add(new JLabel("Voice"), c);
 
-		enable_voice = new JRadioButton("Enable", AltosPreferences.voice());
+		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();
-					AltosPreferences.set_voice(enabled);
+					AltosUIPreferences.set_voice(enabled);
 					if (enabled)
 						voice.speak_always("Enable voice.");
 					else
@@ -202,11 +196,11 @@ public class AltosConfigureUI
 		c.anchor = GridBagConstraints.WEST;
 		pane.add(new JLabel("Log Directory"), c);
 
-		configure_log = new JButton(AltosPreferences.logdir().getPath());
+		configure_log = new JButton(AltosUIPreferences.logdir().getPath());
 		configure_log.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
-					AltosPreferences.ConfigureLog();
-					configure_log.setText(AltosPreferences.logdir().getPath());
+					AltosUIPreferences.ConfigureLog();
+					configure_log.setText(AltosUIPreferences.logdir().getPath());
 				}
 			});
 		c.gridx = 1;
@@ -225,7 +219,7 @@ public class AltosConfigureUI
 		c.anchor = GridBagConstraints.WEST;
 		pane.add(new JLabel("Callsign"), c);
 
-		callsign_value = new JTextField(AltosPreferences.callsign());
+		callsign_value = new JTextField(AltosUIPreferences.callsign());
 		callsign_value.getDocument().addDocumentListener(this);
 		c.gridx = 1;
 		c.gridy = row++;
@@ -235,6 +229,31 @@ public class AltosConfigureUI
 		pane.add(callsign_value, c);
 		callsign_value.setToolTipText("Callsign sent in packet mode");
 
+		/* Imperial units setting */
+		c.gridx = 0;
+		c.gridy = row;
+		c.gridwidth = 1;
+		c.fill = GridBagConstraints.NONE;
+		c.anchor = GridBagConstraints.WEST;
+		pane.add(new JLabel("Imperial Units"), c);
+
+		imperial_units = new JRadioButton("Enable", AltosUIPreferences.imperial_units());
+		imperial_units.addActionListener(new ActionListener() {
+				public void actionPerformed(ActionEvent e) {
+					JRadioButton item = (JRadioButton) e.getSource();
+					boolean enabled = item.isSelected();
+					AltosUIPreferences.set_imperial_units(enabled);
+				}
+			});
+		imperial_units.setToolTipText("Use Imperial units instead of metric");
+
+		c.gridx = 1;
+		c.gridy = row++;
+		c.gridwidth = 3;
+		c.fill = GridBagConstraints.NONE;
+		c.anchor = GridBagConstraints.WEST;
+		pane.add(imperial_units, c);
+
 		/* Font size setting */
 		c.gridx = 0;
 		c.gridy = row;
@@ -244,13 +263,13 @@ public class AltosConfigureUI
 		pane.add(new JLabel("Font size"), c);
 
 		font_size_value = new JComboBox(font_size_names);
-		int font_size = AltosPreferences.font_size();
+		int font_size = AltosUIPreferences.font_size();
 		font_size_value.setSelectedIndex(font_size - Altos.font_size_small);
 		font_size_value.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
 					int	size = font_size_value.getSelectedIndex() + Altos.font_size_small;
 
-					AltosPreferences.set_font_size(size);
+					AltosUIPreferences.set_font_size(size);
 				}
 			});
 		c.gridx = 1;
@@ -269,6 +288,7 @@ public class AltosConfigureUI
 		c.anchor = GridBagConstraints.WEST;
 		pane.add(new JLabel("Look & feel"), c);
 
+		/*
 		class LookAndFeelRenderer extends BasicComboBoxRenderer implements ListCellRenderer {
 
 			public LookAndFeelRenderer() {
@@ -287,15 +307,15 @@ public class AltosConfigureUI
 				return this;
 			}
 		}
+		*/
 
 		final UIManager.LookAndFeelInfo[] look_and_feels = UIManager.getInstalledLookAndFeels();
 
-		System.out.printf("look_and_feels %d\n", look_and_feels.length);
 		look_and_feel_value = new JComboBox(look_and_feels);
 
 		DelegatingRenderer.install(look_and_feel_value);
 
-		String look_and_feel  = AltosPreferences.look_and_feel();
+		String look_and_feel  = AltosUIPreferences.look_and_feel();
 		for (int i = 0; i < look_and_feels.length; i++)
 			if (look_and_feel.equals(look_and_feels[i].getClassName()))
 				look_and_feel_value.setSelectedIndex(i);
@@ -304,7 +324,7 @@ public class AltosConfigureUI
 				public void actionPerformed(ActionEvent e) {
 					int	id = look_and_feel_value.getSelectedIndex();
 
-					AltosPreferences.set_look_and_feel(look_and_feels[id].getClassName());
+					AltosUIPreferences.set_look_and_feel(look_and_feels[id].getClassName());
 				}
 			});
 		c.gridx = 1;
@@ -323,12 +343,12 @@ public class AltosConfigureUI
 		c.anchor = GridBagConstraints.WEST;
 		pane.add(new JLabel("Serial Debug"), c);
 
-		serial_debug = new JRadioButton("Enable", AltosPreferences.serial_debug());
+		serial_debug = new JRadioButton("Enable", AltosUIPreferences.serial_debug());
 		serial_debug.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
 					JRadioButton item = (JRadioButton) e.getSource();
 					boolean enabled = item.isSelected();
-					AltosPreferences.set_serial_debug(enabled);
+					AltosUIPreferences.set_serial_debug(enabled);
 				}
 			});
 		serial_debug.setToolTipText("Enable/Disable USB I/O getting sent to the console");
@@ -343,7 +363,7 @@ public class AltosConfigureUI
 		manage_bluetooth = new JButton("Manage Bluetooth");
 		manage_bluetooth.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
-					AltosBTManage.show(owner, Altos.bt_known);
+					AltosBTManage.show(owner, AltosBTKnown.bt_known());
 				}
 			});
 		c.gridx = 0;