X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosConfigureUI.java;h=0c865d0e350324de418dcf3db5a38090b11f3514;hb=2165e82327faaada23f0503b8e49b80f938b746c;hp=0f5e4a3bd3a7335fdcc1fc8da9e54b8c7beb2de0;hpb=44fb71ca3e5bccd5f601fc5a2d5da7292050b1d6;p=fw%2Faltos

diff --git a/altosui/AltosConfigureUI.java b/altosui/AltosConfigureUI.java
index 0f5e4a3b..0c865d0e 100644
--- a/altosui/AltosConfigureUI.java
+++ b/altosui/AltosConfigureUI.java
@@ -49,7 +49,9 @@ public class AltosConfigureUI
 
 	JRadioButton	serial_debug;
 
-	JButton		manage_bluetooth;
+// BLUETOOTH
+//	JButton		manage_bluetooth;
+	JButton		manage_frequencies;
 
 	/* DocumentListener interface methods */
 	public void changedUpdate(DocumentEvent e) {
@@ -123,6 +125,7 @@ public class AltosConfigureUI
 		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 = 2;
@@ -137,6 +140,7 @@ public class AltosConfigureUI
 				}
 			});
 		pane.add(test_voice, c);
+		test_voice.setToolTipText("Play a stock audio clip to check volume");
 
 		/* Log directory settings */
 		c.gridx = 0;
@@ -159,6 +163,7 @@ public class AltosConfigureUI
 		c.fill = GridBagConstraints.BOTH;
 		c.anchor = GridBagConstraints.WEST;
 		pane.add(configure_log, c);
+		configure_log.setToolTipText("Which directory flight logs are stored in");
 
 		/* Callsign setting */
 		c.gridx = 0;
@@ -176,6 +181,7 @@ public class AltosConfigureUI
 		c.fill = GridBagConstraints.BOTH;
 		c.anchor = GridBagConstraints.WEST;
 		pane.add(callsign_value, c);
+		callsign_value.setToolTipText("Callsign sent in packet mode");
 
 		/* Serial debug setting */
 		c.gridx = 0;
@@ -193,6 +199,7 @@ public class AltosConfigureUI
 					AltosPreferences.set_serial_debug(enabled);
 				}
 			});
+		serial_debug.setToolTipText("Enable/Disable USB I/O getting sent to the console");
 
 		c.gridx = 1;
 		c.gridy = 5;
@@ -201,18 +208,35 @@ public class AltosConfigureUI
 		c.anchor = GridBagConstraints.WEST;
 		pane.add(serial_debug, c);
 
-		manage_bluetooth = new JButton("Manage Bluetooth");
-		manage_bluetooth.addActionListener(new ActionListener() {
+// BLUETOOTH
+//		manage_bluetooth = new JButton("Manage Bluetooth");
+//		manage_bluetooth.addActionListener(new ActionListener() {
+//				public void actionPerformed(ActionEvent e) {
+//					AltosBTManage.show(owner, Altos.bt_known);
+//				}
+//			});
+//		c.gridx = 0;
+//		c.gridy = 6;
+//		c.gridwidth = 2;
+//		c.fill = GridBagConstraints.NONE;
+//		c.anchor = GridBagConstraints.WEST;
+//		pane.add(manage_bluetooth, c);
+
+		manage_frequencies = new JButton("Manage Frequencies");
+		manage_frequencies.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
-					AltosBTManage.show(owner, Altos.bt_known);
+					AltosConfigFreqUI.show(owner);
 				}
 			});
+		manage_frequencies.setToolTipText("Configure which values are shown in frequency menus");
+// BLUETOOTH
+//		c.gridx = 2;
 		c.gridx = 1;
 		c.gridy = 6;
-		c.gridwidth = 3;
+		c.gridwidth = 2;
 		c.fill = GridBagConstraints.NONE;
 		c.anchor = GridBagConstraints.WEST;
-		pane.add(manage_bluetooth, c);
+		pane.add(manage_frequencies, c);
 
 		/* And a close button at the bottom */
 		close = new JButton("Close");