diff --git a/Configuration.cpp b/Configuration.cpp
index f13f293..6e015cf 100644
--- a/Configuration.cpp
+++ b/Configuration.cpp
@@ -642,7 +642,7 @@ private:
bool insert_blank_;
bool DXCC_;
bool ppfx_;
- bool clear_DX_;
+ bool clear_callsign_;
bool miles_;
bool quick_call_;
bool disable_TX_on_73_;
@@ -773,7 +773,7 @@ bool Configuration::prompt_to_log () const {return m_->prompt_to_log_;}
bool Configuration::insert_blank () const {return m_->insert_blank_;}
bool Configuration::DXCC () const {return m_->DXCC_;}
bool Configuration::ppfx() const {return m_->ppfx_;}
-bool Configuration::clear_DX () const {return m_->clear_DX_;}
+bool Configuration::clear_callsign () const {return m_->clear_callsign_;}
bool Configuration::miles () const {return m_->miles_;}
bool Configuration::quick_call () const {return m_->quick_call_;}
bool Configuration::disable_TX_on_73 () const {return m_->disable_TX_on_73_;}
@@ -1367,7 +1367,7 @@ void Configuration::impl::initialize_models ()
ui_->stations_table_view->setEnabled(ui_->auto_switch_bands_check_box->isChecked());
ui_->report_in_comments_check_box->setChecked (report_in_comments_);
ui_->prompt_to_log_check_box->setChecked (prompt_to_log_);
- ui_->clear_DX_check_box->setChecked (clear_DX_);
+ ui_->clear_callsign_check_box->setChecked (clear_callsign_);
ui_->miles_check_box->setChecked (miles_);
ui_->quick_call_check_box->setChecked (quick_call_);
ui_->disable_TX_on_73_check_box->setChecked (disable_TX_on_73_);
@@ -1677,7 +1677,7 @@ void Configuration::impl::read_settings ()
insert_blank_ = settings_->value ("InsertBlank", false).toBool ();
DXCC_ = settings_->value ("DXCCEntity", false).toBool ();
ppfx_ = settings_->value ("PrincipalPrefix", false).toBool ();
- clear_DX_ = settings_->value ("ClearCallGrid", false).toBool ();
+ clear_callsign_ = settings_->value ("ClearCallGrid", false).toBool ();
miles_ = settings_->value ("Miles", false).toBool ();
quick_call_ = settings_->value ("QuickCall", false).toBool ();
disable_TX_on_73_ = settings_->value ("73TxDisable", false).toBool ();
@@ -1812,7 +1812,7 @@ void Configuration::impl::write_settings ()
settings_->setValue ("InsertBlank", insert_blank_);
settings_->setValue ("DXCCEntity", DXCC_);
settings_->setValue ("PrincipalPrefix", ppfx_);
- settings_->setValue ("ClearCallGrid", clear_DX_);
+ settings_->setValue ("ClearCallGrid", clear_callsign_);
settings_->setValue ("Miles", miles_);
settings_->setValue ("QuickCall", quick_call_);
settings_->setValue ("73TxDisable", disable_TX_on_73_);
@@ -2297,7 +2297,7 @@ void Configuration::impl::accept ()
log_as_DATA_ = ui_->log_as_RTTY_check_box->isChecked ();
report_in_comments_ = ui_->report_in_comments_check_box->isChecked ();
prompt_to_log_ = ui_->prompt_to_log_check_box->isChecked ();
- clear_DX_ = ui_->clear_DX_check_box->isChecked ();
+ clear_callsign_ = ui_->clear_callsign_check_box->isChecked ();
miles_ = ui_->miles_check_box->isChecked ();
quick_call_ = ui_->quick_call_check_box->isChecked ();
disable_TX_on_73_ = ui_->disable_TX_on_73_check_box->isChecked ();
diff --git a/Configuration.hpp b/Configuration.hpp
index a8279d3..ce0b1cf 100644
--- a/Configuration.hpp
+++ b/Configuration.hpp
@@ -133,7 +133,7 @@ public:
bool insert_blank () const;
bool DXCC () const;
bool ppfx() const;
- bool clear_DX () const;
+ bool clear_callsign () const;
bool miles () const;
bool quick_call () const;
bool disable_TX_on_73 () const;
diff --git a/Configuration.ui b/Configuration.ui
index 38d9c05..c68e5cc 100644
--- a/Configuration.ui
+++ b/Configuration.ui
@@ -278,9 +278,9 @@
0
- 0
+ -26
724
- 473
+ 479
@@ -725,6 +725,19 @@ text message.
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 20
+
+
+
+
@@ -1975,7 +1988,7 @@ both here.
0
0
746
- 519
+ 548
@@ -2023,19 +2036,18 @@ both here.
-
-
+
- false
+ true
false
- Check this option to force the clearing of the DX Call
-and DX Grid fields when a 73 or free text message is sent.
+ Check this option to force deselect callsign after logging.
- Clear &DX call and grid after logging
+ Deselect callsign after logging
@@ -3999,12 +4011,12 @@ soundcard changes
+
-
+
-
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 915e08c..8d4014a 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -5952,11 +5952,14 @@ void MainWindow::acceptQSO (QDateTime const& QSO_date_off, QString const& call,
{"STATION.GRID", QVariant(my_grid)}
});
- clearCallsignSelected();
-
m_logBook.init();
- if (m_config.clear_DX () and !m_config.bHound()) clearDX ();
+ if (m_config.clear_callsign ()){
+ clearDX ();
+ clearCallsignSelected();
+ }
+
+ displayCallActivity();
m_dateTimeQSOOn = QDateTime {};
}
@@ -8521,6 +8524,9 @@ void MainWindow::processActivity(bool force) {
}
void MainWindow::observeTimeDeltaForAverage(float delta){
+ // delta can only be +/- 15 seconds
+ delta = qMax(-15.0F, qMin(delta, 15.0F));
+
// compute average drift
if(m_timeDeltaMsMMA_N == 0){
m_timeDeltaMsMMA_N++;