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

diff --git a/altosui/AltosConfigureUI.java b/altosui/AltosConfigureUI.java
index ab3d950e..0c865d0e 100644
--- a/altosui/AltosConfigureUI.java
+++ b/altosui/AltosConfigureUI.java
@@ -49,6 +49,10 @@ public class AltosConfigureUI
 
 	JRadioButton	serial_debug;
 
+// BLUETOOTH
+//	JButton		manage_bluetooth;
+	JButton		manage_frequencies;
+
 	/* DocumentListener interface methods */
 	public void changedUpdate(DocumentEvent e) {
 		AltosPreferences.set_callsign(callsign_value.getText());
@@ -87,9 +91,16 @@ public class AltosConfigureUI
 		c.anchor = GridBagConstraints.CENTER;
 		pane.add(new JLabel ("Configure AltOS UI"), c);
 
-		/* Voice settings */
 		c.gridx = 0;
 		c.gridy = 1;
+		c.gridwidth = 3;
+		c.fill = GridBagConstraints.NONE;
+		c.anchor = GridBagConstraints.CENTER;
+		pane.add(new JLabel (String.format("AltOS version %s", AltosVersion.version)), c);
+
+		/* Voice settings */
+		c.gridx = 0;
+		c.gridy = 2;
 		c.gridwidth = 1;
 		c.fill = GridBagConstraints.NONE;
 		c.anchor = GridBagConstraints.WEST;
@@ -108,15 +119,16 @@ public class AltosConfigureUI
 				}
 			});
 		c.gridx = 1;
-		c.gridy = 1;
+		c.gridy = 2;
 		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 = 1;
+		c.gridy = 2;
 		c.gridwidth = 1;
 		c.weightx = 1;
 		c.fill = GridBagConstraints.NONE;
@@ -128,10 +140,11 @@ 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;
-		c.gridy = 2;
+		c.gridy = 3;
 		c.gridwidth = 1;
 		c.fill = GridBagConstraints.NONE;
 		c.anchor = GridBagConstraints.WEST;
@@ -145,15 +158,16 @@ public class AltosConfigureUI
 				}
 			});
 		c.gridx = 1;
-		c.gridy = 2;
+		c.gridy = 3;
 		c.gridwidth = 2;
 		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;
-		c.gridy = 3;
+		c.gridy = 4;
 		c.gridwidth = 1;
 		c.fill = GridBagConstraints.NONE;
 		c.anchor = GridBagConstraints.WEST;
@@ -162,15 +176,16 @@ public class AltosConfigureUI
 		callsign_value = new JTextField(AltosPreferences.callsign());
 		callsign_value.getDocument().addDocumentListener(this);
 		c.gridx = 1;
-		c.gridy = 3;
+		c.gridy = 4;
 		c.gridwidth = 2;
 		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;
-		c.gridy = 4;
+		c.gridy = 5;
 		c.gridwidth = 1;
 		c.fill = GridBagConstraints.NONE;
 		c.anchor = GridBagConstraints.WEST;
@@ -184,14 +199,45 @@ 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 = 4;
+		c.gridy = 5;
 		c.gridwidth = 3;
 		c.fill = GridBagConstraints.NONE;
 		c.anchor = GridBagConstraints.WEST;
 		pane.add(serial_debug, c);
 
+// 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) {
+					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 = 2;
+		c.fill = GridBagConstraints.NONE;
+		c.anchor = GridBagConstraints.WEST;
+		pane.add(manage_frequencies, c);
+
 		/* And a close button at the bottom */
 		close = new JButton("Close");
 		close.addActionListener(new ActionListener() {
@@ -200,7 +246,7 @@ public class AltosConfigureUI
 				}
 			});
 		c.gridx = 0;
-		c.gridy = 5;
+		c.gridy = 7;
 		c.gridwidth = 3;
 		c.fill = GridBagConstraints.NONE;
 		c.anchor = GridBagConstraints.CENTER;