From 3daf3d9a18fe36890094a7219f929528a42edf3b Mon Sep 17 00:00:00 2001
From: David Freese <w1hkj@w1hkj.com>
Date: Tue, 30 Dec 2008 09:47:00 -0600
Subject: [PATCH] Changed show callsign behavior Popup now shows the Name, Last
 QSO date, Azimuth & Distance based on logbook record if the station was
 previously worked Otherwise the cty.dat file is used if present.

---
 src/include/logsupport.h   |  1 +
 src/logbook/logsupport.cxx | 13 +++++++++++-
 src/widgets/FTextView.cxx  | 43 ++++++++++++++++++++++++++++----------
 3 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/src/include/logsupport.h b/src/include/logsupport.h
index cf764f4a..f40fd255 100644
--- a/src/include/logsupport.h
+++ b/src/include/logsupport.h
@@ -48,6 +48,7 @@ extern void deleteRecord ();
 extern void AddRecord ();
 extern void SearchLastQSO (const char *);
 extern int  SearchLog(const char *callsign, const char*** data);
+extern char *getSearchField( int fld );
 extern void DupCheck(const char *);
 extern void cb_search(Fl_Widget* w, void*);
 extern int log_search_handler(int);
diff --git a/src/logbook/logsupport.cxx b/src/logbook/logsupport.cxx
index 26b4bd62..07541eca 100644
--- a/src/logbook/logsupport.cxx
+++ b/src/logbook/logsupport.cxx
@@ -327,6 +327,15 @@ void DupCheck(const char *callsign)
 		lblDup->show();
 }
 
+cQsoRec *srchRec = 0;
+
+char *getSearchField( int fld )
+{
+	if (srchRec && fld >= CALL && fld < EXPORT)
+		return srchRec->getField(fld);
+	return 0;		
+}
+
 int SearchLog(const char *callsign, const char*** data)
 {
 	size_t len = strlen(callsign);
@@ -335,10 +344,12 @@ int SearchLog(const char *callsign, const char*** data)
 
 	int row = 0, col = 2;
 
-	if (wBrowser->search(row, col, true, re)) {
+	if (wBrowser->search(row, col, !cQsoDb::reverse, re)) {
+		srchRec = qsodb.getRec (row);
 		*data = wBrowser->getRow(row);
 		return wBrowser->columns();
 	}
+	srchRec = 0;
 	return 0;
 }
 
diff --git a/src/widgets/FTextView.cxx b/src/widgets/FTextView.cxx
index ddd5de22..8ad42fe0 100644
--- a/src/widgets/FTextView.cxx
+++ b/src/widgets/FTextView.cxx
@@ -888,20 +888,41 @@ const char* FTextView::dxcc_lookup_call(int x, int y)
 		static char tip[128];
 		size_t len = snprintf(tip, sizeof(tip), "%s (%s GMT%+0.1f) CQ-%d ITU-%d",
 				   e->country, e->continent, -e->gmt_offset, e->cq_zone, e->itu_zone);
-		if (len < sizeof(tip) && !progdefaults.myLocator.empty()) {
-			double lon, lat, distance, azimuth;
-			if (locator2longlat(&lon, &lat, progdefaults.myLocator.c_str()) == RIG_OK &&
-			    qrb(lon, lat, -e->longitude, e->latitude, &distance, &azimuth) == RIG_OK)
-				len += snprintf(tip + len, sizeof(tip) - len,
-						"\nQTE %.0f\260 (%.0f\260)  QRB %.0fkm (%.0fkm)",
-						azimuth, azimuth_long_path(azimuth), distance, distance_long_path(distance));
-		}
 		if (len < sizeof(tip)) {
 			const char** data;
-			if (SearchLog(s, &data) > 0)
-				snprintf(tip + len, sizeof(tip) - len, "\n* %s (%s)", _("worked before"), data[0]);
+			char*  locator = 0;
+			char*  name = 0;
+			if (SearchLog(s, &data) > 0) {
+				locator = getSearchField(GRIDSQUARE);
+				name = getSearchField(NAME);
+				if (name)
+					len += snprintf(tip + len, sizeof(tip) - len, "\n* %s  %s (%s)", 
+								name, _("worked before"), data[0]);
+				else
+					len += snprintf(tip + len, sizeof(tip) - len, "\n* %s (%s)", 
+								_("worked before"), data[0]);				
+				if ( locator ) {
+					if (len < sizeof(tip) && !progdefaults.myLocator.empty()) {
+						double lon, lat, lon2, lat2, distance, azimuth;
+						if (locator2longlat(&lon, &lat, progdefaults.myLocator.c_str()) == RIG_OK &&
+							locator2longlat(&lon2, &lat2, locator) == RIG_OK &&
+						    qrb(lon, lat, lon2, lat2, &distance, &azimuth) == RIG_OK)
+							len += snprintf(tip + len, sizeof(tip) - len,
+									"\nQTE %.0f\260 (%.0f\260)  QRB %.0fkm (%.0fkm)",
+									azimuth, azimuth_long_path(azimuth), distance, distance_long_path(distance));
+					}
+				}
+			} else {
+				if (len < sizeof(tip) && !progdefaults.myLocator.empty()) {
+					double lon, lat, distance, azimuth;
+					if (locator2longlat(&lon, &lat, progdefaults.myLocator.c_str()) == RIG_OK &&
+			    		qrb(lon, lat, -e->longitude, e->latitude, &distance, &azimuth) == RIG_OK)
+						len += snprintf(tip + len, sizeof(tip) - len,
+								"\nQTE %.0f\260 (%.0f\260)  QRB %.0fkm (%.0fkm)",
+								azimuth, azimuth_long_path(azimuth), distance, distance_long_path(distance));
+				}
+			}
 		}
-
 		ret = tip;
 	}