chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added automatic ACK for relay messages

Browse Source
This commit is contained in:
Jordan Sherer 2018-12-17 01:27:41 -05:00
parent 6504a1f220
commit 47eec2dc0b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mainwindow.cpp
View File

@ -9482,7 +9482,7 @@ void MainWindow::processCommandActivity() {
reply = QString("%1 DE %2").arg(text).arg(d.from); reply = QString("%1 DE %2").arg(text).arg(d.from);
// otherwise, as long as we're not an ACK...alert the user and either send an ACK or Message // otherwise, as long as we're not an ACK...alert the user and either send an ACK or Message
} else if(!d.text.startsWith("ACK DE")) { } else if(!d.text.startsWith("ACK")) {
QStringList calls; QStringList calls;
QString callDePattern = {R"(\sDE\s(?<callsign>\b(?<prefix>[A-Z0-9]{1,4}\/)?(?<base>([0-9A-Z])?([0-9A-Z])([0-9])([A-Z])?([A-Z])?([A-Z])?)(?<suffix>\/[A-Z0-9]{1,4})?)\b)"}; QString callDePattern = {R"(\sDE\s(?<callsign>\b(?<prefix>[A-Z0-9]{1,4}\/)?(?<base>([0-9A-Z])?([0-9A-Z])([0-9])([A-Z])?([A-Z])?([A-Z])?)(?<suffix>\/[A-Z0-9]{1,4})?)\b)"};
QRegularExpression re(callDePattern); QRegularExpression re(callDePattern);
@ -9506,7 +9506,12 @@ void MainWindow::processCommandActivity() {
calls.prepend(d.from); calls.prepend(d.from);
processAlertReplyForCommand(d, calls.join('>'), ">"); auto relayFrom = calls.join('>');
reply = QString("%1>ACK").arg(relayFrom);
// TODO: put message in inbox instead...
//processAlertReplyForCommand(d, relayFrom, ">");
} }
} }
@ -9688,19 +9693,14 @@ void MainWindow::processAlertReplyForCommand(CommandDetail d, QString from, QStr
msgBox->setText(header); msgBox->setText(header);
msgBox->setInformativeText(text); msgBox->setInformativeText(text);
auto ab = msgBox->addButton("ACK", QMessageBox::AcceptRole);
auto rb = msgBox->addButton("Reply", QMessageBox::AcceptRole); auto rb = msgBox->addButton("Reply", QMessageBox::AcceptRole);
auto db = msgBox->addButton("Discard", QMessageBox::NoRole); auto db = msgBox->addButton("Discard", QMessageBox::NoRole);
connect(msgBox, &QMessageBox::buttonClicked, this, [this, cmd, from, fromLabel, d, db, rb, ab](QAbstractButton * btn) { connect(msgBox, &QMessageBox::buttonClicked, this, [this, cmd, from, fromLabel, d, db, rb](QAbstractButton * btn) {
if (btn == db) { if (btn == db) {
return; return;
} }
if (btn == ab){
enqueueMessage(PriorityHigh, QString("%1%2ACK").arg(from).arg(cmd), -1, nullptr);
}
if(btn == rb){ if(btn == rb){
#if USE_RELAY_REPLY_DIALOG #if USE_RELAY_REPLY_DIALOG
auto diag = new MessageReplyDialog(this); auto diag = new MessageReplyDialog(this);