Macro tag modification

Changed <TIMER>nn AND <IDLE>nn to
<TIMER:NN> and <IDLE:NN> respectively

src/misc/macroedit.cxx

@@ -84,8 +84,8 @@ void loadBrowser(Fl_Widget *widget) {
 	w->add("<TX>\ttransmit");
 	w->add("<LOG>\tsave QSO data");
 	w->add("<VER>\tFldigi + version");
-	w->add("<TIMER>\trepeat every NNN sec");
-	w->add("<IDLE>\tidle signal for NNN sec");
+	w->add("<TIMER:NN>\trepeat every NN sec");
+	w->add("<IDLE:NN>\tidle signal for NN sec");
 	
 	w->add(LINE_SEP);
 	w->add("<FILE:>\tinsert text file");

src/misc/macros.cxx

@@ -106,8 +106,8 @@ MTAGS mtags[] = {
 {"<X2>",		pX2},
 {"<X3>",		pX3},
 {"<LOG>",		pLOG},
-{"<TIMER>",		pTIMER},
-{"<IDLE>",		pIDLE},
+{"<TIMER:",		pTIMER},
+{"<IDLE:",		pIDLE},
 {"<MODEM>",		pMODEM},
 {"<EXEC>",		pEXEC},
 {"<STOP>",		pSTOP},
@@ -147,6 +147,38 @@ void pFILE(string &s, size_t &i)
 		s.replace(i, endbracket - i + 1, "");
 }
 
+void pTIMER(string &s, size_t &i)
+{
+	size_t endbracket = s.find('>',i);
+	int number;
+	string sTime = s.substr(i+7, endbracket - i - 7);
+	if (sTime.length() > 0) {
+		sscanf(sTime.c_str(), "%d", &number);
+		s.replace(i, endbracket - i + 1, "");
+		progdefaults.timeout = number;
+		progdefaults.macronumber = mNbr;
+		progdefaults.useTimer = true;
+	} else
+		s.replace(i, endbracket - i + 1, "");
+}
+
+bool useIdle = false;
+int  idleTime = 0;
+
+void pIDLE(string &s, size_t &i)
+{
+	size_t endbracket = s.find('>',i);
+	int number;
+	string sTime = s.substr(i+6, endbracket - i - 6);
+	if (sTime.length() > 0) {
+		sscanf(sTime.c_str(), "%d", &number);
+		s.replace(i, endbracket - i + 1, "");
+		useIdle = true;
+		idleTime = number;
+	} else
+		s.replace(i, endbracket - i + 1, "");
+}
+
 void pINFO1(string &s, size_t &i)
 {
 	s.replace( i, 7, info1msg );
@@ -369,39 +401,6 @@ void pLOG(string &s, size_t &i)
 		clearQSO();
 }
 
-void pTIMER(string &s, size_t &i)
-{
-	int number;
-	sscanf(s.substr(i+7).c_str(), "%d", &number);
-	size_t i2;
-	i2 = s.find(" ",i);
-	if (i2 == string::npos)
-		i2 = s.find("\n", i);
-	s.replace (i, i2 - i, "");
-	progdefaults.timeout = number;
-	progdefaults.macronumber = mNbr;
-	progdefaults.useTimer = true;
-}
-
-bool useIdle = false;
-int  idleTime = 0;
-
-void pIDLE(string &s, size_t &i)
-{
-	int number;
-	sscanf(s.substr(i+6).c_str(), "%d", &number);
-	size_t i2, i3;
-	i2 = s.find(" ", i);
-	i3 = s.find("\n", i);
-	if (i2 == string::npos)
-		i2 = i3;
-	if (i3 < i2)
-		i2 = i3;
-	s.replace (i, i2 - i + 1, "");
-	useIdle = true;
-	idleTime = number;
-}
-
 void pMODEM(string &s, size_t &i)
 {
 	size_t	j, k, 

src/misc/newinstall.cxx

@@ -106,8 +106,8 @@ text[19] = "";
 
 label[20] = "CQ @-3+";
 text[20] = "<TX>\n\
-CQ CQ CQ de <MYCALL> <MYCALL> <MYCALL>\n\
-CQ CQ CQ de <MYCALL> <MYCALL> <MYCALL> k<TIMER>15 <RX>";
+<IDLE:5>CQ CQ CQ de <MYCALL> <MYCALL> <MYCALL>\n\
+CQ CQ CQ de <MYCALL> <MYCALL> <MYCALL> k<RX><TIMER:15>";
 
 label[21] = "CQ-ID @>|";
 text[21] = "<TX><ID>\n\