Merge branch 'master' of git://git.berlios.de/fldigi

ChangeLog

@@ -1,3 +1,8 @@
+2010-03-20  David Freese  <w1hkj@w1hkj.com>
+
+	693ae03: AFC-SQL Lighted button
+	67640c8: QSOTIME
+
 2010-03-18  Stelios Bounanos  <vcs@enotty.net>
 
 	2715366: Fix label sizes

configure.ac

@@ -9,7 +9,7 @@ dnl major and minor must be integers; patch may
 dnl contain other characters or be empty
 m4_define(FLDIGI_MAJOR, [3])
 m4_define(FLDIGI_MINOR, [20])
-m4_define(FLDIGI_PATCH, [.0b6])
+m4_define(FLDIGI_PATCH, [.0b7])
 m4_define(FLARQ_MAJOR,  [4])
 m4_define(FLARQ_MINOR,  [3])
 m4_define(FLARQ_PATCH,  [.0b1])

src/dialogs/fl_digi.cxx

@@ -1573,6 +1573,8 @@ if (bHAB) return;
 	inpSearchString->value ("");
 	old_call.clear();
 	new_call.clear();
+	qso_time.clear();
+	qso_exchange.clear();
 	oktoclear = true;
 }
 
@@ -3616,10 +3618,12 @@ void create_fl_digi_main_primary() {
 								progStatus.mainW - bwSqlOnOff - bwAfcOnOff,
 								Hmenu+Hrcvtxt+Hxmttxt+Hwfall,
 								bwAfcOnOff, Hstatus, "AFC");
+				btnAFC->selection_color(progdefaults.AfcColor);
 				btnSQL = new Fl_Light_Button(
 								progStatus.mainW - bwSqlOnOff,
 								Hmenu+Hrcvtxt+Hxmttxt+Hwfall,
 								sql_width, Hstatus, "SQL");
+				btnSQL->selection_color(progdefaults.Sql1Color);
 			}
 			btnAFC->callback(cbAFC, 0);
 			btnAFC->value(1);

src/include/macros.h

@@ -48,6 +48,8 @@ extern CONTESTCNTR contest_count;
 
 extern std::string info1msg;
 extern std::string info2msg;
+extern std::string qso_time;
+extern std::string qso_exchange;
 
 void set_macro_env(void);
 

src/logbook/logsupport.cxx

@@ -520,7 +520,18 @@ cQsoRec rec;
 	rec.putField(SRX, inpSerNoIn_log->value());
 	rec.putField(STX, inpSerNoOut_log->value());
 	rec.putField(XCHG1, inpXchgIn_log->value());
-	rec.putField(MYXCHG, inpMyXchg_log->value());
+	if (!qso_exchange.empty()) {
+		rec.putField(MYXCHG, qso_exchange.c_str());
+		qso_exchange.clear();
+		qso_time.clear();
+	} else if (!qso_time.empty()) {
+		string myexch = inpMyXchg_log->value();
+		myexch.append(" ").append(qso_time);
+		rec.putField(MYXCHG, myexch.c_str());
+		qso_time.clear();
+	} else {
+		rec.putField(MYXCHG, inpMyXchg_log->value());
+	}
 	rec.putField(IOTA, inpIOTA_log->value());
 	rec.putField(DXCC, inpDXCC_log->value());
 	rec.putField(CONT, inpCONT_log->value());

src/misc/macroedit.cxx

@@ -107,6 +107,7 @@ void loadBrowser(Fl_Widget *widget) {
 	w->add(_("<DECR>\tdecrement counter"));
 	w->add(_("<INCR>\tincrement counter"));
 	w->add(_("<XOUT>\texchange out"));
+	w->add(_("<SAVEXCHG>\tsave contest out"));
 
 	w->add(LINE_SEP);
 	w->add(_("<RX>\treceive"));

src/misc/macros.cxx

@@ -63,6 +63,10 @@ static bool TransmitON = false;
 static bool ToggleTXRX = false;
 int mNbr;
 
+std::string qso_time = "";
+std::string qso_exchange = "";
+bool save_xchg;
+
 struct MTAGS { const char *mTAG; void (*fp)(string &, size_t &);};
 
 void pCALL(string &, size_t &);
@@ -93,6 +97,7 @@ void pCNTR(string &, size_t &);
 void pDECR(string &, size_t &);
 void pINCR(string &, size_t &);
 void pXOUT(string &, size_t &);
+void pSAVEXCHG(string &, size_t &);
 void pLOG(string &, size_t &);
 void pTIMER(string &, size_t &);
 void pIDLE(string &, size_t &);
@@ -153,7 +158,8 @@ MTAGS mtags[] = {
 {"<DECR>",		pDECR},
 {"<INCR>",		pINCR},
 {"<X1>",		pXOUT},
-{"<XOUT>",      pXOUT},
+{"<XOUT>",		pXOUT},
+{"<SAVEXCHG>",	pSAVEXCHG},
 {"<LOG>",		pLOG},
 {"<TIMER:",		pTIMER},
 {"<IDLE:",		pIDLE},
@@ -166,14 +172,14 @@ MTAGS mtags[] = {
 {"<GET>",		pGET},
 {"<CLRRX>",		pCLRRX},
 {"<FILE:",		pFILE},
-{"<WPM:",       pWPM},
-{"<RISE:",      pRISETIME},
-{"<PRE:",       pPRE},
-{"<POST:",      pPOST},
-{"<AFC:",       pAFC},
-{"<LOCK:",      pLOCK},
-{"<RXRSID:",    pRX_RSID},
-{"<TXRSID:",    pTX_RSID},
+{"<WPM:",		pWPM},
+{"<RISE:",		pRISETIME},
+{"<PRE:",		pPRE},
+{"<POST:",		pPOST},
+{"<AFC:",		pAFC},
+{"<LOCK:",		pLOCK},
+{"<RXRSID:",	pRX_RSID},
+{"<TXRSID:",	pTX_RSID},
 {"<SRCHUP>",	pSRCHUP},
 {"<SRCHDN>",	pSRCHDN},
 {"<GOHOME>",	pGOHOME},
@@ -399,7 +405,9 @@ void pQTH(string &s, size_t &i)
 
 void pQSOTIME(string &s, size_t &i)
 {
-	s.replace( i, 9, inpTimeOff->value() );
+	if (qso_time.empty())
+		qso_time = inpTimeOff->value();
+	s.replace( i, 9, qso_time.c_str() );
 }
 
 void pRST(string &s, size_t &i)
@@ -556,6 +564,12 @@ void pXOUT(string &s, size_t &i)
 	s.replace( i, 6, cutstring(progdefaults.myXchg.c_str()));
 }
 
+void pSAVEXCHG(string &s, size_t &i)
+{
+	save_xchg = true;
+	s.replace( i, 10, "");
+}
+
 void pLOG(string &s, size_t &i)
 {
 	qsoSave_cb(0, 0);
@@ -1071,6 +1085,11 @@ string MACROTEXT::expandMacro(int n)
 		return "";
 	}
 
+	if (save_xchg) {
+		qso_exchange = expanded;
+		save_xchg = false;
+	}
+
 	return expanded;
 }