X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosConfigureUI.java;h=bcb9636bd3e176be858479e2d753fde299435c70;hb=e53557373e539d591a03d02db146b27d08c7eba3;hp=0f5e4a3bd3a7335fdcc1fc8da9e54b8c7beb2de0;hpb=17f38e045fcd8ca0224095c0b2b7b098df77a8d8;p=fw%2Faltos

diff --git a/altosui/AltosConfigureUI.java b/altosui/AltosConfigureUI.java
index 0f5e4a3b..bcb9636b 100644
--- a/altosui/AltosConfigureUI.java
+++ b/altosui/AltosConfigureUI.java
@@ -47,9 +47,16 @@ public class AltosConfigureUI
 	JLabel		callsign_label;
 	JTextField	callsign_value;
 
+	JLabel		font_size_label;
+	JComboBox	font_size_value;
+
 	JRadioButton	serial_debug;
 
-	JButton		manage_bluetooth;
+// BLUETOOTH
+//	JButton		manage_bluetooth;
+	JButton		manage_frequencies;
+
+	final static String[] font_size_names = { "Small", "Medium", "Large" };
 
 	/* DocumentListener interface methods */
 	public void changedUpdate(DocumentEvent e) {
@@ -71,6 +78,8 @@ public class AltosConfigureUI
 
 		Insets insets = new Insets(4, 4, 4, 4);
 
+		int row = 0;
+
 		owner = in_owner;
 		voice = in_voice;
 		pane = getContentPane();
@@ -83,14 +92,14 @@ public class AltosConfigureUI
 
 		/* Nice label at the top */
 		c.gridx = 0;
-		c.gridy = 0;
+		c.gridy = row++;
 		c.gridwidth = 3;
 		c.fill = GridBagConstraints.NONE;
 		c.anchor = GridBagConstraints.CENTER;
 		pane.add(new JLabel ("Configure AltOS UI"), c);
 
 		c.gridx = 0;
-		c.gridy = 1;
+		c.gridy = row++;
 		c.gridwidth = 3;
 		c.fill = GridBagConstraints.NONE;
 		c.anchor = GridBagConstraints.CENTER;
@@ -98,7 +107,7 @@ public class AltosConfigureUI
 
 		/* Voice settings */
 		c.gridx = 0;
-		c.gridy = 2;
+		c.gridy = row;
 		c.gridwidth = 1;
 		c.fill = GridBagConstraints.NONE;
 		c.anchor = GridBagConstraints.WEST;
@@ -117,15 +126,16 @@ public class AltosConfigureUI
 				}
 			});
 		c.gridx = 1;
-		c.gridy = 2;
+		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 = 2;
+		c.gridy = row++;
 		c.gridwidth = 1;
 		c.weightx = 1;
 		c.fill = GridBagConstraints.NONE;
@@ -137,10 +147,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 = 3;
+		c.gridy = row;
 		c.gridwidth = 1;
 		c.fill = GridBagConstraints.NONE;
 		c.anchor = GridBagConstraints.WEST;
@@ -154,15 +165,16 @@ public class AltosConfigureUI
 				}
 			});
 		c.gridx = 1;
-		c.gridy = 3;
+		c.gridy = row++;
 		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 = 4;
+		c.gridy = row;
 		c.gridwidth = 1;
 		c.fill = GridBagConstraints.NONE;
 		c.anchor = GridBagConstraints.WEST;
@@ -171,15 +183,42 @@ public class AltosConfigureUI
 		callsign_value = new JTextField(AltosPreferences.callsign());
 		callsign_value.getDocument().addDocumentListener(this);
 		c.gridx = 1;
-		c.gridy = 4;
+		c.gridy = row++;
 		c.gridwidth = 2;
 		c.fill = GridBagConstraints.BOTH;
 		c.anchor = GridBagConstraints.WEST;
 		pane.add(callsign_value, c);
+		callsign_value.setToolTipText("Callsign sent in packet mode");
+
+		/* Font size setting */
+		c.gridx = 0;
+		c.gridy = row;
+		c.gridwidth = 1;
+		c.fill = GridBagConstraints.NONE;
+		c.anchor = GridBagConstraints.WEST;
+		pane.add(new JLabel("Font size"), c);
+
+		font_size_value = new JComboBox(font_size_names);
+		int font_size = AltosPreferences.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);
+				}
+			});
+		c.gridx = 1;
+		c.gridy = row++;
+		c.gridwidth = 2;
+		c.fill = GridBagConstraints.BOTH;
+		c.anchor = GridBagConstraints.WEST;
+		pane.add(font_size_value, c);
+		font_size_value.setToolTipText("Font size used in telemetry window");
 
 		/* Serial debug setting */
 		c.gridx = 0;
-		c.gridy = 5;
+		c.gridy = row;
 		c.gridwidth = 1;
 		c.fill = GridBagConstraints.NONE;
 		c.anchor = GridBagConstraints.WEST;
@@ -193,26 +232,44 @@ 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;
+		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() {
+// 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 = row++;
+//		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.gridy = row++;
+		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");
@@ -222,7 +279,7 @@ public class AltosConfigureUI
 				}
 			});
 		c.gridx = 0;
-		c.gridy = 7;
+		c.gridy = row++;
 		c.gridwidth = 3;
 		c.fill = GridBagConstraints.NONE;
 		c.anchor = GridBagConstraints.CENTER;