X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=altosuilib%2FAltosUIAccelCal.java;h=af72a21d4b4af5314e06bd7f6277bc9e7acf65d5;hb=debian;hp=ea1869d0ff7a89d9de0f0924274f6d901ad5c214;hpb=558a143315f0345b79cc4f22aa4b643fedcded9c;p=fw%2Faltos

diff --git a/altosuilib/AltosUIAccelCal.java b/altosuilib/AltosUIAccelCal.java
index ea1869d0..ae8d6246 100644
--- a/altosuilib/AltosUIAccelCal.java
+++ b/altosuilib/AltosUIAccelCal.java
@@ -16,14 +16,14 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-package org.altusmetrum.altosuilib_12;
+package org.altusmetrum.altosuilib_14;
 
 import java.awt.*;
 import java.awt.event.*;
 import java.beans.*;
 import javax.swing.*;
 import javax.swing.event.*;
-import org.altusmetrum.altoslib_12.*;
+import org.altusmetrum.altoslib_14.*;
 
 public class AltosUIAccelCal
 	extends AltosUIDialog
@@ -44,7 +44,6 @@ public class AltosUIAccelCal
 	int accel_plus, accel_minus;
 
 	private void make_visible() {
-		System.out.printf("Make calibration dialog visible\n");
 		pack();
 		cal.start();
 		setVisible(true);
@@ -68,6 +67,10 @@ public class AltosUIAccelCal
 		return AltosLib.MISSING;
 	}
 
+	private void setDefaultButton(JButton button) {
+		this.getRootPane().setDefaultButton(button);
+	}
+
 	/* AltosAccelCalListener interface */
 	public void set_thread(AltosAccelCal cal, Thread thread) {
 		this.thread = thread;
@@ -78,15 +81,17 @@ public class AltosUIAccelCal
 				public void run() {
 					switch (phase) {
 					case AltosAccelCal.phase_antenna_up:
-						message.setText("Orient antenna upwards and click on Antenna Up");
+						message.setText(String.format ("Orient antenna upwards and click on %s", up_msg()));
 						antenna_up.setEnabled(true);
+						setDefaultButton(antenna_up);
 						antenna_down.setEnabled(false);
 						ok.setEnabled(false);
 						break;
 					case AltosAccelCal.phase_antenna_down:
-						message.setText("Orient antenna downwards and click on Antenna Down");
+						message.setText(String.format("Orient antenna downwards and click on %s", down_msg()));
 						antenna_up.setEnabled(false);
 						antenna_down.setEnabled(true);
+						setDefaultButton(antenna_down);
 						ok.setEnabled(false);
 						break;
 					}
@@ -104,6 +109,7 @@ public class AltosUIAccelCal
 					antenna_up.setEnabled(false);
 					antenna_down.setEnabled(false);
 					ok.setEnabled(true);
+					setDefaultButton(ok);
 				}
 			});
 	}
@@ -130,11 +136,11 @@ public class AltosUIAccelCal
 		} else if ("down".equals(cmd)) {
 			cal.signal(true);
 			antenna_down.setEnabled(false);
+			this.setDefaultButton(antenna_down);
 		} else if ("ok".equals(cmd)) {
 			cal.signal(true);
 			this.setVisible(false);
 			if (success) {
-				System.out.printf("set accel cal to %d/%d\n", accel_plus, accel_minus);
 				config_values.set_accel_cal(accel_plus, accel_minus);
 				config_values.set_dirty();
 			}
@@ -151,6 +157,10 @@ public class AltosUIAccelCal
 			}
 		}
 	}
+
+	public String up_msg() { return config_values.has_radio() ? "Antenna Up" : "Beeper Up"; }
+	public String down_msg() { return config_values.has_radio() ? "Antenna Down" : "Beeper Down"; }
+
 	public AltosUIAccelCal(Frame owner, AltosLink link, AltosConfigValues config_values) {
 		super(owner, "Calibrate Accelerometer", true);
 
@@ -158,7 +168,7 @@ public class AltosUIAccelCal
 		this.link = link;
 		this.config_values = config_values;
 
-		pane = getContentPane();
+		pane = getScrollablePane();
 		pane.setLayout(new GridBagLayout());
 
 		GridBagConstraints c = new GridBagConstraints();
@@ -187,7 +197,7 @@ public class AltosUIAccelCal
 		c.gridheight = 1;
 		c.weightx = 0;
 		c.weighty = 0;
-		antenna_up = new JButton("Antenna Up");
+		antenna_up = new JButton(up_msg());
 		antenna_up.setActionCommand("up");
 		antenna_up.setEnabled(false);
 		antenna_up.addActionListener(this);
@@ -202,7 +212,7 @@ public class AltosUIAccelCal
 		c.gridheight = 1;
 		c.weightx = 0;
 		c.weighty = 0;
-		antenna_down = new JButton("Antenna Down");
+		antenna_down = new JButton(down_msg());
 		antenna_down.setActionCommand("down");
 		antenna_down.setEnabled(false);
 		antenna_down.addActionListener(this);