X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosConfigureUI.java;h=980068c0076fa4b867cb992269518f248fa48918;hp=abb54c7418e4400fb0a4467fc750390ec1510dfe;hb=cf72c2f5a69a736c28a9b63e124d510ef41a9f5d;hpb=a315b200cd0da1a964f5395cd59660be1b49672b

diff --git a/altosui/AltosConfigureUI.java b/altosui/AltosConfigureUI.java
index abb54c74..980068c0 100644
--- a/altosui/AltosConfigureUI.java
+++ b/altosui/AltosConfigureUI.java
@@ -47,12 +47,16 @@ public class AltosConfigureUI
 	JLabel		callsign_label;
 	JTextField	callsign_value;
 
+	JLabel		font_size_label;
+	JComboBox	font_size_value;
+
 	JRadioButton	serial_debug;
 
-// BLUETOOTH
-//	JButton		manage_bluetooth;
+	JButton		manage_bluetooth;
 	JButton		manage_frequencies;
 
+	final static String[] font_size_names = { "Small", "Medium", "Large" };
+
 	/* DocumentListener interface methods */
 	public void changedUpdate(DocumentEvent e) {
 		AltosPreferences.set_callsign(callsign_value.getText());
@@ -73,6 +77,8 @@ public class AltosConfigureUI
 
 		Insets insets = new Insets(4, 4, 4, 4);
 
+		int row = 0;
+
 		owner = in_owner;
 		voice = in_voice;
 		pane = getContentPane();
@@ -85,14 +91,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;
@@ -100,7 +106,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;
@@ -119,15 +125,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;
@@ -139,10 +146,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;
@@ -156,15 +164,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;
@@ -173,15 +182,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;
@@ -195,27 +231,27 @@ 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);
 
-// 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_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() {
@@ -223,10 +259,10 @@ public class AltosConfigureUI
 					AltosConfigFreqUI.show(owner);
 				}
 			});
-// BLUETOOTH
-//		c.gridx = 2;
-		c.gridx = 1;
-		c.gridy = 6;
+		manage_frequencies.setToolTipText("Configure which values are shown in frequency menus");
+		c.gridx = 2;
+		c.gridx = 2;
+		c.gridy = row++;
 		c.gridwidth = 2;
 		c.fill = GridBagConstraints.NONE;
 		c.anchor = GridBagConstraints.WEST;
@@ -240,7 +276,7 @@ public class AltosConfigureUI
 				}
 			});
 		c.gridx = 0;
-		c.gridy = 7;
+		c.gridy = row++;
 		c.gridwidth = 3;
 		c.fill = GridBagConstraints.NONE;
 		c.anchor = GridBagConstraints.CENTER;