From 8d0d93d10edd8c314a09df3a282c4b07e4450b27 Mon Sep 17 00:00:00 2001
From: Jordan Sherer <jordan@widefido.com>
Date: Sun, 9 Sep 2018 14:37:34 -0400
Subject: [PATCH] Added configuration option to disable message passing, even
 while AUTO is on

---
 Configuration.cpp | 6 ++++++
 Configuration.hpp | 1 +
 Configuration.ui  | 9 ++++++++-
 mainwindow.cpp    | 3 +--
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Configuration.cpp b/Configuration.cpp
index 0dfe0fc..d52c422 100644
--- a/Configuration.cpp
+++ b/Configuration.cpp
@@ -601,6 +601,7 @@ private:
   bool spot_to_reporting_networks_;
   bool transmit_directed_;
   bool autoreply_off_at_startup_;
+  bool relay_disabled_;
   bool monitor_off_at_startup_;
   bool monitor_last_used_;
   bool log_as_DATA_;
@@ -724,6 +725,7 @@ void Configuration::set_spot_to_reporting_networks (bool spot)
 
 bool Configuration::transmit_directed() const { return m_->transmit_directed_; }
 bool Configuration::autoreply_off_at_startup () const {return m_->autoreply_off_at_startup_;}
+bool Configuration::relay_off() const { m_->relay_disabled_; }
 bool Configuration::monitor_off_at_startup () const {return m_->monitor_off_at_startup_;}
 bool Configuration::monitor_last_used () const {return m_->rig_is_dummy_ || m_->monitor_last_used_;}
 bool Configuration::log_as_DATA () const {return m_->log_as_DATA_;}
@@ -1293,6 +1295,7 @@ void Configuration::impl::initialize_models ()
   ui_->psk_reporter_check_box->setChecked (spot_to_reporting_networks_);
   ui_->transmit_directed_check_box->setChecked(transmit_directed_);
   ui_->autoreply_off_check_box->setChecked (autoreply_off_at_startup_);
+  ui_->relay_disabled_check_box->setChecked(relay_disabled_);
   ui_->monitor_off_check_box->setChecked (monitor_off_at_startup_);
   ui_->monitor_last_used_check_box->setChecked (monitor_last_used_);
   ui_->log_as_RTTY_check_box->setChecked (log_as_DATA_);
@@ -1522,6 +1525,7 @@ void Configuration::impl::read_settings ()
 
   transmit_directed_ = settings_->value ("TransmitDirected", true).toBool();
   autoreply_off_at_startup_ = settings_->value ("AutoreplyOFF", false).toBool ();
+  relay_disabled_ = settings_->value ("RelayOFF", false).toBool ();
   monitor_off_at_startup_ = settings_->value ("MonitorOFF", false).toBool ();
   monitor_last_used_ = settings_->value ("MonitorLastUsed", false).toBool ();
   spot_to_reporting_networks_ = settings_->value ("PSKReporter", true).toBool ();
@@ -1672,6 +1676,7 @@ void Configuration::impl::write_settings ()
   settings_->setValue ("Type2MsgGen", QVariant::fromValue (type_2_msg_gen_));
   settings_->setValue ("TransmitDirected", transmit_directed_);
   settings_->setValue ("AutoreplyOFF", autoreply_off_at_startup_);
+  settings_->setValue ("RelayOFF", relay_disabled_);
   settings_->setValue ("MonitorOFF", monitor_off_at_startup_);
   settings_->setValue ("MonitorLastUsed", monitor_last_used_);
   settings_->setValue ("PSKReporter", spot_to_reporting_networks_);
@@ -2118,6 +2123,7 @@ void Configuration::impl::accept ()
   tx_QSY_allowed_ = ui_->tx_QSY_check_box->isChecked ();
   transmit_directed_ = ui_->transmit_directed_check_box->isChecked();
   autoreply_off_at_startup_ = ui_->autoreply_off_check_box->isChecked ();
+  relay_disabled_ = ui_->relay_disabled_check_box->isChecked();
   monitor_off_at_startup_ = ui_->monitor_off_check_box->isChecked ();
   monitor_last_used_ = ui_->monitor_last_used_check_box->isChecked ();
   type_2_msg_gen_ = static_cast<Type2MsgGen> (ui_->type_2_msg_gen_combo_box->currentIndex ());
diff --git a/Configuration.hpp b/Configuration.hpp
index 8648ec4..e2c89b4 100644
--- a/Configuration.hpp
+++ b/Configuration.hpp
@@ -118,6 +118,7 @@ public:
   void set_spot_to_reporting_networks (bool);
   bool transmit_directed() const;
   bool autoreply_off_at_startup () const;
+  bool relay_off() const;
   bool monitor_off_at_startup () const;
   bool monitor_last_used () const;
   bool log_as_DATA () const;
diff --git a/Configuration.ui b/Configuration.ui
index cab5446..cf474ff 100644
--- a/Configuration.ui
+++ b/Configuration.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>692</width>
-    <height>701</height>
+    <height>706</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -356,6 +356,13 @@
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QCheckBox" name="relay_disabled_check_box">
+            <property name="text">
+             <string>Disable message passing (&gt;) when AUTO is enabled</string>
+            </property>
+           </widget>
+          </item>
           <item>
            <widget class="QCheckBox" name="monitor_off_check_box">
             <property name="toolTip">
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 5b04f4d..ae8a804 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -9491,7 +9491,7 @@ void MainWindow::processCommandActivity() {
 #endif
 
         // PROCESS RELAY
-        else if (d.cmd == ">" && !isAllCall) {
+        else if (d.cmd == ">" && !isAllCall && !m_config.relay_off()) {
 
             // 1. see if there are any more hops to process
             // 2. if so, forward
@@ -9536,7 +9536,6 @@ void MainWindow::processCommandActivity() {
 
                 processAlertReplyForCommand(d, calls.join('>'), ">");
             }
-
         }
 
         // PROCESS BUFFERED MESSAGE