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

diff --git a/altosui/AltosConfigureUI.java b/altosui/AltosConfigureUI.java
index deb179d6..c576b052 100644
--- a/altosui/AltosConfigureUI.java
+++ b/altosui/AltosConfigureUI.java
@@ -21,16 +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.*;
-import org.altusmetrum.AltosLib.*;
 
 class DelegatingRenderer implements ListCellRenderer {
 
@@ -91,6 +82,8 @@ public class AltosConfigureUI
 	JLabel		callsign_label;
 	JTextField	callsign_value;
 
+	JRadioButton	imperial_units;
+
 	JLabel		font_size_label;
 	JComboBox	font_size_value;
 
@@ -236,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;
@@ -270,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() {
@@ -288,10 +307,10 @@ 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);
@@ -344,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;