altos: Correct AO_CONFIG_MINOR from 6 to 7

[fw/altos] / altosui / AltosConfigureUI.java

diff --git a/altosui/AltosConfigureUI.java b/altosui/AltosConfigureUI.java
index 153c59fdedc719818f7fa605b8a2f825c30ac410..abb54c7418e4400fb0a4467fc750390ec1510dfe 100644 (file)
--- a/altosui/AltosConfigureUI.java
+++ b/altosui/AltosConfigureUI.java
@@ -47,6 +47,12 @@ public class AltosConfigureUI
        JLabel          callsign_label;
        JTextField      callsign_value;
 
+       JRadioButton    serial_debug;
+
+// BLUETOOTH
+//     JButton         manage_bluetooth;
+       JButton         manage_frequencies;
+
        /* DocumentListener interface methods */
        public void changedUpdate(DocumentEvent e) {
                AltosPreferences.set_callsign(callsign_value.getText());
@@ -85,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;
@@ -106,7 +119,7 @@ public class AltosConfigureUI
                                }
                        });
                c.gridx = 1;
-               c.gridy = 1;
+               c.gridy = 2;
                c.gridwidth = 1;
                c.weightx = 1;
                c.fill = GridBagConstraints.NONE;
@@ -114,7 +127,7 @@ public class AltosConfigureUI
                pane.add(enable_voice, c);
 
                c.gridx = 2;
-               c.gridy = 1;
+               c.gridy = 2;
                c.gridwidth = 1;
                c.weightx = 1;
                c.fill = GridBagConstraints.NONE;
@@ -129,7 +142,7 @@ public class AltosConfigureUI
 
                /* Log directory settings */
                c.gridx = 0;
-               c.gridy = 2;
+               c.gridy = 3;
                c.gridwidth = 1;
                c.fill = GridBagConstraints.NONE;
                c.anchor = GridBagConstraints.WEST;
@@ -143,7 +156,7 @@ public class AltosConfigureUI
                                }
                        });
                c.gridx = 1;
-               c.gridy = 2;
+               c.gridy = 3;
                c.gridwidth = 2;
                c.fill = GridBagConstraints.BOTH;
                c.anchor = GridBagConstraints.WEST;
@@ -151,7 +164,7 @@ public class AltosConfigureUI
 
                /* Callsign setting */
                c.gridx = 0;
-               c.gridy = 3;
+               c.gridy = 4;
                c.gridwidth = 1;
                c.fill = GridBagConstraints.NONE;
                c.anchor = GridBagConstraints.WEST;
@@ -160,12 +173,65 @@ 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);
 
+               /* Serial debug setting */
+               c.gridx = 0;
+               c.gridy = 5;
+               c.gridwidth = 1;
+               c.fill = GridBagConstraints.NONE;
+               c.anchor = GridBagConstraints.WEST;
+               pane.add(new JLabel("Serial Debug"), c);
+
+               serial_debug = new JRadioButton("Enable", AltosPreferences.serial_debug());
+               serial_debug.addActionListener(new ActionListener() {
+                               public void actionPerformed(ActionEvent e) {
+                                       JRadioButton item = (JRadioButton) e.getSource();
+                                       boolean enabled = item.isSelected();
+                                       AltosPreferences.set_serial_debug(enabled);
+                               }
+                       });
+
+               c.gridx = 1;
+               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);
+                               }
+                       });
+// 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() {
@@ -174,7 +240,7 @@ public class AltosConfigureUI
                                }
                        });
                c.gridx = 0;
-               c.gridy = 4;
+               c.gridy = 7;
                c.gridwidth = 3;
                c.fill = GridBagConstraints.NONE;
                c.anchor = GridBagConstraints.CENTER;