From: Keith Packard <keithp@keithp.com>
Date: Sun, 10 Feb 2013 22:18:16 +0000 (-0800)
Subject: altosui: Display callsign in connecting message window
X-Git-Tag: altosdroid_v1.2-1~118
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=504cf412e8b60b5ff2dea93ed3336f0e058dea62

altosui: Display callsign in connecting message window

When waiting for the remote end to respond, display the callsign along
with the frequency so that the user remembers that it's important to
set that too.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altosui/AltosSerial.java b/altosui/AltosSerial.java
index 710aa145..e869f1ab 100644
--- a/altosui/AltosSerial.java
+++ b/altosui/AltosSerial.java
@@ -72,7 +72,7 @@ public class AltosSerial extends AltosLink  {
 		Object[] options = { "Cancel" };
 
 		JOptionPane	pane = new JOptionPane();
-		pane.setMessage(String.format("Connecting to %s, %7.3f MHz", device.toShortString(), frequency));
+		pane.setMessage(String.format("Connecting to %s, %7.3f MHz as %s", device.toShortString(), frequency, callsign));
 		pane.setOptions(options);
 		pane.setInitialValue(null);
 
diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 49e3097e..a6742f2f 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -48,7 +48,7 @@ public class AltosUI extends AltosUIFrame {
 		} catch (FileNotFoundException ee) {
 			JOptionPane.showMessageDialog(AltosUI.this,
 						      ee.getMessage(),
-						      "Cannot open target device",
+						      String.format ("Cannot open %s", device.toShortString()),
 						      JOptionPane.ERROR_MESSAGE);
 		} catch (AltosSerialInUseException si) {
 			JOptionPane.showMessageDialog(AltosUI.this,
@@ -58,17 +58,17 @@ public class AltosUI extends AltosUIFrame {
 						      JOptionPane.ERROR_MESSAGE);
 		} catch (IOException ee) {
 			JOptionPane.showMessageDialog(AltosUI.this,
-						      device.toShortString(),
-						      "Unkonwn I/O error",
+						      String.format ("Unknown I/O error on %s", device.toShortString()),
+						      "Unknown I/O error",
 						      JOptionPane.ERROR_MESSAGE);
 		} catch (TimeoutException te) {
 			JOptionPane.showMessageDialog(this,
-						      device.toShortString(),
+						      String.format ("Timeout on %s", device.toShortString()),
 						      "Timeout error",
 						      JOptionPane.ERROR_MESSAGE);
 		} catch (InterruptedException ie) {
 			JOptionPane.showMessageDialog(this,
-						      device.toShortString(),
+						      String.format("Interrupted %s", device.toShortString()),
 						      "Interrupted exception",
 						      JOptionPane.ERROR_MESSAGE);
 		}