From 10f4049e683b974ebb457810d2efc982885ff49e Mon Sep 17 00:00:00 2001
From: Jordan Sherer <jordan@widefido.com>
Date: Wed, 3 Oct 2018 16:54:25 -0400
Subject: [PATCH] Do not transmit if callsign isnt selected in selcal mode

---
 mainwindow.cpp | 41 ++++++++++++++++++++++++++++++++---------
 mainwindow.h   |  3 ++-
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index ceba1de..55a1e7e 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1141,6 +1141,10 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
           return;
       }
 
+      if(!ensureCallsignSet(true) || !ensureSelcalCallsignSelected(true)){
+          return;
+      }
+
       toggleTx(true);
   });
   ui->extFreeTextMsgEdit->installEventFilter(enterFilter);
@@ -6057,12 +6061,30 @@ bool MainWindow::ensureCallsignSet(bool alert){
     return true;
 }
 
+bool MainWindow::ensureSelcalCallsignSelected(bool alert){
+    auto selectedCallsign = callsignSelected(true);
+    bool isAllCall = isAllCallIncluded(selectedCallsign);
+    bool missingCall = selectedCallsign.isEmpty();
+    bool blockTransmit = ui->selcalButton->isChecked() && (isAllCall || missingCall);
+
+    if(blockTransmit && alert){
+        MessageBox::warning_message(this, tr ("Please select or enter a callsign to direct this message while SELCAL is enabled."));
+    }
+
+    return !blockTransmit;
+}
+
 void MainWindow::createMessage(QString const& text){
     if(!ensureCallsignSet()){
         on_stopTxButton_clicked();
         return;
     }
 
+    if(!ensureSelcalCallsignSelected()){
+        on_stopTxButton_clicked();
+        return;
+    }
+
     resetMessageTransmitQueue();
     createMessageTransmitQueue(text);
 }
@@ -8738,7 +8760,7 @@ void MainWindow::updateButtonDisplay(){
     update_dynamic_property (ui->startTxButton, "transmitting", m_transmitting);
 
     bool isTransmitting = m_transmitting || m_txFrameCount > 0;
-    auto selectedCallsign = callsignSelected();
+    auto selectedCallsign = callsignSelected(true);
     bool emptyCallsign = selectedCallsign.isEmpty();
 
     ui->cqMacroButton->setDisabled(isTransmitting);
@@ -8749,6 +8771,7 @@ void MainWindow::updateButtonDisplay(){
     ui->queryButton->setDisabled(isTransmitting || emptyCallsign);
     ui->deselectButton->setDisabled(isTransmitting || emptyCallsign);
     ui->queryButton->setText(emptyCallsign ? "Directed" : QString("Directed to %1").arg(selectedCallsign));
+    ui->startTxButton->setDisabled(ui->selcalButton->isChecked() && emptyCallsign);
 
     if(isTransmitting){
         int count = m_txFrameCount;
@@ -8813,7 +8836,7 @@ void MainWindow::buildMessageFramesAndUpdateCountDisplay(){
 void MainWindow::updateFrameCountDisplay(QString text, int count){
     if(count > 0){
         ui->startTxButton->setText(QString("Send (%1)").arg(count));
-        ui->startTxButton->setEnabled(true);
+        ui->startTxButton->setEnabled(ensureSelcalCallsignSelected(false));
 
         auto words = text.split(" ", QString::SkipEmptyParts).length();
         auto wpm = QString::number(words/(count/4.0), 'f', 1);
@@ -8828,7 +8851,7 @@ void MainWindow::updateFrameCountDisplay(QString text, int count){
     }
 }
 
-QString MainWindow::callsignSelected(){
+QString MainWindow::callsignSelected(bool useInputText){
     if(!ui->tableWidgetCalls->selectedItems().isEmpty()){
         auto selectedCalls = ui->tableWidgetCalls->selectedItems();
         if(!selectedCalls.isEmpty()){
@@ -8861,13 +8884,13 @@ QString MainWindow::callsignSelected(){
         }
     }
 
-#if SELECT_CALLSIGN_FOR_INPUT_TEXT
-    auto text = ui->extFreeTextMsgEdit->toPlainText().left(11); // Maximum callsign is 6 + / + 4 = 11 characters
-    auto calls = Varicode::parseCallsigns(text);
-    if(!calls.isEmpty() && text.startsWith(calls.first()) && calls.first() != m_config.my_callsign()){
-        return calls.first();
+    if(useInputText){
+        auto text = ui->extFreeTextMsgEdit->toPlainText().left(11); // Maximum callsign is 6 + / + 4 = 11 characters
+        auto calls = Varicode::parseCallsigns(text);
+        if(!calls.isEmpty() && text.startsWith(calls.first()) && calls.first() != m_config.my_callsign()){
+            return calls.first();
+        }
     }
-#endif
 
     return QString();
 }
diff --git a/mainwindow.h b/mainwindow.h
index ed61391..6c2bf83 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -151,6 +151,7 @@ public slots:
   void restoreMessage();
   void initializeDummyData();
   bool ensureCallsignSet(bool alert=true);
+  bool ensureSelcalCallsignSelected(bool alert=true);
   void createMessage(QString const& text);
   void createMessageTransmitQueue(QString const& text);
   void resetMessageTransmitQueue();
@@ -885,7 +886,7 @@ private:
   void updateFrameCountDisplay(QString text, int count);
   bool isMyCallIncluded(QString const &text);
   bool isAllCallIncluded(QString const &text);
-  QString callsignSelected();
+  QString callsignSelected(bool useInputText=false);
   bool isRecentOffset(int offset);
   void markOffsetRecent(int offset);
   bool isDirectedOffset(int offset, bool *pIsAllCall);