From 712cf59fbb01d4f0676a4667dbcb754fcaa8d8a6 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 12 Sep 2024 14:14:22 -0400 Subject: [PATCH] Remove the code for input of the RC6-style FoxKey. --- Configuration.cpp | 23 ------------ Configuration.hpp | 1 - Configuration.ui | 94 +++++++++++++++++++++++------------------------ 3 files changed, 46 insertions(+), 72 deletions(-) diff --git a/Configuration.cpp b/Configuration.cpp index c08abe5ee..e8beac306 100644 --- a/Configuration.cpp +++ b/Configuration.cpp @@ -611,7 +611,6 @@ private: Q_SLOT void on_cbAutoLog_clicked(bool); Q_SLOT void on_Field_Day_Exchange_textEdited (QString const&); Q_SLOT void on_RTTY_Exchange_textEdited (QString const&); - Q_SLOT void on_FoxKey_textEdited (QString const&); Q_SLOT void on_OTPUrl_textEdited (QString const&); Q_SLOT void on_OTPSeed_textEdited (QString const&); Q_SLOT void on_Contest_Name_textEdited (QString const&); @@ -712,7 +711,6 @@ private: QString RTTY_exchange_; QString Contest_Name_; QString hamlib_backed_up_; - QString FoxKey_; QString OTPUrl_; QString OTPSeed_; @@ -1048,11 +1046,6 @@ QString Configuration::RTTY_Exchange() const return m_->RTTY_exchange_; } -QString Configuration::FoxKey() const -{ - return m_->FoxKey_; -} - QString Configuration::Contest_Name() const { return m_->Contest_Name_; @@ -1670,11 +1663,9 @@ void Configuration::impl::read_settings () my_grid_ = settings_->value ("MyGrid", QString {}).toString (); FD_exchange_ = settings_->value ("Field_Day_Exchange",QString {}).toString (); RTTY_exchange_ = settings_->value ("RTTY_Exchange",QString {}).toString (); - FoxKey_ = settings_->value ("FoxKey",QString {}).toString (); Contest_Name_ = settings_->value ("Contest_Name",QString {}).toString (); ui_->Field_Day_Exchange->setText(FD_exchange_); ui_->RTTY_Exchange->setText(RTTY_exchange_); - ui_->FoxKey->setText(FoxKey_); ui_->Contest_Name->setText(Contest_Name_); hamlib_backed_up_ = settings_->value ("HamlibBackedUp",QString {}).toString (); @@ -1916,7 +1907,6 @@ void Configuration::impl::write_settings () settings_->setValue ("MyGrid", my_grid_); settings_->setValue ("Field_Day_Exchange", FD_exchange_); settings_->setValue ("RTTY_Exchange", RTTY_exchange_); - settings_->setValue ("FoxKey", FoxKey_); settings_->setValue ("Contest_Name", Contest_Name_); settings_->setValue ("Font", font_.toString ()); settings_->setValue ("DecodedTextFont", decoded_text_font_.toString ()); @@ -2389,7 +2379,6 @@ void Configuration::impl::accept () my_grid_ = ui_->grid_line_edit->text (); FD_exchange_= ui_->Field_Day_Exchange->text ().toUpper (); RTTY_exchange_= ui_->RTTY_Exchange->text ().toUpper (); - FoxKey_= ui_->FoxKey->text().toUpper(); Contest_Name_= ui_->Contest_Name->text ().toUpper (); spot_to_psk_reporter_ = ui_->psk_reporter_check_box->isChecked (); psk_reporter_tcpip_ = ui_->psk_reporter_tcpip_check_box->isChecked (); @@ -3305,13 +3294,6 @@ void Configuration::impl::on_cbHideOTP_clicked(bool) void Configuration::impl::check_visibility () { - if (ui_->rbFox->isChecked() and ui_->cbSuperFox->isChecked() and ui_->gbSpecialOpActivity->isChecked()) { - ui_->sfkey_label->setEnabled (true); - ui_->FoxKey->setEnabled (true); - } else { - ui_->sfkey_label->setEnabled (false); - ui_->FoxKey->setEnabled (false); - } if (ui_->rbField_Day->isChecked() and ui_->gbSpecialOpActivity->isChecked()) { ui_->labFD->setEnabled (true); ui_->Field_Day_Exchange->setEnabled (true); @@ -3410,11 +3392,6 @@ void Configuration::impl::on_RTTY_Exchange_textEdited (QString const& exchange) ui_->RTTY_Exchange->setText (exchange.toUpper ()); } -void Configuration::impl::on_FoxKey_textEdited (QString const& ckey) -{ - ui_->FoxKey->setText (ckey.toUpper ()); -} - void Configuration::impl::on_Contest_Name_textEdited (QString const& exchange) { ui_->Contest_Name->setText (exchange.toUpper ()); diff --git a/Configuration.hpp b/Configuration.hpp index c8ac367cd..c09c5574c 100644 --- a/Configuration.hpp +++ b/Configuration.hpp @@ -101,7 +101,6 @@ public: QString my_grid () const; QString Field_Day_Exchange() const; QString RTTY_Exchange() const; - QString FoxKey() const; QString Contest_Name() const; void setEU_VHF_Contest(); QFont text_font () const; diff --git a/Configuration.ui b/Configuration.ui index 7d92f6f9e..5c898bb80 100644 --- a/Configuration.ui +++ b/Configuration.ui @@ -3202,7 +3202,7 @@ Right click for insert and delete options. - + @@ -3226,44 +3226,6 @@ Right click for insert and delete options. - - - - Key: - - - - - - - - 0 - 0 - - - - - 70 - 0 - - - - - 16777215 - 16777215 - - - - <html><head/><body><p>SuperFox operator must enter a valid key to enable transmission.</p></body></html> - - - 9 - - - Qt::AlignCenter - - - @@ -3334,9 +3296,15 @@ Right click for insert and delete options. + + Qt::Horizontal + + + QSizePolicy::Fixed + - 20 + 10 20 @@ -3351,16 +3319,31 @@ Right click for insert and delete options. + + + 110 + 0 + + <html><head/><body><p>URL used to verify OTP codes.</p></body></html> + + https://www.9dx.cc + + + Qt::Horizontal + + + QSizePolicy::Fixed + - 20 + 10 20 @@ -3388,9 +3371,15 @@ Right click for insert and delete options. + + Qt::Horizontal + + + QSizePolicy::Fixed + - 20 + 10 20 @@ -3411,9 +3400,15 @@ Right click for insert and delete options. + + Qt::Horizontal + + + QSizePolicy::Fixed + - 20 + 10 20 @@ -3430,13 +3425,16 @@ Right click for insert and delete options. - 70 + 120 0 <html><head/><body><p>Fox's key to generate OTP Codes.</p></body></html> + + M2ZUU5CW6EVOY2HU + @@ -3679,13 +3677,13 @@ Right click for insert and delete options. - - - - + + + +